diff --git a/DM_Weight/Port/SocketHelper.cs b/DM_Weight/Port/SocketHelper.cs
index 85534f0..e214f74 100644
--- a/DM_Weight/Port/SocketHelper.cs
+++ b/DM_Weight/Port/SocketHelper.cs
@@ -122,8 +122,16 @@ namespace DM_Weight.Port
         }
         public void SocketDisConnect()
         {
-            acceptor.SessionClosed -=new EventHandler<IoSessionEventArgs>(SessionCloseMethod);
-            iConnectFuture.Session.CloseNow();
+
+            try
+            {
+                acceptor.SessionClosed -= new EventHandler<IoSessionEventArgs>(SessionCloseMethod);
+                iConnectFuture.Session.CloseNow();
+            }
+            catch (Exception ex)
+            {
+                logger.Info($"SocketDisConnect异常{ex.Message}");
+            }
         }
 
         public void SendMessage(MyBaseMessage baseMessage)
diff --git a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
index eb12c11..331bb8e 100644
--- a/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckOrderNewWindowViewModel.cs
@@ -317,6 +317,8 @@ namespace DM_Weight.ViewModels
                                .Where(oi => oi.HisDispFlag == 0)
                                .Where(oi => oi.CancelFlag == 0)
                                .Where(oi => oi.DrawerCode==DrawerNo+1)
+                               .Where(oi=>oi._OrderDetail.SetManuNo!=null && oi._OrderDetail.SetManuNo != "null")
+                               .Where(oi => oi._OrderDetail.Quantity > 0)
                                .OrderBy(oi => oi.OrderId)
                                .ToPageList(PageNum, PageSize, ref totalCount);
 
diff --git a/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs b/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs
index a2c752e..e2ddd05 100644
--- a/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs
+++ b/DM_Weight/ViewModels/CheckSelfOrderWindowViewModel.cs
@@ -579,6 +579,8 @@ namespace DM_Weight.ViewModels
                                .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)
                                .OrderBy(oi => oi.OrderId)
                                .ToPageList(PageNum, PageSize, ref totalCount);