1、术语映射预匹配

src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -5,6 +5,7 @@ import com.diagbot.client.hystrix.CdssCoreHystrix;
 import com.diagbot.dto.ConceptDetailDTO;
 import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.GetAllForRelationDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.KlConceptStaticDTO;
 import com.diagbot.dto.KlRuleByIdParDTO;
@@ -81,7 +82,7 @@ public interface CdssCoreClient {
      * @return
      */
     @PostMapping("/retrieval/getConceptNames")
-    RespDTO<List<String>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO);
+    RespDTO<List<IndexBatchDTO>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO);
 
 
     /**

src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -5,6 +5,7 @@ import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.ConceptDetailDTO;
 import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.GetAllForRelationDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.KlConceptStaticDTO;
 import com.diagbot.dto.KlRuleByIdParDTO;
@@ -100,7 +101,7 @@ public class CdssCoreHystrix implements CdssCoreClient {
      * @return
      */
     @Override
-    public RespDTO<List<String>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO) {
+    public RespDTO<List<IndexBatchDTO>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO) {
         log.error("【hystrix】调用{}异常", "getConceptNames");
         return null;
     }

src/main/java/com/diagbot/dto/IndexBatchDTO.java

@@ -0,0 +1,17 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/6/7 10:27
+ */
+@Getter
+@Setter
+public class IndexBatchDTO {
+    private Long id;
+    private String name;
+    private String code;
+}

src/main/java/com/diagbot/facade/DeptConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -317,9 +318,9 @@ public class DeptConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Dept.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < deptConfigList.size(); i++) {
                 if (!names.contains(deptConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));

src/main/java/com/diagbot/facade/DiseaseConfigFacade.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DiseaseConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -316,9 +317,9 @@ public class DiseaseConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Disease.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < diseaseConfigList.size(); i++) {
                 if (!names.contains(diseaseConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));

src/main/java/com/diagbot/facade/DrugConfigFacade.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.DictionaryInfoDTO;
 import com.diagbot.dto.DrugInfoDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DrugConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -369,9 +370,9 @@ public class DrugConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Drug.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < drugConfigList.size(); i++) {
                 if (!names.contains(drugConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 3));

src/main/java/com/diagbot/facade/LisConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.KllisDetailDTO;
 import com.diagbot.dto.LisDetailDTO;
 import com.diagbot.dto.RespDTO;
@@ -364,13 +365,13 @@ public class LisConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.LisPack.getKey());
-            RespDTO<List<String>> respLisPackDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respLisPackDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respLisPackDTO, "标准术语校验失败");
-            List<String> lisPackNames = respLisPackDTO.data;
+            List<String> lisPackNames = respLisPackDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             conceptVO.setType(ConceptTypeEnum.Lis.getKey());
-            RespDTO<List<String>> respLisDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respLisDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respLisDTO, "标准术语校验失败");
-            List<String> lisNames = respLisDTO.data;
+            List<String> lisNames = respLisDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < lisConfigList.size(); i++) {
                 if (StringUtil.isBlank(lisConfigList.get(i).getHisDetailName())) {
                     if (!lisPackNames.contains(lisConfigList.get(i).getUniqueName())) {

src/main/java/com/diagbot/facade/NurseConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.NurseInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.NurseConfig;
@@ -314,9 +315,9 @@ public class NurseConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Nurse.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < nurseConfigList.size(); i++) {
                 if (!names.contains(nurseConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));

src/main/java/com/diagbot/facade/OperationConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.OperationInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.OperationConfig;
@@ -314,9 +315,9 @@ public class OperationConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Operation.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < operationConfigList.size(); i++) {
                 if (!names.contains(operationConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));

src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.PacsConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -313,9 +314,9 @@ public class PacsConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Pacs.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < pacsConfigList.size(); i++) {
                 if (!names.contains(pacsConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));

src/main/java/com/diagbot/facade/ScaleConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.ScaleInfoDTO;
 import com.diagbot.entity.ScaleConfig;
@@ -314,9 +315,9 @@ public class ScaleConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Scale.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < scaleConfigList.size(); i++) {
                 if (!names.contains(scaleConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));

src/main/java/com/diagbot/facade/TcmdiseaseConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TcmdiseaseInfoDTO;
 import com.diagbot.entity.TcmdiseaseConfig;
@@ -317,9 +318,9 @@ public class TcmdiseaseConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Tcmdisease.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < tcmdiseaseConfigList.size(); i++) {
                 if (!names.contains(tcmdiseaseConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));

src/main/java/com/diagbot/facade/TcmsyndromeConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.TcmsyndromeInfoDTO;
 import com.diagbot.entity.TcmsyndromeConfig;
@@ -316,9 +317,9 @@ public class TcmsyndromeConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Tcmsyndrome.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < tcmsyndromeConfigList.size(); i++) {
                 if (!names.contains(tcmsyndromeConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));

src/main/java/com/diagbot/facade/TransfusionConfigFacade.java

@@ -4,6 +4,7 @@ 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.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.TransfusionConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -313,9 +314,9 @@ public class TransfusionConfigFacade {
             ConceptVO conceptVO = new ConceptVO();
             conceptVO.setNames(uniqueNames);
             conceptVO.setType(ConceptTypeEnum.Transfusion.getKey());
-            RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+            RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
             RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-            List<String> names = respDTO.data;
+            List<String> names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
             for (int i = 0; i < transfusionConfigList.size(); i++) {
                 if (!names.contains(transfusionConfigList.get(i).getUniqueName())) {
                     errorNumList.add(String.valueOf(i + 2));