diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 0181f07..f365411 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=xiangtan_mazuike_xx;userid=root;password=root" />
+		<add name="database" connectionString="server=192.168.50.84;port=3306;database=xiangtan_mazuike_xx;userid=root;password=root" />
 	</connectionStrings>
 	<!--<runtime>
 		-->
@@ -42,7 +42,7 @@
 		<!-- 无操作退出录像时间，单位秒，为0时不退出录像 -->
 		<add key="stopRecord" value="180"/>
 
-		<add key="gridConnectionString" value="MYSQL; Database=xiangtan_mazuike_xx; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
+		<add key="gridConnectionString" value="MYSQL; Database=xiangtan_mazuike_xx; Password=root; Port=3306; Server=192.168.50.84; User=root;"/>
 		<!-- 查询处方是orderNo还是orderGroupNo -->
 		<add key="OrderNoName" value="orderNo" />
 		<!-- 后门耗材板地址 没有则填写0-->
diff --git a/DM_Weight/Models/DrugBase.cs b/DM_Weight/Models/DrugBase.cs
index 3298824..cf243f3 100644
--- a/DM_Weight/Models/DrugBase.cs
+++ b/DM_Weight/Models/DrugBase.cs
@@ -15,7 +15,7 @@ namespace DM_Weight.Models
     public class DrugBase:BindableBase
     {
         private int _baseId = 0;
-        [SugarColumn(ColumnName = "id", IsPrimaryKey = true)]
+        [SugarColumn(ColumnName = "baseid", IsPrimaryKey = true)]
         public int BaseId { get=> _baseId; set { SetProperty(ref _baseId, value); } }
         private string _drugId;
         [SugarColumn(ColumnName = "drugid")]
@@ -24,7 +24,7 @@ namespace DM_Weight.Models
         [SugarColumn(ColumnName = "machine_id")]
         public string MachineId { get => _machineId; set { SetProperty(ref _machineId, value); } }
         private int _baseQuantity = 0;
-        [SugarColumn(ColumnName = "base_quantity")]
+        [SugarColumn(ColumnName = "basequantity")]
         public int BaseQuantity { get=>_baseQuantity; set{ SetProperty(ref _baseQuantity, value); } }
 
     }
diff --git a/DM_Weight/Models/DrugInfo.cs b/DM_Weight/Models/DrugInfo.cs
index b134d33..5abcbe8 100644
--- a/DM_Weight/Models/DrugInfo.cs
+++ b/DM_Weight/Models/DrugInfo.cs
@@ -84,7 +84,7 @@ namespace DM_Weight.Models
         public int? StockQuantity { get; set; }
 
         private DrugBase _base;
-        [Navigate(NavigateType.OneToOne, nameof(DrugBase.DrugId), nameof(DrugId))]
+        [Navigate(NavigateType.OneToOne, nameof(DrugBase.DrugId), nameof(DrugId),whereSql:" machine_id='DM1'")]
         public DrugBase drugBase
         {
             get=> _base;
diff --git a/DM_Weight/ReportTemp/account_book_temp_new.grf b/DM_Weight/ReportTemp/account_book_temp_new.grf
index 055ce06..bc93b98 100644
--- a/DM_Weight/ReportTemp/account_book_temp_new.grf
+++ b/DM_Weight/ReportTemp/account_book_temp_new.grf
@@ -132,7 +132,8 @@
 				"Visible":false
 			},
 			{
-				"Name":"科室"
+				"Name":"科室",
+				"Visible":false
 			},
 			{
 				"Name":"患者姓名",
diff --git a/DM_Weight/ViewModels/DrugListWindowViewModel.cs b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
index af67eca..ff4b61f 100644
--- a/DM_Weight/ViewModels/DrugListWindowViewModel.cs
+++ b/DM_Weight/ViewModels/DrugListWindowViewModel.cs
@@ -283,7 +283,8 @@ namespace DM_Weight.ViewModels
                         }
                         else
                         {
-                            SqlSugarHelper.Db.Updateable(new DrugBase() { BaseQuantity = SelectedDrug.drugBase.BaseQuantity }).UpdateColumns(bs => new { bs.BaseQuantity }).Where(bs => bs.BaseId == SelectedDrug.drugBase.BaseId).ExecuteCommand();
+                            drugBase.BaseQuantity = SelectedDrug.drugBase.BaseQuantity;
+                            SqlSugarHelper.Db.Updateable(drugBase).UpdateColumns(bs => new { bs.BaseQuantity }).Where(bs => bs.BaseId == SelectedDrug.drugBase.BaseId).ExecuteCommand();
                         }
                     }
                 });
@@ -306,7 +307,7 @@ namespace DM_Weight.ViewModels
                     _eventAggregator.GetEvent<SnackbarEvent>().Publish(alertMsg);
                 }
                 RequestData();
-            }, () => SelectedDrug.DrugId==null).ObservesProperty(() => SelectedDrug);
+            }, () => SelectedDrug.DrugId!=null).ObservesProperty(() => SelectedDrug);
         }
 
         public DelegateCommand AddManuCommand
@@ -322,7 +323,7 @@ namespace DM_Weight.ViewModels
                     GetManuNos();
                 }
 
-            }, () => SelectedDrug.DrugId == null).ObservesProperty(() => SelectedDrug);
+            }, () => SelectedDrug.DrugId != null).ObservesProperty(() => SelectedDrug);
         }
 
         public DelegateCommand EditManuCommand