From d53f297632d2d399baaa0f476c50a55ec869b38d Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 19 Nov 2024 16:51:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E8=AF=8A=E8=BD=AF=E4=BB=B6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=A4=84=E6=96=B9=E7=99=BB=E8=AE=B0=E4=B8=93=E5=86=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B0=B1=E8=AF=8A=E5=8D=A1=E5=8F=B7=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/Report/GridReportUtil.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DM_Weight/Report/GridReportUtil.cs b/DM_Weight/Report/GridReportUtil.cs
index f345b1f..e953fb6 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -302,7 +302,7 @@ namespace DM_Weight.Report
             Report.LoadFromFile(new FileInfo(AppDomain.CurrentDomain.BaseDirectory) + "ReportTemp//account_book_order.grf");
 
             SQL = $@"SELECT DISTINCT oi.recv_date,oi.p_name,oi.sex,oi.age,oi.id_number,oi.patient_no,oi.disease,dm.manu_no,od.Quantity,oi.doctor_name,oi.order_no,dm.reviewer,dm.operator,ul.user_name operatorName,ul2.user_name reviewerName
-	                ,di.Drug_name,di.Drug_spec,di.big_unit,di.drug_id,dm.receivePerson,di.manuFactory
+	                ,di.Drug_name,di.Drug_spec,di.big_unit,di.drug_id,dm.receivePerson,di.manuFactory,patient_card
 	                 from order_info oi inner join order_detail od on oi.order_no=od.Order_No  
 	                 LEFT JOIN dm_machine_record dm on oi.order_no=dm.invoice_id 
 	                 inner JOIN drug_info di on od.drug_id=di.drug_id left join user_list ul on dm.operator=ul.id left join user_list ul2 on dm.reviewer=ul2.id WHERE dm.machine_id = '{p_machine_id}' and oi.recv_date>'{p_startDate}' and oi.recv_date<'{p_endDate}'";