diff --git a/DM_Weight/ReportTemp/account_book_new.grf b/DM_Weight/ReportTemp/account_book_new.grf
index 2723e51..7e45de0 100644
--- a/DM_Weight/ReportTemp/account_book_new.grf
+++ b/DM_Weight/ReportTemp/account_book_new.grf
@@ -229,6 +229,7 @@
 				{
 					"Column":"批次",
 					"TextAlign":"MiddleCenter",
+					"ShrinkFontToFit":true,
 					"DataField":"批号"
 				},
 				{
diff --git a/DM_Weight/ViewModels/CheckSelfOrderWindowNewViewModel.cs b/DM_Weight/ViewModels/CheckSelfOrderWindowNewViewModel.cs
index ef52eca..f41dd88 100644
--- a/DM_Weight/ViewModels/CheckSelfOrderWindowNewViewModel.cs
+++ b/DM_Weight/ViewModels/CheckSelfOrderWindowNewViewModel.cs
@@ -562,32 +562,6 @@ namespace DM_Weight.ViewModels
                 DrawerType = currentList.DrawerType;
                 //string currentDrawerUser = currentList.BelongUser;
                 string currentDrawerUser = HomeWindowViewModel.Operator.UserBarcode;
-                //OrderInfoList = SqlSugarHelper.Db.Queryable<OrderInfo>()
-                //                .Includes(oi => oi._OrderDetail, od => od.DrugInfo)
-                //                .Includes(oi => oi._OrderDetail, od => od.surgicalResidual)
-                //               .WhereIF(OrderDate != null, oi => oi.RecvDate.ToString("yyyy-MM-dd") == OrderDate)
-                //               .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)
-                //               .Where(oi => oi.DoctorCode == currentDrawerUser)
-                //               .Where(oi => oi._OrderDetail.SetManuNo != null&&oi._OrderDetail.SetManuNo!="null")
-                //               .Where(oi=>oi._OrderDetail.Quantity>0)
-                //               .Where(oi=>oi._OrderDetail.surgicalResidual.SendNo== DrawerNo.ToString())
-                //               .OrderBy(oi => oi.OrderId)
-                //               .ToPageList(PageNum, PageSize, ref totalCount);
-                //if (OrderInfoList != null && OrderInfoList.Count() > 0)
-                //{
-                //    OrderInfoList.ForEach(oi => oi.ItemIsChecked = true);
-                //    OrderInfoList.ForEach(oi => oi._OrderDetail.DrugInfo = oi._OrderDetail.DrugInfo ?? new DrugInfo());
-                //    //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).Select(OrderDetailList => OrderDetailList._OrderDetail).GroupBy(item => item.DrugInfo.DrugName).Select(group => new TotalDrug { DrugName = group.Key, TotalCount = group.Sum(item => item.Quantity) }).ToList();
-                //}
-                //else
-                //{
-                //    TotalDrugList = null;
-                //}
-
                 SurgicalResidualList = SqlSugarHelper.Db.Queryable<SurgicalResidual>()
                     .Includes(sr => sr.DrugInfo)
                     .WhereIF(OrderDate != null, sr => sr.CreateTime.ToString("yyyy-MM-dd") == OrderDate)
diff --git a/DM_Weight/Views/CheckSelfOrderWindow.xaml b/DM_Weight/Views/CheckSelfOrderWindow.xaml
index c2a08d5..7475841 100644
--- a/DM_Weight/Views/CheckSelfOrderWindow.xaml
+++ b/DM_Weight/Views/CheckSelfOrderWindow.xaml
@@ -129,9 +129,7 @@
                     IsEnabled="{Binding SelfEnable}"
                     materialDesign:ButtonProgressAssist.IsIndicatorVisible="{Binding SelfStatus, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
                     materialDesign:ButtonProgressAssist.IsIndeterminate="{Binding SelfStatus, Converter={StaticResource StatusConverter}, ConverterParameter=opearBtnLoading}"
-                    Style="{StaticResource MaterialDesignOutlinedLightButton}"/>-->
-                    <Button Margin="0 0 6 0" VerticalAlignment="Center" Command="{Binding TakeBoxCommand}" Content="取药箱" Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=TakeBox}" Style="{StaticResource MaterialDesignOutlinedLightButton}"></Button>
-                    <Button Margin="0 0 6 0" VerticalAlignment="Center" Command="{Binding ReturnBoxCommand}" Content="还药箱" Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=ReturnBox}"  Style="{StaticResource MaterialDesignOutlinedLightButton}"> </Button>
+                    Style="{StaticResource MaterialDesignOutlinedLightButton}"/>--><Button Margin="0 0 6 0" VerticalAlignment="Center" Command="{Binding ReturnBoxCommand}" Content="还药箱" Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=ReturnBox}"  Style="{StaticResource MaterialDesignOutlinedLightButton}"> </Button>
                     <Button  Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=TakeBox}" 
                         Margin="0 0 6 0"
                         VerticalAlignment="Center" Command="{Binding CheckOrder}"
@@ -150,6 +148,9 @@
                         ToolTip="刷新" Command="{Binding Query}">
                         <materialDesign:PackIcon Kind="Refresh" />
                     </Button>
+                    
+                    <Button Margin="6 0 6 0" VerticalAlignment="Center" Command="{Binding TakeBoxCommand}" Content="取药箱" Visibility="{Binding OperationType,Converter={StaticResource TakeReturnConverter},ConverterParameter=TakeBox}" Style="{StaticResource MaterialDesignOutlinedLightButton}"></Button>
+                    
                 </StackPanel>
             </Grid>
             <!--<Grid Grid.Row="1" Grid.Column="0" Margin="0 0 -100 0">-->