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 1f8b36d8..40a99ec7 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
@@ -963,7 +963,10 @@ public class OrderController extends BaseController {
         OrderDetail orderDetailReq = new OrderDetail();
         BeanUtils.copyProperties(orderListRequest, orderDetailReq);
         List<OrderDetail> list = orderDetailService.selectOrderDetailList(orderDetailReq);
-        count += list.size();
+        long size= list.stream()
+                .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
+                .filter(order -> order.getOrderStatus() != 5).count();
+        count += size;
         logger.info("子单超时数量{}传入的数据{}",count,orderListRequest);
         List<OrderMaster> allList = new ArrayList<>();
         List<Long> masterIdSet = new ArrayList<Long>();
@@ -981,7 +984,10 @@ public class OrderController extends BaseController {
                                 .map(OrderMaster::getId)                   // 再提取id
                                 .collect(Collectors.toList())
                 );
-                logger.info("符合条件主单数据{}",countParam);
+                if (CollectionUtils.isEmpty(countParam.getMasterIds())){
+                    return count;
+                }
+                logger.info("符合条件主单数据{},{}",countParam,CollectionUtils.isEmpty(countParam.getMasterIds()));
                 List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(countParam);
                 List<OrderDetail> result = orderDetails.stream().filter(s -> s.getTimeout().equals(1)).collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(result)) {