From 6a9d8e0aeba12d75769869225c8c54c5435b3ad3 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Thu, 5 Jun 2025 11:21:25 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=98=E7=A9=BA=E7=93=B6=E6=97=B6=E5=86=99?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=AE=B0=E5=BD=95=E4=B8=BA=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=A1=8C=E6=95=B0=E9=87=8F=E8=80=8C=E4=B8=8D=E6=98=AF=E5=BD=92?=
 =?UTF-8?q?=E8=BF=98=E7=9A=84=E6=80=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                               | 2 +-
 DM_Weight/Report/GridReportUtil.cs                 | 2 +-
 DM_Weight/ReportTemp/return_empty.grf              | 9 +++++----
 DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index 003bda7..8d3fc20 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -28,7 +28,7 @@
 		<!-- 自动退出时间，单位秒，为0时不自动退出 -->
 		<add key="autoExit" value="0"/>
 		<!--报表数据库连接-->
-		<add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
+		<add key="gridConnectionString" value="MYSQL; Database=sanya_xianchang2; Password=root; Port=3306; Server=127.0.0.1; User=root;"/>
 		<!-- 查询处方是orderNo还是orderGroupNo -->
 		<add key="OrderNoName" value="orderNo" />
 		<!-- 后门耗材板地址 没有则填写0-->
diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index 82f82ff..9bbb1fc 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -347,7 +347,7 @@ namespace DM_Weight.Report
 									 inner join drug_info di on dm.drug_id=di.drug_id	
                                      where dm.type=32 and dm.machine_id = '{p_machine_id}' and dm.operation_time>'{p_startDate}' and dm.operation_time<'{p_endDate}'";
 
-            SQL += " order by dm.operation_time,di.drug_id";
+            SQL += " order by di.drug_id,dm.operation_time";
 
             Report.DetailGrid.Recordset.ConnectionString = gridConnectionString;
             Report.DetailGrid.Recordset.QuerySQL = SQL;
diff --git a/DM_Weight/ReportTemp/return_empty.grf b/DM_Weight/ReportTemp/return_empty.grf
index f44ac49..0397dd6 100644
--- a/DM_Weight/ReportTemp/return_empty.grf
+++ b/DM_Weight/ReportTemp/return_empty.grf
@@ -72,7 +72,7 @@
 			},
 			{
 				"Name":"患者姓名",
-				"Width":3.78354
+				"Width":1.98438
 			},
 			{
 				"Name":"使用科室",
@@ -84,7 +84,7 @@
 			},
 			{
 				"Name":"批次",
-				"Width":1.79917
+				"Width":3.20146
 			},
 			{
 				"Name":"交回人",
@@ -96,7 +96,7 @@
 			}
 		],
 		"ColumnContent":{
-			"Height":4.78896,
+			"Height":1.19063,
 			"ColumnContentCell":[
 				{
 					"Column":"Column2",
@@ -137,7 +137,7 @@
 		},
 		"ColumnTitle":{
 			"Height":1.40229,
-			"RepeatStyle":"OnPage",
+			"RepeatStyle":"OnGroupHeaderPage",
 			"ColumnTitleCell":[
 				{
 					"GroupTitle":true,
@@ -253,6 +253,7 @@
 				"Name":"Group2",
 				"ByFields":"drug_id",
 				"GroupHeader":{
+					"NewPage":"Before",
 					"PrintGridBorder":false,
 					"RepeatOnPage":true,
 					"Control":[
diff --git a/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs b/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
index 4aeb266..9c3b635 100644
--- a/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
+++ b/DM_Weight/ViewModels/ReturnEmptyDialogViewModel.cs
@@ -397,7 +397,7 @@ namespace DM_Weight.ViewModels
                                 ReturnPerson = ReturnPerson,
                                 ReceivePerson = ReceivePerson,
                                 OperationTime = DateTime.Now,
-                                Quantity = ReturnQuantity,
+                                Quantity =_MachineRecord.Quantity, //ReturnQuantity,
                                 Type = 32,
                                 InvoiceId = _MachineRecord.InvoiceId, //InvoiceId,
                                 GetId = _MachineRecord.Id,