maqiao
/
HuNan_DM
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改处方取与多处方取药时查询数据日期搜索字段以及按处方号分组(不能按日期分组，日期会重复

This commit is contained in:
maqiao 2024-11-20 10:30:47 +08:00
parent 6990170a06
commit 6900ea8ba1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
DM_Weight/ViewModels/MultiOrderTakeDrugWindowViewModel.cs
View File

@ -312,14 +312,14 @@ namespace DM_Weight.ViewModels
List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>() List<OrderInfo> queryData = SqlSugarHelper.Db.Queryable<OrderInfo>()
.InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo) .InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
.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) .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(OrderDate != null, oi => oi.RecvDate.ToString("yyyy-MM-dd") == OrderDate)
.WhereIF(!(OrderDepartment.DeptName.Equals("全部")), oi => oi.DeptName == OrderDepartment.DeptName) .WhereIF(!(OrderDepartment.DeptName.Equals("全部")), oi => oi.DeptName == OrderDepartment.DeptName)
//.WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PatientId"), oi => oi.PatientId == SearchValue) //.WhereIF(!String.IsNullOrEmpty(SearchValue) && SelectedItem.Code.Equals("PatientId"), oi => oi.PatientId == SearchValue)
.WhereIF(!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]), oi => oi.Pharmacy == ConfigurationManager.AppSettings["storage"]) .WhereIF(!String.IsNullOrEmpty(ConfigurationManager.AppSettings["storage"]), oi => oi.Pharmacy == ConfigurationManager.AppSettings["storage"])
.Where(oi => oi.DmStatus == 0) .Where(oi => oi.DmStatus == 0)
.Where(oi => oi.HisDispFlag == 0) .Where(oi => oi.HisDispFlag == 0)
.Where(oi => oi.CancelFlag == 0) .Where(oi => oi.CancelFlag == 0)
.GroupBy(oi => oi.OrderDate) .GroupBy(oi => oi.OrderNo)
.Select(oi => oi) .Select(oi => oi)
.ToPageList(PageNum, PageSize, ref totalCount); .ToPageList(PageNum, PageSize, ref totalCount);
//.ToList(); //.ToList();

2
DM_Weight/ViewModels/OrderTakeDrugWindowViewModel.cs
View File

@ -235,7 +235,7 @@ namespace DM_Weight.ViewModels
.Where(oi => oi.DmStatus == 0) .Where(oi => oi.DmStatus == 0)
.Where(oi => oi.HisDispFlag == 0) .Where(oi => oi.HisDispFlag == 0)
.Where(oi => oi.CancelFlag == 0) .Where(oi => oi.CancelFlag == 0)
.GroupBy(oi => oi.OrderDate) .GroupBy(oi => oi.OrderNo)
.Select(oi => oi) .Select(oi => oi)
.ToPageList(PageNum, PageSize, ref totalCount); .ToPageList(PageNum, PageSize, ref totalCount);
//.ToList(); //.ToList();