diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
index 9f54df76..7e95e1cc 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/order/OrderController.java
@@ -1006,6 +1006,7 @@ public class OrderController extends BaseController {
         orderMasterReq.setExceptOrderMasterIds(masterIdSet);
         List<OrderMaster> masterList = orderMasterService.selectOrderMasterList(orderMasterReq);
         allList.addAll(masterList);
+        logger.info("符合条件的主单数据{}",masterList);
         // 超时查询需要排除同个师傅的主单子单同时出现
         if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
             // 需要排除同个师傅的主单子单同时出现
@@ -1031,8 +1032,12 @@ public class OrderController extends BaseController {
                 if (isKeep) {
                     filteredMasterList.add(master);
                 }
+
             }
             count += filteredMasterList.size();
+            if (filteredMasterList.isEmpty()){
+                count += masterList.size();
+            }
         } else {
             count += masterList.size();
         }
@@ -1115,7 +1120,7 @@ public class OrderController extends BaseController {
         orderListResponses.addAll(masterList);
 //        }
         if (StringUtils.isNotEmpty(orderListRequest.getTimeout()+"")&&orderListRequest.getTimeout().equals(1)){
-            if (CollectionUtils.isNotEmpty(orderListResponses)){
+            if (!orderListResponses.isEmpty()){
                 orderListResponses = orderListResponses.stream()
                                 .filter(order -> order.getOrderStatus() != 5 && order.getOrderStatus() != 6)
                                 .collect(Collectors.toList());