From 6990170a0637d4e7ea830042647ee2be12bc204a Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 19 Nov 2024 16:54:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=A4=84=E6=96=B9=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0=E4=B8=93=E5=86=8C=E6=95=B0=E6=8D=AE=E5=8F=AA=E6=9F=A5?=
 =?UTF-8?q?dm=5Fmachine=5Frecord=E8=A1=A8=E4=B8=ADtype=3D2=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E7=9A=84=E8=AE=B0=E5=BD=95?=
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 e953fb6..95aef72 100644
--- a/DM_Weight/Report/GridReportUtil.cs
+++ b/DM_Weight/Report/GridReportUtil.cs
@@ -305,7 +305,7 @@ namespace DM_Weight.Report
 	                ,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}'";
+	                 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}' and dm.type=2 ";
             if (!string.IsNullOrEmpty(orderNo))
             {
                 SQL += $" and oi.order_no='{orderNo}'";