化验子项、辅检子项列表修改

knowledgeman-service/src/main/java/com/diagbot/dto/LisSonContactListDTO.java

@@ -2,6 +2,7 @@ package com.diagbot.dto;
 
 import java.util.Date;
 
+import com.diagbot.annotation.CryptField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
 import io.swagger.annotations.ApiModelProperty;
@@ -43,6 +44,7 @@ public class LisSonContactListDTO {
     /**
      * 关联术语
      */
+	@CryptField
 	@ApiModelProperty(value="关联术语")
     private String otherNames;
     

knowledgeman-service/src/main/java/com/diagbot/dto/PacsSonContactListDTO.java

@@ -43,13 +43,13 @@ public class PacsSonContactListDTO {
     /**
      * 关联术语
      */
+    @CryptField
     @ApiModelProperty(value="关联术语")
     private String otherNames;
 
     /**
      * 操作人
      */
-    @CryptField
     @ApiModelProperty(value="操作人")
     private String operName;
 

knowledgeman-service/src/main/java/com/diagbot/facade/LisSonContactFacade.java

@@ -2,9 +2,11 @@ package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.UserServiceClient;
+import com.diagbot.config.CryptConfiguer;
 import com.diagbot.dto.LisSonContactListDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.service.impl.RelationServiceImpl;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.RespDTOUtil;
 import com.diagbot.vo.LisSonContactListVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,6 +26,8 @@ public class LisSonContactFacade extends RelationServiceImpl {
 
     @Autowired
     private UserServiceClient userServiceClient;
+    @Autowired
+    private CryptConfiguer cryptConfiguer;
 
     /**
      * 化验子项维护-列表
@@ -39,7 +43,9 @@ public class LisSonContactFacade extends RelationServiceImpl {
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
             RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
             ipage.getRecords().forEach(i -> {
+                i.setLibName(cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getLibName()) : i.getLibName());
                 i.setOperName(respDTO.data.get(i.getOperName()));
+                i.setLibNameType(i.getLibName() + "(" + i.getLibType() + ")");
             });
         }
         return ipage;

knowledgeman-service/src/main/java/com/diagbot/facade/PacsSonContactFacade.java

@@ -43,7 +43,9 @@ public class PacsSonContactFacade extends RelationServiceImpl {
             RespDTO<Map<String, String>> respDTO = userServiceClient.getUserInfoByIds(ids);
             RespDTOUtil.respNGDealCover(respDTO, "获取用户信息失败");
             ipage.getRecords().forEach(i -> {
+                i.setLibName(cryptConfiguer.cryptFlag ? CryptUtil.decrypt_char(i.getLibName()) : i.getLibName());
                 i.setOperName(respDTO.data.get(i.getOperName()));
+                i.setLibNameType(i.getLibName() + "(" + i.getLibType() + ")");
             });
         }
         return ipage;

knowledgeman-service/src/main/java/com/diagbot/vo/LisSonContactListVO.java

@@ -2,6 +2,7 @@ package com.diagbot.vo;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -19,6 +20,7 @@ public class LisSonContactListVO extends Page {
     /**
      * 术语名称
      */
+    @CryptField
     @ApiModelProperty(value="术语名称")
     private String name;
 

knowledgeman-service/src/main/resources/mapper/RelationMapper.xml

@@ -88,7 +88,6 @@
 		t2.id AS conceptId,
 		t2.lib_name AS libName,
 		t4.name AS libType,
-		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
 		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
 		t1.modifier AS operName,
 		MAX(t1.gmt_modified) AS operTime,
@@ -228,7 +227,6 @@
 		t2.id AS conceptId,
 		t2.lib_name AS libName,
 		t4.name AS libType,
-		CONCAT(t2.lib_name,'(',t4.name,')') AS libNameType,
 		GROUP_CONCAT(t3.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
 		t1.modifier AS operName,
 		MAX(t1.gmt_modified) AS operTime,