diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index 8292a9e..2779225 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -109,7 +109,7 @@ namespace DM_Weight.ViewModels
             set => SetProperty(ref _ordersList, value);
         }
 
-        private List<TotalDrug>? _totalDrugList;
+        private List<TotalDrug>? _totalDrugList=new List<TotalDrug>();
         public List<TotalDrug>? 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();
 
                 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)
                                //.InnerJoin<OrderDetail>((oi, od) => oi.OrderNo == od.OrderNo)
                                //.InnerJoin<DrugInfo>((oi, od, di) => od.DrugId == di.DrugId.ToString())
@@ -168,7 +168,9 @@ namespace DM_Weight.ViewModels
                 if (OrderInfoList != null && OrderInfoList.Count() > 0)
                 {
                     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
                 {
@@ -195,7 +197,10 @@ namespace DM_Weight.ViewModels
                     }).ToList();
                     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();
+
                     }
                 }
             });
diff --git a/DM_Weight/Views/CheckOrderNewWindow.xaml b/DM_Weight/Views/CheckOrderNewWindow.xaml
index 4febf7e..a2dc6f5 100644
--- a/DM_Weight/Views/CheckOrderNewWindow.xaml
+++ b/DM_Weight/Views/CheckOrderNewWindow.xaml
@@ -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}"/>-->
 
         </Grid>
-        <Grid Grid.Column="1" Margin="6"  Visibility="{Binding IsEnableList}">
+        <Grid Grid.Column="1" Margin="6">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto"/>
                 <ColumnDefinition Width="Auto"/>                
@@ -179,7 +179,7 @@
                         <!--<GridViewColumn Width="240"
                         DisplayMemberBinding="{Binding DeptName}"
                         Header="科室"/>-->
-                        <GridViewColumn Width="100"
+                        <!--<GridViewColumn Width="100"
                         DisplayMemberBinding="{Binding _OrderDetail.DrugInfo.DrugName}"
                         Header="药品名称"/>
                         <GridViewColumn Width="80"
@@ -190,7 +190,36 @@
                         Header="药品效期"/>
                         <GridViewColumn Width="30"
                         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>
                 </ListView.View>
             </ListView>