服务指令包：

1、只能添加日常、周期类型服务指令
2、添加周期类型服务指令时必须选择周几或每月几号

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,

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>

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");

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;
 }