diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 33ede04..fc8061d 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -3,7 +3,7 @@
   <connectionStrings>
 	<!-- 数据库连接字符串 -->
 	<!--<add name="database" connectionString="server=127.0.0.1;database=wpf_dm_program;userid=root;password=qq1223" />-->
-	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xichang_db;userid=root;password=root" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xichang_db_xianchang;userid=root;password=root" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
@@ -16,7 +16,7 @@
 		<!--2023/7/13 药房代码 有则写无则空 -->
 		<add key="storage" value="" />
 		<!-- 登录模式 1单人登录2双人登录 -->
-		<add key="loginMode" value="2" />
+		<add key="loginMode" value="1" />
 		<!-- 登录顺序,指定先登录的人的名称有效值，只有在登录模式等于2时才会生效； 发药人：【operator】审核人：【reviewer】 -->
 		<add key="firstLogin" value="operator" />
 		<!-- 按处方还药或者按取药记录还药 1:处方（ReturnDrugWindow2）2：药品（ReturnDrugWindow）-->
diff --git a/DM_Weight/Models/DrugInfo.cs b/DM_Weight/Models/DrugInfo.cs
index aeaf7ef..560be6b 100644
--- a/DM_Weight/Models/DrugInfo.cs
+++ b/DM_Weight/Models/DrugInfo.cs
@@ -19,7 +19,7 @@ namespace DM_Weight.Models
         /// ҩƷID 
         ///</summary>
         [SugarColumn(ColumnName = "drug_id", IsPrimaryKey = true)]
-        public long DrugId { get; set; }
+        public string DrugId { get; set; }
         /// <summary>
         /// ƴ 
         ///</summary>
diff --git a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
index a471970..3ba851f 100644
--- a/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrawerAddDrugWindowViewModel.cs
@@ -356,11 +356,14 @@ namespace DM_Weight.ViewModels
                .Where(cs => cs.DrugId != null)
                .OrderBy(cs => cs.ColNo)
                .ToList();
-            ChannelStocks = queryData.Select(cs =>
+            if (queryData != null && queryData.Count > 0)
             {
-                cs.drugManuNo = cs.DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
-                return cs;
-            }).ToList();
+                ChannelStocks = queryData.Select(cs =>
+                {
+                    cs.drugManuNo = cs.DrugInfo.DrugManuNos.Find(it => it.ManuNo.Equals(cs.ManuNo));
+                    return cs;
+                }).ToList();
+            }
         }
 
         //接收导航传过来的参数  现在是在此处初始化了表格数据
diff --git a/DM_Weight/ViewModels/DrugListWindowViewModel.cs b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
index 331ae97..1d3fcee 100644
--- a/DM_Weight/ViewModels/DrugListWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
@@ -201,7 +201,7 @@ namespace DM_Weight.ViewModels
             {
                 SqlSugarHelper.Db.Updateable(SelectedDrug).UpdateColumns(d => new { d.DrugName, d.Manufactory, d.PyCode, d.PackUnit, d.MaxStock, d.DrugSpec }).ExecuteCommand();
                 RequestData();
-            }, () => SelectedDrug.DrugId > 0).ObservesProperty(() => SelectedDrug);
+            }, () => SelectedDrug.DrugId is not null).ObservesProperty(() => SelectedDrug);
         }
 
         public DelegateCommand AddManuCommand
@@ -217,7 +217,7 @@ namespace DM_Weight.ViewModels
                     GetManuNos();
                 }
 
-            }, () => SelectedDrug.DrugId > 0).ObservesProperty(() => SelectedDrug);
+            }, () => SelectedDrug.DrugId is not null).ObservesProperty(() => SelectedDrug);
         }
 
         public DelegateCommand EditManuCommand
diff --git a/DM_Weight/ViewModels/HomeWindowViewModel.cs b/DM_Weight/ViewModels/HomeWindowViewModel.cs
index 83793ce..ac18e6b 100644
--- a/DM_Weight/ViewModels/HomeWindowViewModel.cs
+++ b/DM_Weight/ViewModels/HomeWindowViewModel.cs
@@ -394,20 +394,20 @@ namespace DM_Weight.ViewModels
                 };
                 timer.Start();
             }
-            #region 温度查询定时
-            int interval = Convert.ToInt32(ConfigurationManager.AppSettings["Interval"]);
-            if (interval > 0)
-            {
-                WDTimer = new System.Timers.Timer();
+            //#region 温度查询定时
+            //int interval = Convert.ToInt32(ConfigurationManager.AppSettings["Interval"]);
+            //if (interval > 0)
+            //{
+            //    WDTimer = new System.Timers.Timer();
 
-                WDTimer.Elapsed += new System.Timers.ElapsedEventHandler(GetWD);
-                WDTimer.Interval = interval;
-                WDTimer.Start();
-                //WDTimer.AutoReset = true;
-                //WDTimer.Enabled = true;
-            }
-            #endregion
-            GetWD();
+            //    WDTimer.Elapsed += new System.Timers.ElapsedEventHandler(GetWD);
+            //    WDTimer.Interval = interval;
+            //    WDTimer.Start();
+            //    //WDTimer.AutoReset = true;
+            //    //WDTimer.Enabled = true;
+            //}
+            //#endregion
+            //GetWD();
         }
 
         //每次导航的时候，该实列用不用重新创建，true是不重新创建,false是重新创建