diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml
index 11586d2..00c1001 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/mapper/xml/ServiceTagMapper.xml
@@ -4,57 +4,56 @@
 
     <!-- 定义 resultMap -->
     <resultMap id="ServiceTagResultMap" type="com.nu.modules.servicetag.entity.ServiceTag">
-        <id property="id" column="id" />
-        <result property="tagName" column="tag_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" />
+        <id property="id" column="id"/>
+        <result property="tagName" column="tag_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"/>
         <!-- 关联的指令列表 -->
         <collection property="directives" ofType="com.nu.modules.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="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="tagsName" column="tags_name" />
-            <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="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"/>
             <!-- 关联的标签列表 -->
             <collection property="tagList" ofType="com.nu.modules.directivetag.entity.DirectiveTag">
-                <id property="id" column="tag_id" />
-                <result property="tagName" column="tag_name" />
-                <result property="sort" column="tag_sort" />
-                <result property="izEnabled" column="tag_iz_enabled" />
-                <result property="delFlag" column="tag_del_flag" />
-                <result property="createBy" column="tag_create_by" />
-                <result property="createTime" column="tag_create_time" />
-                <result property="updateBy" column="tag_update_by" />
-                <result property="updateTime" column="tag_update_time" />
-                <result property="sysOrgCode" column="tag_sys_org_code" />
+                <id property="id" column="tag_id"/>
+                <result property="tagName" column="cdt_tag_name"/>
+                <result property="sort" column="tag_sort"/>
+                <result property="izEnabled" column="tag_iz_enabled"/>
+                <result property="delFlag" column="tag_del_flag"/>
+                <result property="createBy" column="tag_create_by"/>
+                <result property="createTime" column="tag_create_time"/>
+                <result property="updateBy" column="tag_update_by"/>
+                <result property="updateTime" column="tag_update_time"/>
+                <result property="sysOrgCode" column="tag_sys_org_code"/>
             </collection>
         </collection>
     </resultMap>
@@ -96,7 +95,16 @@
         csd.mp4_file,
         csd.preview_file,
         csd.immediate_file,
-        cdt.tag_name  as tags_name,
+        cdt.id AS tag_id,
+        cdt.tag_name as cdt_tag_name,
+        cdt.sort AS tag_sort,
+        cdt.iz_enabled AS tag_iz_enabled,
+        cdt.del_flag AS tag_del_flag,
+        cdt.create_by AS tag_create_by,
+        cdt.create_time AS tag_create_time,
+        cdt.update_by AS tag_update_by,
+        cdt.update_time AS tag_update_time,
+        cdt.sys_org_code AS tag_sys_org_code,
         csc.category_name AS csc_category_name,
         cst.type_name AS cst_type_name
         FROM
@@ -106,14 +114,12 @@
             <foreach collection="ids" item="item" open="(" separator="," close=")">
                 #{item.id}
             </foreach>
-        </where>) dp
+        </where>
+        ) dp
         LEFT JOIN nu_servtag_directive sd ON dp.id = sd.tag_id
         LEFT JOIN nu_config_service_directive csd ON sd.directive_id = csd.id
-        LEFT JOIN (
-        select GROUP_CONCAT(c.tag_name) tag_name,b.directive_id from nu_directive_tag b
-        LEFT JOIN nu_config_directive_tag c on b.tag_id = c.id
-        GROUP BY b.directive_id
-        ) cdt on csd.id = cdt.directive_id
+        LEFT JOIN nu_directive_tag dt ON csd.id = dt.directive_id
+        LEFT JOIN nu_config_directive_tag cdt ON dt.tag_id = cdt.id
         LEFT JOIN nu_config_service_category csc ON csd.category_id = csc.id
         LEFT JOIN nu_config_service_type cst ON csd.type_id = cst.id
         order by dp.create_time desc
@@ -135,7 +141,9 @@
     </select>
 
     <delete id="deleteDirectives">
-        delete from nu_servtag_directive where tag_id = #{tag.id}
+        delete
+        from nu_servtag_directive
+        where tag_id = #{tag.id}
     </delete>
 
     <insert id="saveDirectives">
@@ -146,25 +154,30 @@
         </foreach>
     </insert>
 
-
-
     <select id="getEmployeesList" resultType="com.nu.modules.servicetag.entity.ServiceTag">
-        select nst.id ,nst.tag_name ,nst.description ,nst.sort,ifnull(est.id,'0') as employeesTagsId,nst.iz_enabled,nst.del_flag,nst.create_time,est.employees_id
+        select nst.id,
+               nst.tag_name,
+               nst.description,
+               nst.sort,
+               ifnull(est.id, '0') as employeesTagsId,
+               nst.iz_enabled,
+               nst.del_flag,
+               nst.create_time,
+               est.employees_id
         from nu_service_tag nst
-        LEFT JOIN nu_biz_employees_servcie_tags est on nst.id = est.tags_id and est.employees_id = #{serviceTag.employeesId}
-        where nst.del_flag = '0' and nst.iz_enabled = '0'
+                 LEFT JOIN nu_biz_employees_servcie_tags est
+                           on nst.id = est.tags_id and est.employees_id = #{serviceTag.employeesId}
+        where nst.del_flag = '0'
+          and nst.iz_enabled = '0'
 
     </select>
 
 
-
     <select id="getEmployessServiceTags" resultType="com.nu.modules.servicetag.entity.ServiceTag">
-        select a.id,b.tag_name,b.description,a.create_time,b.id as employeesTagsId
+        select a.id, b.tag_name, b.description, a.create_time, b.id as employeesTagsId
         from nu_biz_employees_servcie_tags a
-        LEFT JOIN nu_service_tag b on a.tags_id = b.id
+                 LEFT JOIN nu_service_tag b on a.tags_id = b.id
         where a.employees_id = #{employeesId}
     </select>
 
-
-
 </mapper>