Merge remote-tracking branch 'origin/dev/ruleClass20210805' into debug

cdssman-service/src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -2,21 +2,7 @@ package com.diagbot.client;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.hystrix.CdssCoreHystrix;
-import com.diagbot.dto.DiagnosesFindDTO;
-import com.diagbot.dto.DictionaryInfoDTO;
-import com.diagbot.dto.IndexBatchDTO;
-import com.diagbot.dto.IndicationDTO;
-import com.diagbot.dto.KlConceptStaticDTO;
-import com.diagbot.dto.KlDiagnoseInfoDTO;
-import com.diagbot.dto.KlDiagnoseTypeDTO;
-import com.diagbot.dto.KlRuleByIdParDTO;
-import com.diagbot.dto.KlRuleInfoDTO;
-import com.diagbot.dto.RegulationIndexDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.RetrievalDTO;
-import com.diagbot.dto.StaticKnowledgeDTO;
-import com.diagbot.dto.StaticKnowledgeIndexDTO;
-import com.diagbot.dto.TermConceptDTO;
+import com.diagbot.dto.*;
 import com.diagbot.entity.KlRuleMenuWrapper;
 import com.diagbot.vo.*;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -224,4 +210,7 @@ public interface CdssCoreClient {
     @PostMapping("/klRegulation/index")
     public RespDTO<List<RegulationIndexDTO>> index(@RequestBody RegulationIndexVO regulationIndexVO);
 
-}
+    @PostMapping("/klDisease/searchConcept")
+    RespDTO<List<GetAllForRelationDTO>> searchConcept(@Valid @RequestBody SearchConceptVO searchConceptVO);
+
+}

cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -2,21 +2,7 @@ package com.diagbot.client.hystrix;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.diagbot.client.CdssCoreClient;
-import com.diagbot.dto.DiagnosesFindDTO;
-import com.diagbot.dto.DictionaryInfoDTO;
-import com.diagbot.dto.IndexBatchDTO;
-import com.diagbot.dto.IndicationDTO;
-import com.diagbot.dto.KlConceptStaticDTO;
-import com.diagbot.dto.KlDiagnoseInfoDTO;
-import com.diagbot.dto.KlDiagnoseTypeDTO;
-import com.diagbot.dto.KlRuleByIdParDTO;
-import com.diagbot.dto.KlRuleInfoDTO;
-import com.diagbot.dto.RegulationIndexDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.RetrievalDTO;
-import com.diagbot.dto.StaticKnowledgeDTO;
-import com.diagbot.dto.StaticKnowledgeIndexDTO;
-import com.diagbot.dto.TermConceptDTO;
+import com.diagbot.dto.*;
 import com.diagbot.entity.KlRuleMenuWrapper;
 import com.diagbot.vo.*;
 import lombok.extern.slf4j.Slf4j;
@@ -298,4 +284,10 @@ public class CdssCoreHystrix implements CdssCoreClient {
         log.error("【hystrix】调用{}异常", "index");
         return null;
     }
-}
+
+    @Override
+    public RespDTO<List<GetAllForRelationDTO>> searchConcept(@Valid SearchConceptVO searchConceptVO) {
+        log.error("【hystrix】调用{}异常", "searchConcept");
+        return null;
+    }
+}

cdssman-service/src/main/java/com/diagbot/dto/ConceptCollectionDTO.java

@@ -1,8 +1,11 @@
 package com.diagbot.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -22,4 +25,13 @@ public class ConceptCollectionDTO {
     private Integer conceptLibType;
     @ApiModelProperty(hidden = true)
     private Integer conceptStatus;
+    /**
+     * 修改时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
+    private Date gmtModified;
+    /**
+     * 修改人
+     */
+    private String modifier;
 }

cdssman-service/src/main/java/com/diagbot/dto/GetAllForRelationDTO.java

