接口更改

aipt-service/src/main/java/com/diagbot/vo/ConceptExistVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -15,6 +16,7 @@ import java.util.List;
 @Setter
 public class ConceptExistVO {
     @ApiModelProperty(value = "名称列表")
+    @CryptField
     private List<String> nameList;
     @ApiModelProperty(value = "类型")
     private Integer type;

aipt-service/src/main/java/com/diagbot/vo/RetrievalVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.annotation.CryptField;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -17,6 +18,7 @@ public class RetrievalVO {
     private Integer type;
     private Integer age;
     @NotBlank(message = "请输入检索内容")
+    @CryptField
     private String InputStr;
     private Integer sexType;
     //需要去重的id

icss-service/src/main/java/com/diagbot/facade/ModuleFacade.java

@@ -1,6 +1,7 @@
 package com.diagbot.facade;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.diagbot.annotation.CryptField;
 import com.diagbot.client.AiptServiceClient;
 import com.diagbot.dto.ModuleDetailDTO;
 import com.diagbot.dto.ModuleInfoDTO;
@@ -12,6 +13,7 @@ import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.QuestionTypeEnum;
 import com.diagbot.service.impl.ModuleInfoServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
 import com.diagbot.util.RespDTOUtil;
@@ -154,7 +156,7 @@ public class ModuleFacade extends ModuleInfoServiceImpl {
             for (ModuleInfoDTO bean : data) {
                 if (Integer.parseInt(bean.getType()) == QuestionTypeEnum.Pacs.getKey() && pacsRespDTO.data != null) {
                     for (ModuleDetailDTO detailDTO : bean.getModuleDetailDTOList()) {
-                        detailDTO.setName(pacsRespDTO.data.get(detailDTO.getQuestionId()));
+                        detailDTO.setName(CryptUtil.decrypt_char(pacsRespDTO.data.get(detailDTO.getQuestionId())));
                     }
                 }
             }

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

@@ -32,6 +32,7 @@ import com.diagbot.service.DiagnoseQuestionService;
 import com.diagbot.service.DiagnoseService;
 import com.diagbot.service.impl.DiagnoseServiceImpl;
 import com.diagbot.util.BeanUtil;
+import com.diagbot.util.CryptUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.DiagnoseTypeConvertUtil;
 import com.diagbot.util.EntityUtil;
@@ -149,6 +150,9 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
     public List<ConceptBaseDTO> indexFac(DiseaseIndexVO diseaseIndexVO) {
         // 设置诊断类型
         diseaseIndexVO.setLibType(LexiconTypeEnum.DIAGNOSIS.getKey());
+        List<Diagnose> diagnoseList = this.list(
+                new QueryWrapper<Diagnose>().eq("is_deleted", IsDeleteEnum.N.getKey()));
+        diseaseIndexVO.setDisNamList(diagnoseList.stream().map(r -> r.getDisName()).distinct().collect(Collectors.toList()));
         return this.index(diseaseIndexVO);
     }
 
@@ -533,8 +537,8 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
                             if (DiagnoseFeatureTypeEnum.Lis.getKey() == bean.getType()) {
                                 String oldVerifyUnique = bean.getVerifyUnique();
                                 if (StringUtil.isNotEmpty(bean.getUniqueName())) { // 公表项数据不为空
-                                    if (!lisMappingSet.contains(bean.getStandard() + "__" + bean.getRelation()
-                                            + "__" + bean.getUniqueName())) {
+                                    if (!lisMappingSet.contains(CryptUtil.encrypt_char(bean.getStandard()) + "__" + CryptUtil.encrypt_char(bean.getRelation())
+                                            + "__" + CryptUtil.encrypt_char(bean.getUniqueName()))) {
                                         bean.setVerifyUnique("无公表项");
                                         diagnoseName.add(bean.getDisName());
                                     } else {
@@ -723,7 +727,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
         int count = conceptFacade.count(new QueryWrapper<Concept>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
                 .eq("lib_type", LexiconTypeEnum.DIAGNOSIS.getKey())
-                .eq("lib_name", diagnoseWrapper.getDisName())
+                .eq("lib_name", CryptUtil.encrypt_char(diagnoseWrapper.getDisName()))
         );
         if (count == 0) {
             flag = false;
@@ -972,7 +976,7 @@ public class DiagnoseFacade extends DiagnoseServiceImpl {
      */
     public boolean verifyExist(Set<String> set, String name, List<Integer> type) {
         for (Integer integer : type) {
-            if (set.contains(name + "_" + integer)) {
+            if (set.contains(CryptUtil.encrypt_char(name) + "_" + integer)) {
                 return true;
             }
         }

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.annotation.CryptField;
 import com.diagbot.entity.DiagnoseDetailSave;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -36,6 +37,7 @@ public class DiagnoseSearchVO implements Serializable {
 
     @ApiModelProperty(value = "搜索内容")
     @NotBlank(message="搜索内容不能为空")
+    @CryptField
     private String name;
 
     @ApiModelProperty(hidden = true, value = "搜索的类型")

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

@@ -7,6 +7,7 @@ import lombok.Setter;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.List;
 
 /**
  * @description:
@@ -25,4 +26,8 @@ public class DiseaseIndexVO {
     @NotNull(message="诊断名称不能为空")
     private int libType;
 
+    @ApiModelProperty(value = "已保存诊断列表", hidden = true)
+    @NotNull(message="已保存诊断列表")
+    private List<String> disNamList;
+
 }

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

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.diagbot.annotation.CryptField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -16,6 +17,7 @@ import javax.validation.constraints.NotBlank;
 public class ScaleContentIndexVO {
     @ApiModelProperty(value = "量表名称")
     @NotBlank(message="名称不能为空")
+    @CryptField
     private String name;
 
     @ApiModelProperty(value = "量表类型", hidden = true)

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

@@ -40,13 +40,13 @@
             AND a.is_deleted = 'N'
             AND b.is_deleted = 'N'
             AND a.id = b.concept_id
-        ) t where
-         NOT EXISTS (
-            SELECT 1 FROM kl_diagnose c
-            WHERE
-                c.is_deleted = 'N'
-            AND t.name = c.dis_name
-        )
+        ) t
+        <if test="disNamList != null and disNamList.size() > 0">
+            where t.name not in
+            <foreach collection="disNamList" item="item"  separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
     </select>