From 7394ad2bda34f930acd521cd703d088f87d9ab34 Mon Sep 17 00:00:00 2001
From: "1378012178@qq.com" <1378012178@qq.com>
Date: Tue, 20 Jan 2026 15:36:43 +0800
Subject: [PATCH] =?UTF-8?q?2=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4?=
 =?UTF-8?q?=E5=8C=85=EF=BC=9A1=EF=BC=89=E6=96=B0=E5=A2=9E=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=A0=87=E7=AD=BE=EF=BC=8C=E8=B0=83=E6=95=B4=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=81=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=E6=A0=87=E7=AD=BE=E7=9A=84=E9=80=89=E6=8B=A9=E4=B8=8E?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=EF=BC=9B2=EF=BC=89=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E8=BF=87=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=90=8E=E4=B8=8D?=
 =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=86=8D=E6=9B=B4=E6=94=B9=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=EF=BC=9B3=EF=BC=89=E5=BC=95=E7=94=A8?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8C=85=E3=80=81=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8F=AA=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA=E5=AF=B9=E5=BA=94=E5=88=86=E7=B1=BB=E6=A0=87=E7=AD=BE?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E5=86=85=E5=AE=B9=EF=BC=9B=203?=
 =?UTF-8?q?=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87=E4=BB=A4=E5=8C=85=E7=9A=84?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=80=BB=E6=97=B6=E9=95=BF=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=980=204=E3=80=81=E6=9C=8D=E5=8A=A1=E6=8C=87?=
 =?UTF-8?q?=E4=BB=A4=E7=9A=84=E6=9C=8D=E5=8A=A1=E6=97=B6=E9=95=BF=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E4=BF=9D=E5=AD=980?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/DirectivePackage.java              |   1 +
 .../mapper/xml/DirectivePackageMapper.xml     | 140 ++++++++++--------
 .../impl/DirectivePackageServiceImpl.java     |   3 +-
 3 files changed, 78 insertions(+), 66 deletions(-)

diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java
index 1231bc24..f67ae421 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/entity/DirectivePackage.java
+++ b/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)
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml
index 888268f6..3a9cb077 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/mapper/xml/DirectivePackageMapper.xml
@@ -4,82 +4,85 @@
 
     <!-- 定义 resultMap -->
     <resultMap id="DirectivePackageResultMap" type="com.nu.modules.config.directivepackage.entity.DirectivePackage">
-        <id property="id" column="id" />
-        <result property="packageName" column="package_name" />
-        <result property="description" column="description" />
-        <result property="sort" column="sort" />
-        <result property="izEnabled" column="iz_enabled" />
-        <result property="delFlag" column="del_flag" />
-        <result property="createBy" column="create_by" />
-        <result property="createTime" column="create_time" />
-        <result property="updateBy" column="update_by" />
-        <result property="updateTime" column="update_time" />
-        <result property="startTimeStr" column="start_time_str" />
-        <result property="endTimeStr" column="end_time_str" />
-        <result property="instructionTagId" column="instruction_tag_id" />
-        <result property="totalDuration" column="total_duration" />
-        <result property="timeoutDuration" column="timeout_duration" />
+        <id property="id" column="id"/>
+        <result property="packageName" column="package_name"/>
+        <result property="description" column="description"/>
+        <result property="sort" column="sort"/>
+        <result property="izEnabled" column="iz_enabled"/>
+        <result property="delFlag" column="del_flag"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="startTimeStr" column="start_time_str"/>
+        <result property="endTimeStr" column="end_time_str"/>
+        <result property="instructionTagId" column="instruction_tag_id"/>
+        <result property="totalDuration" column="total_duration"/>
+        <result property="timeoutDuration" column="timeout_duration"/>
         <!-- 关联的指令列表 -->
         <collection property="directives" ofType="com.nu.modules.config.servicedirective.entity.ConfigServiceDirective">
