From c17a9ead32a99730bba720350e3ad847e6ba8a2b Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 11 Nov 2025 08:36:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8C=85?=
 =?UTF-8?q?=EF=BC=9A=201=E3=80=81=E5=8F=AA=E8=83=BD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=97=A5=E5=B8=B8=E3=80=81=E5=91=A8=E6=9C=9F=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=202=E3=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=91=A8=E6=9C=9F=E7=B1=BB=E5=9E=8B=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=8C=87=E4=BB=A4=E6=97=B6=E5=BF=85=E9=A1=BB=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=91=A8=E5=87=A0=E6=88=96=E6=AF=8F=E6=9C=88=E5=87=A0=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/xml/NuBizNuCustomerServerMapper.xml                | 2 +-
 .../directivepackage/mapper/xml/DirectivePackageMapper.xml    | 4 ++--
 .../controller/ConfigServiceDirectiveController.java          | 2 +-
 .../servicedirective/entity/ConfigServiceDirective.java       | 4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
index 495e60d8..6af68f67 100644
--- a/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
+++ b/nursing-unit-api/src/main/java/com/nu/modules/NuBizNuCustomerServer/mapper/xml/NuBizNuCustomerServerMapper.xml
@@ -21,7 +21,7 @@
     </select>
 
     <select id="getNcDirectiveList" resultType="com.nu.modules.NuBizNuCustomerServer.entity.NuBizNuCustomerServer">
-        select a.package_id,b.*,
+        select a.package_id,a.cycle_type,a.cycle_value,b.*,
         c.category_name AS category_name,
         d.type_name AS type_name,
         e.instruction_name AS instruction_name,
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml
index e72a46c1..a87c8cef 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/mapper/xml/DirectivePackageMapper.xml
@@ -183,10 +183,10 @@
     </delete>
 
     <insert id="saveDirectives">
-        INSERT INTO nu_package_directive (package_id, directive_id, sort)
+        INSERT INTO nu_package_directive (package_id, directive_id, sort,cycle_type,cycle_value)
         VALUES
         <foreach collection="package.getDirectives()" item="directive" separator=",">
-            (#{package.id}, #{directive.id}, #{directive.sort})
+            (#{package.id}, #{directive.id}, #{directive.sort}, #{directive.cycleTypeShow}, #{directive.cycleTypeValue})
         </foreach>
     </insert>
 </mapper>
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java
index 556e56f7..94e8213e 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/controller/ConfigServiceDirectiveController.java
@@ -89,7 +89,7 @@ public class ConfigServiceDirectiveController extends JeecgController<ConfigServ
         customeRuleMap.put("izReimbursement", QueryRuleEnum.LIKE_WITH_OR);
         customeRuleMap.put("izPreferential", QueryRuleEnum.LIKE_WITH_OR);
         customeRuleMap.put("chargingFrequency", QueryRuleEnum.LIKE_WITH_OR);
-        customeRuleMap.put("cycleType", QueryRuleEnum.LIKE_WITH_OR);
+        customeRuleMap.put("cycleType", QueryRuleEnum.IN);
         customeRuleMap.put("izEnabled", QueryRuleEnum.LIKE_WITH_OR);
         QueryWrapper<ConfigServiceDirective> queryWrapper = QueryGenerator.initQueryWrapper(configServiceDirective, req.getParameterMap(), customeRuleMap);
         queryWrapper.select("id");
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
index 4a428e11..270273d9 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/entity/ConfigServiceDirective.java
@@ -321,4 +321,8 @@ public class ConfigServiceDirective implements Serializable {
     private boolean ownExist;//本平台是否存在该指令
     @TableField(exist = false)
     private boolean targetExist;//目标平台是否存在该指令
+    @TableField(exist = false)
+    private String cycleTypeShow;
+    @TableField(exist = false)
+    private String cycleTypeValue;
 }