diff --git a/DM_Weight/ViewModels/AccountWindowViewModel.cs b/DM_Weight/ViewModels/AccountWindowViewModel.cs
index 323697d..b856399 100644
--- a/DM_Weight/ViewModels/AccountWindowViewModel.cs
+++ b/DM_Weight/ViewModels/AccountWindowViewModel.cs
@@ -180,32 +180,32 @@ namespace DM_Weight.ViewModels
                 RequestData();
             }
         }
-        /// <summary>
-        /// 药品类型
-        /// </summary>
-        private List<DrugType> _drugTypeList = new List<DrugType>()
-        {
-            new DrugType{ TypeValue=1,TypeName="精一"},
-            new DrugType{TypeValue=2,TypeName="精二"}
-        };
-        public List<DrugType>? DrugTypeList
-        {
-            get => _drugTypeList;
-            set
-            {
-                SetProperty(ref _drugTypeList, value);
-            }
-        }
+        ///// <summary>
+        ///// 药品类型
+        ///// </summary>
+        //private List<DrugType> _drugTypeList = new List<DrugType>()
+        //{
+        //    new DrugType{ TypeValue=1,TypeName="精一"},
+        //    new DrugType{TypeValue=2,TypeName="精二"}
+        //};
+        //public List<DrugType>? DrugTypeList
+        //{
+        //    get => _drugTypeList;
+        //    set
+        //    {
+        //        SetProperty(ref _drugTypeList, value);
+        //    }
+        //}
 
-        private DrugType? _drugType;
-        public DrugType? _DrugType
-        {
-            get => _drugType; set
-            {
-                SetProperty(ref _drugType, value);
-                RequestData();
-            }
-        }
+        //private DrugType? _drugType;
+        //public DrugType? _DrugType
+        //{
+        //    get => _drugType; set
+        //    {
+        //        SetProperty(ref _drugType, value);
+        //        RequestData();
+        //    }
+        //}
 
 
         //MachineRecordService _machineRecordService;
@@ -221,7 +221,7 @@ namespace DM_Weight.ViewModels
         void RequestData()
         {
             int totalCount = 0;
-            AccountList = ReportAccountBook(StartDate, EndDate, AccountType == null ? 0 : AccountType.AccountTypeValue, _DrugType == null ? 0 : _DrugType.TypeValue, DrugInfo == null ? "" : DrugInfo.DrugId.ToString() ?? "");
+            AccountList = ReportAccountBook(StartDate, EndDate, AccountType == null ? 0 : AccountType.AccountTypeValue, DrugInfo == null ? "" : DrugInfo.DrugId.ToString() ?? "");
             //for (int i = 0; i < accountList.Count; i++)
             //{
             //    if (accountList[i].DrugInfo is null)
@@ -321,7 +321,7 @@ namespace DM_Weight.ViewModels
         {
         }
 
-        private List<AccountBookG2> ReportAccountBook(DateTime? startDate, DateTime? endDate, int type, int drugType, string drug_id = "")
+        private List<AccountBookG2> ReportAccountBook(DateTime? startDate, DateTime? endDate, int type, string drug_id = "")
         {
             DateTime? p_startDate = startDate ?? Convert.ToDateTime("2010-1-1");
             DateTime? p_endDate = endDate ?? DateTime.Now.AddDays(1);
@@ -355,10 +355,6 @@ namespace DM_Weight.ViewModels
                     SQL += " AND type=4  ";
                 }
             }
-            if (drugType > 0)
-            {
-                SQL += $" AND di.Drug_type={drugType}";
-            }
             SQL += " ORDER BY ac.create_date desc,ac.drug_id";
 
 
diff --git a/DM_Weight/Views/AccountWindow.xaml b/DM_Weight/Views/AccountWindow.xaml
index 3c00696..54167ec 100644
--- a/DM_Weight/Views/AccountWindow.xaml
+++ b/DM_Weight/Views/AccountWindow.xaml
@@ -63,21 +63,13 @@
                     SelectedItem="{Binding DrugInfo}"
                     DisplayMemberPath="DrugName"
                 />-->
-            <!--<ComboBox
+            <ComboBox
                     Margin="6 0 6 0"
                     Grid.Column="2"
                     materialDesign:HintAssist.Hint="药品名称/拼音码/药品编码"
                     ItemsSource="{Binding DrugInfos}"
                     SelectedItem="{Binding DrugInfo}"
                     DisplayMemberPath="DrugName" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
-                />-->
-            <ComboBox
-                    Margin="6 0 6 0"
-                    Grid.Column="2"
-                    materialDesign:HintAssist.Hint="药品类型"
-                    ItemsSource="{Binding DrugTypeList}"
-                    SelectedItem="{Binding _DrugType}"
-                    DisplayMemberPath="TypeName" IsEditable="True" IsTextSearchEnabled="False" KeyUp="ComboBox_KeyUp"
                 />
             <ComboBox
                     Margin="12 0 0 0"