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 0ccef8f5..44818744 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
@@ -964,7 +964,7 @@ public class OrderController extends BaseController {
         BeanUtils.copyProperties(orderListRequest, orderDetailReq);
         List<OrderDetail> list = orderDetailService.selectOrderDetailList(orderDetailReq);
         count += list.size();
-        logger.info("子单超时数量{}",count);
+        logger.info("子单超时数量{}子单数据{}",count,list);
         List<OrderMaster> allList = new ArrayList<>();
         List<Long> masterIdSet = new ArrayList<Long>();
         if (orderListRequest.getTimeout() != null && orderListRequest.getTimeout() == 1) {
@@ -974,7 +974,12 @@ public class OrderController extends BaseController {
             List<OrderMaster> allOrderMaster = orderMasterService.selectOrderMasterList(param);
             if (CollectionUtils.isNotEmpty(allOrderMaster)) {
                 OrderDetail countParam = new OrderDetail();
-                countParam.setMasterIds(allOrderMaster.stream().map(OrderMaster::getId).collect(Collectors.toList()));
+                countParam.setMasterIds(
+                        allOrderMaster.stream()
+                                .filter(order -> order.getOrderStatus() != 6) // 先过滤状态不等于6的订单
+                                .map(OrderMaster::getId)                   // 再提取id
+                                .collect(Collectors.toList())
+                );
                 List<OrderDetail> orderDetails = orderDetailService.selectOrderDetailList(countParam);
                 List<OrderDetail> result = orderDetails.stream().filter(s -> s.getTimeout().equals(1)).collect(Collectors.toList());
                 if (CollectionUtils.isNotEmpty(result)) {
@@ -987,7 +992,7 @@ public class OrderController extends BaseController {
                 allList.addAll(orderMasterService.selectOrderMasterList(timeOutMaster));
             }
         }
-
+        logger.info("子单超时返回的主单数量{}子单数据{}",allList.size(),allList);
         // 查询主单
         OrderMaster orderMasterReq = new OrderMaster();
         BeanUtils.copyProperties(orderListRequest, orderMasterReq);