From e4a814cea050d7a49585a433d4bd1c2d1ecde1d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Tue, 13 Jan 2026 09:54:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E7=94=9F?=
 =?UTF-8?q?=E6=88=90=E5=8D=B3=E6=97=B6=E6=8C=87=E4=BB=A4=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?bug=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/order/service/impl/DirectiveOrderServiceImpl.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java
index e6db5cd6..24fc139d 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/service/impl/DirectiveOrderServiceImpl.java
@@ -177,6 +177,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                 orders.setIzFinish("N");
                 orders.setOrderType("1");
                 orders.setOptType("1");
+                orders.setIzTimeout("N");
                 orders.setOptIds(employee.getEmployeeId());
                 orders.setOptNames(employee.getEmployeeName());
                 orders.setServiceAllowedTimeout(allowedTimeout);
@@ -190,6 +191,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                     ordersSub.setIzStart("N");
                     ordersSub.setIzFinish("N");
                     ordersSub.setOptType("1");
+                    ordersSub.setIzTimeout("N");
                     ordersSub.setOptIds(employee.getEmployeeId());
                     ordersSub.setOptNames(employee.getEmployeeName());
                     ordersSub.setServiceAllowedTimeout(allowedTimeout);
@@ -215,6 +217,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                 orders.setIzFinish("N");
                 orders.setOrderType("1");
                 orders.setOptType("1");
+                orders.setIzTimeout("N");
                 orders.setOptIds(employee.getEmployeeId());
                 orders.setOptNames(employee.getEmployeeName());
                 orders.setServiceAllowedTimeout(allowedTimeout);
@@ -228,6 +231,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                     ordersSub.setIzStart("N");
                     ordersSub.setIzFinish("N");
                     ordersSub.setOptType("1");
+                    ordersSub.setIzTimeout("N");
                     ordersSub.setOptIds(employee.getEmployeeId());
                     ordersSub.setOptNames(employee.getEmployeeName());
                     ordersSub.setServiceAllowedTimeout(allowedTimeout);
@@ -714,6 +718,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
             packageSubList = ordersSubService.getDirectiveList(orders.getDirectiveId());
             String directiveIds = packageSubList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(","));
             if(!directiveOrder.getTriggerMode().equals("1")){
+                getSendOrderRule();
                 DirectiveOrder employee = employeeScreening(directiveIds,orders.getElderId(),null,orders.getStartTime());
                 employeeId = employee.getEmployeeId();
                 employeeName = employee.getEmployeeName();
@@ -726,6 +731,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
             packageSubList = ordersSubService.getSubDirectiveList(orders.getPackageId());
             String directiveIds = packageSubList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(","));
             if(!directiveOrder.getTriggerMode().equals("1")){
+                getSendOrderRule();
                 List<DirectiveOrder> emps = baseMapper.getPermissionEmps(directiveIds);//获取服务标签中的员工和数量
                 if(packageSubList!=null){
                     int size = packageSubList.size();
@@ -754,6 +760,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
         orders.setEmployeeName(employeeName);
         orders.setIzStart("N");
         orders.setIzFinish("N");
+        orders.setIzTimeout("N");
         orders.setOptIds(employeeId);
         orders.setOptNames(employeeName);
         orders.setServiceAllowedTimeout(allowedTimeout);
@@ -782,6 +789,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                 ordersSub.setIzStart("N");
                 ordersSub.setIzFinish("N");
                 ordersSub.setOptType("1");
+                ordersSub.setIzTimeout("N");
                 ordersSub.setOptIds(employeeId);
                 ordersSub.setOptNames(employeeName);
                 ordersSub.setServiceAllowedTimeout(allowedTimeout);