2、服务指令包：1）新增分类标签，调整新增、编辑界面分类标签的选择与回显；2）选择过服务指令后不允许再更改分类标签；3）引用服务指令包、选择服务指令只展示对应分类标签相关的内容；

3、服务指令包的服务总时长允许保存0
4、服务指令的服务时长允许保存0

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java

@@ -87,6 +87,7 @@ public class DirectivePackage implements Serializable {
     private java.lang.String endTimeStr;
 
     @ApiModelProperty(value = "分类标签")
+    @Dict(dicCode = "id",dicText = "instruction_name",dictTable = "nu_config_service_instruction_tag")
     private java.lang.String instructionTagId;
 
     @TableField(exist = false)

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml

@@ -64,7 +64,8 @@
                 <result property="sysOrgCode" column="bodytag_sys_org_code"/>
             </collection>
             <!-- 关联的情绪标签列表 -->
-            <collection property="emotionTagList" ofType="com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag">
+            <collection property="emotionTagList"
+                        ofType="com.nu.modules.config.directivetag.emotion.entity.DirectiveEmotionTag">
                 <id property="id" column="emotag_id"/>
                 <result property="tagName" column="emotag_name"/>
                 <result property="sort" column="emotag_sort"/>
@@ -79,7 +80,9 @@
         </collection>
     </resultMap>
     <update id="updateTotalDurationInt">
-        update nu_config_directive_package set total_duration = #{duration} where id = #{id}
+        update nu_config_directive_package
+        set total_duration = #{duration}
+        where id = #{id}
     </update>
 
     <!-- 分页查询 -->
@@ -152,11 +155,16 @@
         FROM
         (SELECT * FROM nu_config_directive_package
         <where>
-            del_flag = '0' and id in
+            del_flag = '0'
+            and id in
             <foreach collection="ids" item="item" open="(" separator="," close=")">
                 #{item.id}
             </foreach>
-        </where>) dp
+            <if test="directivePackage.instructionTagId != null and directivePackage.instructionTagId != '' ">
+                and instruction_tag_id = #{directivePackage.instructionTagId}
+            </if>
+        </where>
+        ) dp
         LEFT JOIN nu_config_package_directive pd ON dp.id = pd.package_id
         LEFT JOIN nu_config_service_directive csd ON pd.directive_id = csd.id
         LEFT JOIN nu_directive_body_tag bdt ON csd.id = bdt.directive_id
@@ -185,7 +193,9 @@
     </select>
 
     <delete id="deleteDirectives">
-        delete from nu_config_package_directive where package_id = #{package.id}
+        delete
+        from nu_config_package_directive
+        where package_id = #{package.id}
     </delete>
 
     <insert id="saveDirectives">

nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/impl/DirectivePackageServiceImpl.java

@@ -44,7 +44,8 @@ public class DirectivePackageServiceImpl extends ServiceImpl<DirectivePackageMap
         List<DirectivePackage> query = Lists.newArrayList();
         DirectivePackage queryDto = new DirectivePackage().setId(id);
         query.add(queryDto);
-        List<DirectivePackage> directivePackages = baseMapper.queryList(null, query);
+        DirectivePackage directivePackage = new DirectivePackage();
+        List<DirectivePackage> directivePackages = baseMapper.queryList(directivePackage, query);
         return directivePackages.stream().findFirst().orElse(null);
     }