From a737236b259ab845516e6a8432428284a9bcfc86 Mon Sep 17 00:00:00 2001
From: maqiao <625215135@qq.com>
Date: Tue, 19 Nov 2024 09:37:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E6=96=B9=E5=8F=96?=
 =?UTF-8?q?=E8=8D=AF=E3=80=81=E5=A4=9A=E5=A4=84=E6=96=B9=E5=8F=96=E8=8D=AF?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=97=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2channelStock=E8=A1=A8groupby=E7=94=A8orderdat?=
 =?UTF-8?q?e=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DM_Weight/App.config                                      | 2 +-
 DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs | 4 ++--
 DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs      | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DM_Weight/App.config b/DM_Weight/App.config
index d5eed5b..d81b521 100644
--- a/DM_Weight/App.config
+++ b/DM_Weight/App.config
@@ -18,7 +18,7 @@
 		<!-- 领用部门 -->
 		<add key="receiveDept" value="麻精药房" />
 		<!--2023/7/13 药房代码 有则写无则空 -->
-		<add key="storage" value="009902" />
+		<add key="storage" value="009904" />
 		<!-- 登录模式 1单人登录2双人登录 -->
 		<add key="loginMode" value="1" />
 		<!-- 登录顺序,指定先登录的人的名称有效值，只有在登录模式等于2时才会生效； 发药人：【operator】审核人：【reviewer】 -->
diff --git a/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs
index 811d242..6fcebe9 100644
--- a/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs
@@ -311,7 +311,7 @@ namespace DM_Weight.ViewModels
             //}
             List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
                 .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
-                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelList>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM3")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
+                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM3")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
                 .WhereIF(OrderDate != null, oi => oi.OrderDate.ToString("yyyy-MM-dd") == OrderDate)
                 .WhereIF(!(OrderDepartment.DeptName.Equals("全部")), oi => oi.DeptName == OrderDepartment.DeptName)
                 //.WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PatientId"), oi => oi.PatientId == SearchValue)
@@ -319,7 +319,7 @@ namespace DM_Weight.ViewModels
                 .Where(oi => oi.DmStatus == 0)
                 .Where(oi => oi.HisDispFlag == 0)
                 .Where(oi => oi.CancelFlag == 0)
-                .GroupBy(oi => oi.OrderNo)
+                .GroupBy(oi => oi.OrderDate)
                 .Select(oi => oi)
                 .ToPageList(PageNum, PageSize, ref totalCount);
             //.ToList();
diff --git a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
index 52f36f0..148b455 100644
--- a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
+++ b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
@@ -227,7 +227,7 @@ namespace DM_Weight.ViewModels
             int totalCount = 0;
             List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
                 .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
-                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelList>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
+                .InnerJoin(SqlSugarHelper.Db.Queryable<ChannelStock>().Where(cs => cs.DrawerType == 1).Where(cs => cs.MachineId.Equals(ConfigurationManager.AppSettings["machineId"] ?? "DM1")).GroupBy(cs => cs.DrugId), (oi, od, t) => od.DrugId == t.DrugId)
                 .WhereIF(OrderDate != null, oi => oi.RecvDate.ToString("yyyy-MM-dd") == OrderDate)
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("OrderNo"), oi => oi.OrderNo == SearchValue)
                 .WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PatientId"), oi => oi.PatientId == SearchValue)
@@ -235,7 +235,7 @@ namespace DM_Weight.ViewModels
                 .Where(oi => oi.DmStatus == 0)
                 .Where(oi => oi.HisDispFlag == 0)
                 .Where(oi => oi.CancelFlag == 0)
-                .GroupBy(oi => oi.OrderNo)
+                .GroupBy(oi => oi.OrderDate)
                 .Select(oi => oi)
                 .ToPageList(PageNum, PageSize, ref totalCount);
                 //.ToList();