diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java
index 8d9b606..0f78b20 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/directivepackage/entity/DirectivePackage.java
@@ -57,6 +57,7 @@ public class DirectivePackage implements Serializable {
     private java.lang.String delFlag;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
+    @Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
     private java.lang.String createBy;
 	/**创建日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java
index 23b214f..724cbda 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/entity/ServiceTag.java
@@ -57,6 +57,7 @@ public class ServiceTag implements Serializable {
     private String delFlag;
 	/**创建人*/
     @ApiModelProperty(value = "创建人")
+    @Dict(dictTable = "sys_user",dicCode = "username",dicText = "realname")
     private String createBy;
 	/**创建日期*/
 	@JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
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 7e96886..11586d2 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
@@ -165,4 +165,6 @@
         where a.employees_id = #{employeesId}
     </select>
 
+
+
 </mapper>
diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java
index 527fe46..0bbf1bd 100644
--- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java
+++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicetag/service/impl/ServiceTagServiceImpl.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.google.common.collect.Lists;
+import com.nu.modules.directivetag.entity.DirectiveTag;
+import com.nu.modules.servicedirective.entity.ConfigServiceDirective;
 import com.nu.modules.servicetag.entity.ServiceTag;
 import com.nu.modules.servicetag.mapper.ServiceTagMapper;
 import com.nu.modules.servicetag.service.IServiceTagService;
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 服务标签
@@ -31,6 +34,19 @@ public class ServiceTagServiceImpl extends ServiceImpl<ServiceTagMapper, Service
     @Override
     public void queryList(ServiceTag serviceTag, IPage<ServiceTag> pageList) {
         List<ServiceTag> record = baseMapper.queryList(serviceTag,pageList.getRecords());
+        //将指令标签名使用逗号拼接成字符串设置到指令对象的tagsName变量中
+        if(record != null && !record.isEmpty()){
+            record.stream().forEach(l -> {
+                if(l.getDirectives()!=null && !l.getDirectives().isEmpty()){
+                    List<ConfigServiceDirective> sd = l.getDirectives();
+                    for (int i = 0; i < sd.size(); i++) {
+                        List<DirectiveTag> tagList = sd.get(i).getTagList();
+                        List<String> tags = tagList.stream().map(t -> t.getTagName()).collect(Collectors.toList());
+                        sd.get(i).setTagsName(String.join(",",tags));
+                    }
+                }
+            });
+        }
         pageList.setRecords(record);
     }