@@ -12,13 +12,13 @@ import lombok.Setter;
 @Getter
 @Setter
 public class GetAllForRelationDTO {
-	
+
 	/**
 	 * 概念id
 	 */
 	@ApiModelProperty(value="概念id")
 	private Long conceptId;
-	
+
 	/**
 	 * 概念名称
 	 */
@@ -30,13 +30,17 @@ public class GetAllForRelationDTO {
 	 */
 	@ApiModelProperty(value="概念id")
 	private Integer libType;
-	
+
 	/**
 	 * 概念名称(类型)
 	 */
 	@ApiModelProperty(value="概念名称(类型)")
 	private String conceptNameType;
-	
-	
+
+	/**
+	 * 说明
+	 */
+	@ApiModelProperty(value="说明（remark）")
+	private String remark;
 
 }

cdssman-service/src/main/java/com/diagbot/facade/KlConceptCollectionFacade.java

@@ -3,8 +3,10 @@ package com.diagbot.facade;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.ConceptCollectionDTO;
 import com.diagbot.dto.DictionaryInfoDTO;
+import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.KlConcept;
 import com.diagbot.entity.KlLibraryInfo;
 import com.diagbot.entity.KlRelation;
@@ -20,6 +22,7 @@ import com.diagbot.service.KlRelationOrderService;
 import com.diagbot.service.KlRelationService;
 import com.diagbot.service.KlRuleConditionService;
 import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.ConceptCollectionBaseVO;
 import com.diagbot.vo.ConceptCollectionPageVO;
@@ -27,7 +30,6 @@ import com.diagbot.vo.ConceptCollectionSaveVO;
 import com.diagbot.vo.IdVO;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.SystemUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
@@ -67,6 +69,8 @@ public class KlConceptCollectionFacade {
     KlRuleBaseFacade klRuleBaseFacade;
     @Autowired
     KlRuleConditionService klRuleConditionService;
+    @Autowired
+    UserServiceClient userServiceClient;
 
     /**
      * 获取术语集合列表
@@ -80,9 +84,30 @@ public class KlConceptCollectionFacade {
             conceptCollectionPageVO.setCollectionLibType(null);
         }
 
-        return klRelationFacade.getConceptCollectionPage(conceptCollectionPageVO);
-    }
+        IPage<ConceptCollectionDTO> page = klRelationFacade.getConceptCollectionPage(conceptCollectionPageVO);
+        List<ConceptCollectionDTO> records = page.getRecords();
+        List<String> userIds = records.stream().map(ConceptCollectionDTO::getModifier)
+                .distinct()
+                .collect(Collectors.toList());
+        if (ListUtil.isEmpty(userIds)) {
+            return page;
+        }
+        RespDTO<Map<String, String>> userRespDTO = userServiceClient.getUserInfoByIds(userIds);
+        if (RespDTOUtil.respIsNG(userRespDTO)) {
+            return page;
+        }
+        Map<String, String> userMap = userRespDTO.data;
+        records.forEach(record -> {
+            if (userMap.containsKey(record.getModifier())) {
+                record.setModifier(userMap.get(record.getModifier()));
+            } else {
+                record.setModifier("");
+            }
+        });
+        page.setRecords(records);
 
+        return page;
+    }
 
     /**
      * 保存（新增和修改）

cdssman-service/src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -3,6 +3,7 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.CdssCoreClient;
 import com.diagbot.client.UserServiceClient;
 import com.diagbot.dto.GetAllForRelationDTO;
 import com.diagbot.dto.KlConceptAllDTO;
@@ -71,6 +72,8 @@ public class KlConceptFacade extends KlConceptServiceImpl {
     @Autowired
     private UserServiceClient userServiceClient;
     @Autowired
+    private CdssCoreClient cdssCoreClient;
+    @Autowired
     private KlLibraryInfoFacade klLibraryInfoFacade;
     @Autowired
     private KlConceptCommonFacade klConceptCommonFacade;
@@ -453,7 +456,10 @@ public class KlConceptFacade extends KlConceptServiceImpl {
      * @return
      */
     public List<GetAllForRelationDTO> searchConceptByNameAndLibType(SearchConceptVO searchConceptVO) {
-        List<GetAllForRelationDTO> getAllForRelationDTOS = Lists.newArrayList();
+        RespDTO<List<GetAllForRelationDTO>> relationDTORespDTO = cdssCoreClient.searchConcept(searchConceptVO);
+        RespDTOUtil.respNGDeal(relationDTORespDTO, "查询术语失败");
+        return relationDTORespDTO.data;
+        /*List<GetAllForRelationDTO> getAllForRelationDTOS = Lists.newArrayList();
         String name = searchConceptVO.getName();
         Integer libType = searchConceptVO.getLibType();
         List<Long> excludedConceptIds = searchConceptVO.getExcludedConceptIds();
@@ -475,7 +481,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 }).collect(Collectors.toList());
             }
         }
-        return getAllForRelationDTOS;
+        return getAllForRelationDTOS;*/
     }
 
     /**
@@ -485,7 +491,12 @@ public class KlConceptFacade extends KlConceptServiceImpl {
      * @return
      */
     public List<GetAllForRelationDTO> searchConceptByNameAndLibType(SearchVO SearchVO) {
-        List<GetAllForRelationDTO> getAllForRelationDTOS = Lists.newArrayList();
+        SearchConceptVO searchConceptVO = new SearchConceptVO();
+        BeanUtil.copyProperties(SearchVO,searchConceptVO);
+        RespDTO<List<GetAllForRelationDTO>> relationDTORespDTO = cdssCoreClient.searchConcept(searchConceptVO);
+        RespDTOUtil.respNGDeal(relationDTORespDTO, "查询术语失败");
+        return relationDTORespDTO.data;
+        /*List<GetAllForRelationDTO> getAllForRelationDTOS = Lists.newArrayList();
         List<Long> excludedConceptIds = SearchVO.getExcludedConceptIds();
         List<KlConcept> conceptList = this.list(new QueryWrapper<KlConcept>()
                 .eq("is_deleted", IsDeleteEnum.N.getKey())
@@ -503,7 +514,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 return getAllForRelationDTO;
             }).collect(Collectors.toList());
         }
-        return getAllForRelationDTOS;
+        return getAllForRelationDTOS;*/
     }
 
     /**

cdssman-service/src/main/resources/mapper/KlRelationMapper.xml

@@ -203,6 +203,8 @@
     <select id="getConceptCollectionPage" resultType="com.diagbot.dto.ConceptCollectionDTO">
         SELECT
         t1.*,
+        t2.gmt_modified as gmtModified,
+        t2.modifier,
         t4.id AS conceptId,
         group_concat( t4.lib_name ) AS concatConceptLibName,
         t4.lib_type AS conceptLibType,
@@ -253,5 +255,6 @@
         </if>
         GROUP BY
         t1.collectionId
+        order by t2.gmt_modified desc
     </select>
 </mapper>

common/src/main/java/com/diagbot/biz/push/entity/Item.java

@@ -31,4 +31,8 @@ public class Item {
      * 频次
      */
     private String frequency;
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
 }

common/src/main/java/com/diagbot/biz/push/entity/Lis.java

@@ -63,4 +63,20 @@ public class Lis {
      * 频次
      */
     private String frequency;
+    /**
+     * 文本类型最小值
+     */
+    private String strMinValue;
+    /**
+     * 文本类型最大值
+     */
+    private String strMaxValue;
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
+
+    public void setDetailName(String detailName) {
+        this.detailName = detailName == null ? null : detailName.trim();
+    }
 }

common/src/main/java/com/diagbot/biz/push/entity/Pacs.java

@@ -39,4 +39,8 @@ public class Pacs {
      * 频次
      */
     private String frequency;
+
+    public void setName(String name) {
+        this.name = name == null ? null : name.trim();
+    }
 }