From 1ca1487be2c4ee6670d07955e9a634a4a71ddeb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 21 Jan 2026 10:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4-=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E7=94=9F=E6=88=90=E5=B7=A5=E5=8D=95=E5=AD=90=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E5=91=A8=E6=9C=9F=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/DirectiveOrderSubMapper.xml    |  6 ----
 .../impl/DirectiveOrderServiceImpl.java       | 28 +++++++++++--------
 2 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml
index 3840d61d..5f027d1e 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/order/mapper/xml/DirectiveOrderSubMapper.xml
@@ -12,8 +12,6 @@
             d.type_name as typeName,
             a.id as directiveId,
             a.directive_name as directiveName,
-            a.cycle_type as cycleTypeId,
-            f.item_text AS cycleType,
             a.preview_file as previewFile,
             a.preview_file_small as previewFileSmall,
             a.mp3_file as mp3File,
@@ -25,7 +23,6 @@
         left join nu_config_service_instruction_tag b on a.instruction_tag_id = b.id
         left join nu_config_service_category c on a.category_id = c.id
         left join nu_config_service_type d on a.type_id = d.id
-        left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = a.cycle_type
         where a.id = #{directiveId}
           and a.del_flag = '0'
           and a.iz_enabled = 'Y'
@@ -41,8 +38,6 @@
             d.type_name as typeName,
             b.id as directiveId,
             b.directive_name as directiveName,
-            b.cycle_type as cycleTypeId,
-            f.item_text AS cycleType,
             b.preview_file as previewFile,
             b.preview_file_small as previewFileSmall,
             b.mp3_file as mp3File,
@@ -55,7 +50,6 @@
         left join nu_config_service_category c on b.category_id = c.id
         left join nu_config_service_type d on b.type_id = d.id
         left join nu_config_service_instruction_tag e on b.instruction_tag_id = e.id
-        left join sys_dict_item f on f.dict_id = '1900374791386140674' and f.item_value = b.cycle_type
         where a.package_id = #{packageId}
           and a.del_flag = '0'
           and a.iz_enabled = 'Y'
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 31ec47ac..cecd6257 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
@@ -215,6 +215,8 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                         ordersSub.setElderName(orders.getElderName());
                         ordersSub.setEmployeeId(employee.getEmployeeId());
                         ordersSub.setEmployeeName(employee.getEmployeeName());
+                        ordersSub.setCycleTypeId(orders.getCycleTypeId());
+                        ordersSub.setCycleType(orders.getCycleType());
                         ordersSub.setCycleValue(orders.getCycleValue());
                         ordersSub.setIzPackage(orders.getIzPackage());
                         ordersSub.setStartTime(orders.getStartTime());
@@ -263,6 +265,8 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                         ordersSub.setElderName(orders.getElderName());
                         ordersSub.setEmployeeId(employee.getEmployeeId());
                         ordersSub.setEmployeeName(employee.getEmployeeName());
+                        ordersSub.setCycleTypeId(orders.getCycleTypeId());
+                        ordersSub.setCycleType(orders.getCycleType());
                         ordersSub.setCycleValue(orders.getCycleValue());
                         ordersSub.setIzPackage(orders.getIzPackage());
                         if(!orders.getIzPackage().equals("N")){
@@ -737,7 +741,7 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
         }
 
         DirectiveOrder orders = baseMapper.getInstantById(directiveOrder);
-        List<DirectiveOrderSub> packageSubList = null;
+        List<DirectiveOrderSub> subList = null;
         String employeeId = "";
         String employeeName = "";
         Calendar c = Calendar.getInstance();
@@ -789,8 +793,8 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
         orders.setStartTime(startTime);
         orders.setEndTime(endTime);
         if(orders.getIzPackage().equals("N")){
-            packageSubList = ordersSubService.getDirectiveList(orders.getDirectiveId());
-            String directiveIds = packageSubList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(","));
+            subList = ordersSubService.getDirectiveList(orders.getDirectiveId());
+            String directiveIds = subList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(","));
             if(!directiveOrder.getTriggerMode().equals("1")){
                 getSendOrderRule();
                 DirectiveOrder employee = employeeScreening(directiveIds,orders.getElderId(),null,orders.getStartTime());
@@ -798,15 +802,13 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                 employeeName = employee.getEmployeeName();
             }
         }else{
-            orders.setDirectiveId(null);
-            orders.setDirectiveName(null);
-            packageSubList = ordersSubService.getSubDirectiveList(orders.getDirectiveId());
-            String directiveIds = packageSubList.stream().map(DirectiveOrderSub::getDirectiveId).collect(Collectors.joining(","));
+            subList = ordersSubService.getSubDirectiveList(orders.getDirectiveId());
+            String directiveIds = subList.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();
+                if(subList!=null){
+                    int size = subList.size();
                     emps.removeIf(data -> data.getOwnCn() < size);//删除没有权限的数据
                 }
                 String employeeIds = emps.stream().map(DirectiveOrder::getEmployeeId).collect(Collectors.joining(","));
@@ -836,9 +838,9 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
         orders.setOptNames(employeeName);
         orders.setDelFlag("0");
         this.save(orders);//生成工单主表
-        if(packageSubList!=null){
-            for(int i=0;i<packageSubList.size();i++){
-                DirectiveOrderSub ordersSub = packageSubList.get(i);
+        if(subList!=null){
+            for(int i=0;i<subList.size();i++){
+                DirectiveOrderSub ordersSub = subList.get(i);
                 ordersSub.setOrderNo(getOrderSubNo(orderNo));
                 ordersSub.setOrderType(orderType);
                 ordersSub.setMainId(orders.getId());
@@ -848,6 +850,8 @@ public class DirectiveOrderServiceImpl extends ServiceImpl<DirectiveOrderMapper,
                 ordersSub.setElderName(orders.getElderName());
                 ordersSub.setEmployeeId(employeeId);
                 ordersSub.setEmployeeName(employeeName);
+                ordersSub.setCycleTypeId(orders.getCycleTypeId());
+                ordersSub.setCycleType(orders.getCycleType());
                 ordersSub.setIzPackage(orders.getIzPackage());
                 if(!orders.getIzPackage().equals("N")){
                     ordersSub.setPackageId(orders.getDirectiveId());