From 6900ea8ba19dc96b816a631021ea97790bb8e741 Mon Sep 17 00:00:00 2001 From: maqiao <625215135@qq.com> Date: Wed, 20 Nov 2024 10:30:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E6=96=B9=E5=8F=96?= =?UTF-8?q?=E4=B8=8E=E5=A4=9A=E5=A4=84=E6=96=B9=E5=8F=96=E8=8D=AF=E6=97=B6?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=95=B0=E6=8D=AE=E6=97=A5=E6=9C=9F=E6=90=9C?= =?UTF-8?q?=E7=B4=A2=E5=AD=97=E6=AE=B5=E4=BB=A5=E5=8F=8A=E6=8C=89=E5=A4=84?= =?UTF-8?q?=E6=96=B9=E5=8F=B7=E5=88=86=E7=BB=84(=E4=B8=8D=E8=83=BD?= =?UTF-8?q?=E6=8C=89=E6=97=A5=E6=9C=9F=E5=88=86=E7=BB=84=EF=BC=8C=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E4=BC=9A=E9=87=8D=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs | 4 ++-- DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs index 6fcebe9..26f7f02 100644 --- a/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs @@ -312,14 +312,14 @@ namespace DM_Weight.ViewModels List queryData = SqlSugarHelper.Db.Queryable() .InnerJoin((oi, od) => oi.OrderNo == od.OrderNo) .InnerJoin(SqlSugarHelper.Db.Queryable().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(OrderDate != null, oi => oi.RecvDate.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) .WhereIF(!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]), oi => oi.Pharmacy == ConfigurationManager.AppSettings["storage"]) .Where(oi => oi.DmStatus == 0) .Where(oi => oi.HisDispFlag == 0) .Where(oi => oi.CancelFlag == 0) - .GroupBy(oi => oi.OrderDate) + .GroupBy(oi => oi.OrderNo) .Select(oi => oi) .ToPageList(PageNum, PageSize, ref totalCount); //.ToList(); diff --git a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs index 148b455..64442c8 100644 --- a/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs +++ b/DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs @@ -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.OrderDate) + .GroupBy(oi => oi.OrderNo) .Select(oi => oi) .ToPageList(PageNum, PageSize, ref totalCount); //.ToList();