From 2c0d79d1ddde4e6c880d77aefac57ec37d46629f Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Wed, 29 Oct 2025 08:52:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=AE=A1=E7=90=86=E5=91=98?=
 =?UTF-8?q?=E6=A0=B8=E5=AF=B9=E6=97=B6=E4=BD=BF=E7=94=A8=E9=87=8F=E4=B8=8E?=
 =?UTF-8?q?=E5=89=A9=E4=BD=99=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                                 | 4 ++--
 DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 6857347..6eaa83c 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=xtjj;userid=root;password=qq1223" />
+	<add name="database" connectionString="server=127.0.0.1;port=3306;database=xt;userid=root;password=qq1223" />
   </connectionStrings>
 	<!--<runtime>
 		--><!--配置之后，Appdomain.CurrentDomain.UnhandledException 事件的 IsTerminating 就变成了 false 啦！也就是说，程序并不会因为这次的异常而崩溃退出。--><!--
@@ -42,7 +42,7 @@
 		<!-- 无操作退出录像时间，单位秒，为0时不退出录像 -->
 		<add key="stopRecord" value="180"/>
 
-		<add key="gridConnectionString" value="MYSQL; Database=xtTest; Password=qq1223; Port=3306; Server=127.0.0.1; User=root;"/>
+		<add key="gridConnectionString" value="MYSQL; Database=xt; Password=qq1223; Port=3306; Server=127.0.0.1; User=root;"/>
 		<!-- 查询处方是orderNo还是orderGroupNo -->
 		<add key="OrderNoName" value="orderNo" />
 		<!-- 后门耗材板地址 没有则填写0-->
diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 783cce7..ebb4e1b 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -577,8 +577,8 @@ namespace DM_Weight.ViewModels
                         {
                             accountBookG2Day.ManuStock = accountBookG2Day.ManuStock - oi._OrderDetail.Quantity;
                             accountBookG2Day.OutQuantity = accountBookG2Day.OutQuantity + oi._OrderDetail.Quantity;
-                            accountBookG2Day.UseDose = (Convert.ToInt32(accountBookG2Day.UseDose) + Convert.ToInt32(oi._OrderDetail.surgicalResidual.UseDose)).ToString();
-                            accountBookG2Day.ResidualDose = (Convert.ToInt32(accountBookG2Day.ResidualDose) + Convert.ToInt32(oi._OrderDetail.surgicalResidual.ResidualDose)).ToString();
+                            accountBookG2Day.UseDose = (Convert.ToSingle(accountBookG2Day.UseDose!=null? accountBookG2Day.UseDose:0) + Convert.ToSingle(oi._OrderDetail.surgicalResidual.UseDose!=null? oi._OrderDetail.surgicalResidual.UseDose:0)).ToString();
+                            accountBookG2Day.ResidualDose = (Convert.ToSingle(accountBookG2Day.ResidualDose!=null? accountBookG2Day.ResidualDose:0) + Convert.ToSingle(oi._OrderDetail.surgicalResidual.ResidualDose!=null? oi._OrderDetail.surgicalResidual.ResidualDose:0)).ToString();
                             accountBookG2Day.TotalStock = (accountBookEmpty != null ? (accountBookEmpty.TotalStock > 0 ? accountBookEmpty.TotalStock : 0) : 0) + oi._OrderDetail.Quantity;
                             SqlSugarHelper.Db.Updateable(accountBookG2Day).ExecuteCommand();
                             manuStock = accountBookG2Day.ManuStock;