-            <id property="id" column="directive_id" />
-            <result property="directiveName" column="directive_name" />
-            <result property="categoryId" column="category_id" />
-            <result property="typeId" column="type_id" />
-            <result property="instructionTagId" column="instruction_tag_id" />
-            <result property="instructionTagName" column="instruction_name" />
-            <result property="tollPrice" column="toll_price" />
-            <result property="comPrice" column="com_price" />
-            <result property="izReimbursement" column="iz_reimbursement" />
-            <result property="izPreferential" column="iz_preferential" />
-            <result property="chargingFrequency" column="charging_frequency" />
-            <result property="cycleType" column="cycle_type" />
-            <result property="serviceContent" column="service_content" />
-            <result property="serviceDuration" column="service_duration" />
-            <result property="izEnabled" column="directive_iz_enabled" />
-            <result property="delFlag" column="directive_del_flag" />
-            <result property="createBy" column="directive_create_by" />
-            <result property="createTime" column="directive_create_time" />
-            <result property="updateBy" column="directive_update_by" />
-            <result property="updateTime" column="directive_update_time" />
-            <result property="sysOrgCode" column="directive_sys_org_code" />
-            <result property="mp3File" column="mp3_file" />
-            <result property="mp4File" column="mp4_file" />
-            <result property="categoryName" column="csc_category_name" />
-            <result property="typeName" column="cst_type_name" />
+            <id property="id" column="directive_id"/>
+            <result property="directiveName" column="directive_name"/>
+            <result property="categoryId" column="category_id"/>
+            <result property="typeId" column="type_id"/>
+            <result property="instructionTagId" column="instruction_tag_id"/>
+            <result property="instructionTagName" column="instruction_name"/>
+            <result property="tollPrice" column="toll_price"/>
+            <result property="comPrice" column="com_price"/>
+            <result property="izReimbursement" column="iz_reimbursement"/>
+            <result property="izPreferential" column="iz_preferential"/>
+            <result property="chargingFrequency" column="charging_frequency"/>
+            <result property="cycleType" column="cycle_type"/>
+            <result property="serviceContent" column="service_content"/>
+            <result property="serviceDuration" column="service_duration"/>
+            <result property="izEnabled" column="directive_iz_enabled"/>
+            <result property="delFlag" column="directive_del_flag"/>
+            <result property="createBy" column="directive_create_by"/>
+            <result property="createTime" column="directive_create_time"/>
+            <result property="updateBy" column="directive_update_by"/>
+            <result property="updateTime" column="directive_update_time"/>
+            <result property="sysOrgCode" column="directive_sys_org_code"/>
+            <result property="mp3File" column="mp3_file"/>
+            <result property="mp4File" column="mp4_file"/>
+            <result property="categoryName" column="csc_category_name"/>
+            <result property="typeName" column="cst_type_name"/>
             <result property="previewFile" column="preview_file"/>
             <result property="immediateFile" column="immediate_file"/>
             <result property="cycleTypeShow" column="cycleTypeShow"/>
             <result property="cycleTypeValue" column="cycleTypeValue"/>
             <!-- 关联的体型标签列表 -->
             <collection property="bodyTagList" ofType="com.nu.modules.config.directivetag.body.entity.DirectiveBodyTag">
-                <id property="id" column="tag_id" />
-                <result property="tagName" column="bodytag_name" />
-                <result property="sort" column="bodytag_sort" />
-                <result property="izEnabled" column="bodytag_iz_enabled" />
-                <result property="delFlag" column="bodytag_del_flag" />
-                <result property="createBy" column="bodytag_create_by" />
-                <result property="createTime" column="bodytag_create_time" />
-                <result property="updateBy" column="bodytag_update_by" />
-                <result property="updateTime" column="bodytag_update_time" />
-                <result property="sysOrgCode" column="bodytag_sys_org_code" />
+                <id property="id" column="tag_id"/>
+                <result property="tagName" column="bodytag_name"/>
+                <result property="sort" column="bodytag_sort"/>
+                <result property="izEnabled" column="bodytag_iz_enabled"/>
+                <result property="delFlag" column="bodytag_del_flag"/>
+                <result property="createBy" column="bodytag_create_by"/>
+                <result property="createTime" column="bodytag_create_time"/>
+                <result property="updateBy" column="bodytag_update_by"/>
+                <result property="updateTime" column="bodytag_update_time"/>
+                <result property="sysOrgCode" column="bodytag_sys_org_code"/>
             </collection>
             <!-- 关联的情绪标签列表 -->
-            <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" />
-                <result property="izEnabled" column="emotag_iz_enabled" />
-                <result property="delFlag" column="emotag_del_flag" />
-                <result property="createBy" column="emotag_create_by" />
-                <result property="createTime" column="emotag_create_time" />
-                <result property="updateBy" column="emotag_update_by" />
-                <result property="updateTime" column="emotag_update_time" />
-                <result property="sysOrgCode" column="emotag_sys_org_code" />
+            <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"/>
+                <result property="izEnabled" column="emotag_iz_enabled"/>
+                <result property="delFlag" column="emotag_del_flag"/>
+                <result property="createBy" column="emotag_create_by"/>
+                <result property="createTime" column="emotag_create_time"/>
+                <result property="updateBy" column="emotag_update_by"/>
+                <result property="updateTime" column="emotag_update_time"/>
+                <result property="sysOrgCode" column="emotag_sys_org_code"/>
             </collection>
         </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">
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/impl/DirectivePackageServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/impl/DirectivePackageServiceImpl.java
index 0a094b35..5220d481 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/config/directivepackage/service/impl/DirectivePackageServiceImpl.java
+++ b/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);
     }