From 9a3dd191734e2905f3051b910a3c7572baa4e6bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 12 Jan 2026 10:17:26 +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=B7=A5=E5=8D=95=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=AE=9E?=
 =?UTF-8?q?=E9=99=85=E6=89=A7=E8=A1=8C=E4=BA=BA=EF=BC=8C=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E5=AE=B9=E9=94=99=E6=97=B6=E9=95=BF=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/DirectiveOrderServiceImpl.java       | 32 +++++++++++++++++++
 1 file changed, 32 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 9a014df0..1d622030 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
@@ -12,6 +12,7 @@ import com.nu.modules.config.sendorderrule.entity.SendOrderRule;
 import com.nu.modules.config.sendorderrule.entity.SendOrderRuleSub;
 import com.nu.modules.config.sendorderrule.service.ISendOrderRuleService;
 import com.nu.modules.config.sendorderrule.service.ISendOrderRuleSubService;
+import com.nu.modules.sysconfig.ISysConfigApi;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.api.vo.Result;
@@ -42,9 +43,29 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
     @Autowired
     ISendOrderRuleSubService sendOrderRuleSubService;
     @Autowired
+    private ISysConfigApi sysConfigApi;
+    @Autowired
     private ISysBaseAPI sysBaseAPI;
     SendOrderRule sendOrderRule;
     List<SendOrderRuleSub> ruleSubList;
+    private String allowedTimeout;
+
+    /**
+     * 获取容错时长
+     *
+     * @return
+     */
+    private void getAllowedTimeout() {
+        if (allowedTimeout == null || allowedTimeout.equals("")) {
+            JSONObject json = sysConfigApi.getByKey("fwzl_rcsc");
+            if (json != null) {
+                allowedTimeout = json.getString("configValue");
+            }
+        }
+        if(allowedTimeout == null || allowedTimeout.equals("")){
+            allowedTimeout = "0";
+        }
+    }
 
     /**
      * 获取派单规则
@@ -102,6 +123,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
     public Result<?> generateOrdersBatch(){
         //获取派单规则
         getSendOrderRule();
+        getAllowedTimeout();
         List<DirectiveOrder> ordersList = baseMapper.queryDataPoolList(null);
         for(int i=0;i<ordersList.size();i++){
             DirectiveOrder orders = ordersList.get(i);
@@ -130,6 +152,10 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                 orders.setIzStart("N");
                 orders.setIzFinish("N");
                 orders.setOrderType("1");
+                orders.setOptType("1");
+                orders.setOptIds(employee.getEmployeeId());
+                orders.setOptNames(employee.getEmployeeName());
+                orders.setServiceAllowedTimeout(allowedTimeout);
                 this.save(orders);//生成工单主表
                 for(int i=0;i<ordersSubList.size();i++){
                     DirectiveOrderSub ordersSub = ordersSubList.get(i);
@@ -160,6 +186,11 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                 orders.setEmployeeName(employee.getEmployeeName());
                 orders.setIzStart("N");
                 orders.setIzFinish("N");
+                orders.setOrderType("1");
+                orders.setOptType("1");
+                orders.setOptIds(employee.getEmployeeId());
+                orders.setOptNames(employee.getEmployeeName());
+                orders.setServiceAllowedTimeout(allowedTimeout);
                 this.save(orders);//生成工单主表
                 for(int i=0;i<ordersSubList.size();i++){
                     DirectiveOrderSub ordersSub = ordersSubList.get(i);
@@ -169,6 +200,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                     ordersSub.setEmployeeName(employee.getEmployeeName());
                     ordersSub.setIzStart("N");
                     ordersSub.setIzFinish("N");
+                    ordersSub.setOrderType("1");
                     ordersSubService.save(ordersSub);//生成工单子表
                 }
                 baseMapper.updatePoolIzOrder(orders.getPoolId());