diff --git a/DM_Weight/ViewModels/AccountWindowViewModel.cs b/DM_Weight/ViewModels/AccountWindowViewModel.cs
index ffe0ee6..bd1ba10 100644
--- a/DM_Weight/ViewModels/AccountWindowViewModel.cs
+++ b/DM_Weight/ViewModels/AccountWindowViewModel.cs
@@ -308,16 +308,15 @@ namespace DM_Weight.ViewModels
             {
                 SQL += " AND ac.drug_id='" + drug_id + "' ";
             }
-            SQL += " ORDER BY ac.create_date desc,ac.drug_id";
             if (type > 0)
             {
                 if (type == 1)
                 {
-                    SQL += " WHERE AddQuantity>0 ";
+                    SQL += " WHERE ac.add_quantity>0 ";
                 }
                 if (type == 2)
                 {
-                    SQL += " WHERE OutQuantity>0 ";
+                    SQL += " WHERE ac.out_quantity>0 ";
                 }
                 if (type == 3)
                 {
@@ -328,6 +327,7 @@ namespace DM_Weight.ViewModels
                     SQL += " WHERE type=4  ";
                 }
             }
+            SQL += " ORDER BY ac.create_date desc,ac.drug_id";
 
 
             //ChannelStocks = q.Select(it => { it.CheckQuantity = it.Quantity; return it; }).ToList();
diff --git a/DM_Weight/ViewModels/ApplyListWindowViewModel.cs b/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
index 05e4f06..16a0d6d 100644
--- a/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
+++ b/DM_Weight/ViewModels/ApplyListWindowViewModel.cs
@@ -143,7 +143,7 @@ namespace DM_Weight.ViewModels
             CollectDrugLst = SqlSugarHelper.Db.Queryable<CollectDrug>()
                            .Includes<DrugPleaseClaim>(cd => cd.drugPleaseClaim)
                            .Includes<DrugInfo>(cd => cd.drugInfo)
-                           .Where(cd => cd.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1"))
+                           .Where(cd => cd.DeptName.Equals(ConfigurationManager.AppSettings["department"] ?? ""))
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugId"), (cd) => cd.drugInfo.DrugId.ToString() == SearchValue)
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("DrugName"), (cd) => cd.drugInfo.DrugName.Contains(SearchValue))
                            .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PyCode"), (cd) => cd.drugInfo.PyCode.Contains(SearchValue))