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

修改核对处方时由原来一个处方一个detail改为多人detail

This commit is contained in:
maqiao 2024-08-28 17:03:16 +08:00
parent e48cafb748
commit c186ab48bf
2 changed files with 41 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
View File

@ -109,7 +109,7 @@ namespace DM_Weight.ViewModels
set => SetProperty(ref _ordersList, value); set => SetProperty(ref _ordersList, value);
} }
private List<TotalDrug>? _totalDrugList; private List<TotalDrug>? _totalDrugList=new List<TotalDrug>();
public List<TotalDrug>? TotalDrugList public List<TotalDrug>? TotalDrugList
{ {
get => _totalDrugList; get => _totalDrugList;
@ -152,7 +152,7 @@ namespace DM_Weight.ViewModels
string currentDrawerUser = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cl => cl.DrawerNo == DrawerNo + 1 && cl.MachineId == "DM5").Select(cl => cl.BelongUser).First(); string currentDrawerUser = SqlSugarHelper.Db.Queryable<ChannelList>().Where(cl => cl.DrawerNo == DrawerNo + 1 && cl.MachineId == "DM5").Select(cl => cl.BelongUser).First();
OrderInfoList = SqlSugarHelper.Db.Queryable<OrderInfo>() OrderInfoList = SqlSugarHelper.Db.Queryable<OrderInfo>()
.Includes(oi => oi._OrderDetail, od => od.DrugInfo) .Includes(oi => oi.OrderDetailList, od => od.DrugInfo)
//.Includes(cl => cl.channelStocks, cs => cs.DrugInfo,di=>di.drugBase) //.Includes(cl => cl.channelStocks, cs => cs.DrugInfo,di=>di.drugBase)
//.InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo) //.InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
//.InnerJoin<DrugInfo>((oi, od, di) => od.DrugId == di.DrugId.ToString()) //.InnerJoin<DrugInfo>((oi, od, di) => od.DrugId == di.DrugId.ToString())
@ -168,7 +168,9 @@ namespace DM_Weight.ViewModels
if (OrderInfoList != null && OrderInfoList.Count() > 0) if (OrderInfoList != null && OrderInfoList.Count() > 0)
{ {
OrderInfoList.ForEach(oi => oi.ItemIsChecked = true); OrderInfoList.ForEach(oi => oi.ItemIsChecked = true);
TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).GroupBy(oi => oi._OrderDetail.DrugInfo.DrugName).Select(oi => new TotalDrug { DrugName = oi.Key, TotalCount = oi.Sum(item => item._OrderDetail.Quantity) }).ToList(); //TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).GroupBy(oi => oi.OrderDetailList.DrugInfo.DrugName).Select(oi => new TotalDrug { DrugName = oi.Key, TotalCount = oi.Sum(item => item.OrderDetailList.Quantity) }).ToList();
TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).SelectMany(OrderDetailList => OrderDetailList.OrderDetailList).GroupBy(item=>item.DrugInfo.DrugName).Select(group => new TotalDrug { DrugName = group.Key, TotalCount = group.Sum(item => item.Quantity) }).ToList();
} }
else else
{ {
@ -195,7 +197,10 @@ namespace DM_Weight.ViewModels
}).ToList(); }).ToList();
if (OrderInfoList != null && OrderInfoList.Count() > 0) if (OrderInfoList != null && OrderInfoList.Count() > 0)
{ {
TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).GroupBy(oi => oi._OrderDetail.DrugInfo.DrugName).Select(oi => new TotalDrug { DrugName = oi.Key, TotalCount = oi.Sum(item => item._OrderDetail.Quantity) }).ToList(); //TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).GroupBy(oi => oi._OrderDetail.DrugInfo.DrugName).Select(oi => new TotalDrug { DrugName = oi.Key, TotalCount = oi.Sum(item => item._OrderDetail.Quantity) }).ToList();
TotalDrugList = OrderInfoList.Where(oi => oi.ItemIsChecked).SelectMany(OrderDetailList => OrderDetailList.OrderDetailList).GroupBy(item => item.DrugInfo.DrugName).Select(group => new TotalDrug { DrugName = group.Key, TotalCount = group.Sum(item => item.Quantity) }).ToList();
} }
} }
}); });

35
DM_Weight/Views/CheckOrderNewWindow.xaml
View File

@ -99,7 +99,7 @@
<Button Grid.Row="9" Grid.Column="1" Width="120" Content="20号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="20" IsEnabled="{Binding DrawerNo, Converter={StaticResource BoxNumConverter}, ConverterParameter=20}"/>--> <Button Grid.Row="9" Grid.Column="1" Width="120" Content="20号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="20" IsEnabled="{Binding DrawerNo, Converter={StaticResource BoxNumConverter}, ConverterParameter=20}"/>-->
</Grid> </Grid>
<Grid Grid.Column="1" Margin="6" Visibility="{Binding IsEnableList}"> <Grid Grid.Column="1" Margin="6">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
@ -179,7 +179,7 @@
<!--<GridViewColumn Width="240" <!--<GridViewColumn Width="240"
DisplayMemberBinding="{Binding DeptName}" DisplayMemberBinding="{Binding DeptName}"
Header="科室"/>--> Header="科室"/>-->
<GridViewColumn Width="100" <!--<GridViewColumn Width="100"
DisplayMemberBinding="{Binding _OrderDetail.DrugInfo.DrugName}" DisplayMemberBinding="{Binding _OrderDetail.DrugInfo.DrugName}"
Header="药品名称"/> Header="药品名称"/>
<GridViewColumn Width="80" <GridViewColumn Width="80"
@ -190,7 +190,36 @@
Header="药品效期"/> Header="药品效期"/>
<GridViewColumn Width="30" <GridViewColumn Width="30"
DisplayMemberBinding="{Binding _OrderDetail.Quantity}" DisplayMemberBinding="{Binding _OrderDetail.Quantity}"
Header="数量"/> Header="数量"/>-->
<GridViewColumn Width="100" Header="药品名称">
<GridViewColumn.CellTemplate>
<DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="DrugInfo.DrugName" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Width="100" Header="药品批次">
<GridViewColumn.CellTemplate>
<DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="SetManuNo" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Width="100" Header="药品效期">
<GridViewColumn.CellTemplate>
<DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="SetEffDate" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Width="100" Header="数量">
<GridViewColumn.CellTemplate>
<DataTemplate>
<ListBox ItemsSource="{Binding OrderDetailList}" DisplayMemberPath="Quantity" materialDesign:ListBoxItemAssist.ShowSelection="False"></ListBox>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
</GridView> </GridView>
</ListView.View> </ListView.View>
</ListView> </ListView>