1、术语映射预匹配

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

@@ -6,6 +6,7 @@ import com.diagbot.annotation.SysLogger;
 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;
@@ -62,7 +63,7 @@ public interface CdssCoreClient {
      * @return
      */
     @PostMapping("/retrieval/getConceptNames")
-    RespDTO<List<String>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO);
+    RespDTO<List<IndexBatchDTO>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO);
 
     /**
      * 化验大项、化验小项、辅检、诊断、药品、手术等检索

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

@@ -5,6 +5,7 @@ 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;
@@ -64,7 +65,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;
     }

cdssman-service/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;
+}

cdssman-service/src/main/java/com/diagbot/facade/DeptConfigFacade.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.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DeptConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -336,9 +337,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));
@@ -502,9 +503,9 @@ public class DeptConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Dept.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<String> uniqueNames = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(originList)) {
             for (DeptConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DiseaseConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -313,9 +314,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));
@@ -517,16 +518,19 @@ public class DiseaseConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Disease.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<IndexBatchDTO> uniqueNameList = respDTO.data;
+        Map<String, IndexBatchDTO> uniqueMap = uniqueNameList.stream().collect(Collectors.toMap(IndexBatchDTO::getName, v -> v));
+        //List<String> uniqueNames = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(originList)) {
             for (DiseaseConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {
                     List<DiseaseConfig> items = allMap.get(originItem.getHisName());
                     boolean flag = false;
                     for (DiseaseConfig item : items) {
-                        if (uniqueNames.contains(item.getUniqueName())) {
+                        if (uniqueMap.containsKey(item.getUniqueName())) {
+                            item.setIcdCode(uniqueMap.get(item.getUniqueName()).getCode());
                             retList.add(item);
                             flag = true;
                         }

cdssman-service/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.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DrugConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -377,9 +378,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 + 2));
@@ -771,9 +772,9 @@ public class DrugConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Drug.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<String> uniqueNames = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(originList)) {
             for (DrugConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {

cdssman-service/src/main/java/com/diagbot/facade/LisConfigFacade.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.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.LisConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -365,13 +366,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())) {
                     //检验套餐对应套餐
@@ -618,13 +619,13 @@ public class LisConfigFacade{
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         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());
 
         if (ListUtil.isNotEmpty(originList)) {
             for (LisConfig originItem : originList) {

cdssman-service/src/main/java/com/diagbot/facade/NurseConfigFacade.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.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.NurseConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -321,9 +322,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));
@@ -525,9 +526,9 @@ public class NurseConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Nurse.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<String> uniqueNames = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(originList)) {
             for (NurseConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {

cdssman-service/src/main/java/com/diagbot/facade/OperationConfigFacade.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.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.OperationConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -321,9 +322,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));
@@ -525,9 +526,9 @@ public class OperationConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Operation.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<String> uniqueNames = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(originList)) {
             for (OperationConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {

cdssman-service/src/main/java/com/diagbot/facade/PacsConfigFacade.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.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.PacsConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -319,9 +320,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));
@@ -523,9 +524,9 @@ public class PacsConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Pacs.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<String> uniqueNames = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(originList)) {
             for (PacsConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {

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

@@ -8,6 +8,7 @@ import com.diagbot.dto.ExportCommonStaticTestDTO;
 import com.diagbot.dto.ExportCommonTestDTO;
 import com.diagbot.dto.ExportLisStaticTestDTO;
 import com.diagbot.dto.ExportLisTestDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.DiseaseConfig;
 import com.diagbot.entity.DrugConfig;
@@ -197,16 +198,16 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         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);
         List<String> lisPackNames = Lists.newLinkedList();
         if (RespDTOUtil.respIsOK(respLisPackDTO)) {
-            lisPackNames = respLisPackDTO.data;
+            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);
         List<String> lisNames = Lists.newLinkedList();
         if (RespDTOUtil.respIsOK(respLisDTO)) {
-            lisNames = respLisDTO.data;
+            lisNames = respLisDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         }
 
         //判断是否有标准术语
@@ -395,10 +396,10 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         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);
         List<String> names = Lists.newLinkedList();
         if (RespDTOUtil.respIsOK(respDTO)) {
-            names = respDTO.data;
+            names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         }
         for (ResultStaticKnowledge result : mappingList) {
             if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
@@ -586,10 +587,10 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         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);
         List<String> names = Lists.newLinkedList();
         if (RespDTOUtil.respIsOK(respDTO)) {
-            names = respDTO.data;
+            names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         }
         for (ResultStaticKnowledge result : mappingList) {
             if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
@@ -742,10 +743,10 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         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);
         List<String> names = Lists.newLinkedList();
         if (RespDTOUtil.respIsOK(respDTO)) {
-            names = respDTO.data;
+            names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         }
         for (ResultStaticKnowledge result : mappingList) {
             if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {
@@ -898,10 +899,10 @@ public class ResultStaticKnowledgeFacade extends ResultStaticKnowledgeServiceImp
         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);
         List<String> names = Lists.newLinkedList();
         if (RespDTOUtil.respIsOK(respDTO)) {
-            names = respDTO.data;
+            names = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         }
         for (ResultStaticKnowledge result : mappingList) {
             if (result.getHasStandName() == null || result.getHasStandName().equals(0)) {

cdssman-service/src/main/java/com/diagbot/facade/ScaleConfigFacade.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.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.ScaleConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -321,9 +322,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));
@@ -525,9 +526,9 @@ public class ScaleConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Scale.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<String> uniqueNames = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(originList)) {
             for (ScaleConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {

cdssman-service/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.metadata.IPage;
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.TcmdiseaseConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -311,9 +312,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));
@@ -514,16 +515,18 @@ public class TcmdiseaseConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Tcmdisease.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<IndexBatchDTO> uniqueNameList = respDTO.data;
+        Map<String, IndexBatchDTO> uniqueMap = uniqueNameList.stream().collect(Collectors.toMap(IndexBatchDTO::getName, v -> v));
         if (ListUtil.isNotEmpty(originList)) {
             for (TcmdiseaseConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {
                     List<TcmdiseaseConfig> items = allMap.get(originItem.getHisName());
                     boolean flag = false;
                     for (TcmdiseaseConfig item : items) {
-                        if (uniqueNames.contains(item.getUniqueName())) {
+                        if (uniqueMap.containsKey(item.getUniqueName())) {
+                            item.setUniqueCode(uniqueMap.get(item.getUniqueName()).getCode());
                             retList.add(item);
                             flag = true;
                         }

cdssman-service/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.metadata.IPage;
 import com.diagbot.client.CdssCoreClient;
 import com.diagbot.dto.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.TcmsyndromeConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -311,9 +312,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));
@@ -514,16 +515,18 @@ public class TcmsyndromeConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Tcmsyndrome.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<IndexBatchDTO> uniqueNameList = respDTO.data;
+        Map<String, IndexBatchDTO> uniqueMap = uniqueNameList.stream().collect(Collectors.toMap(IndexBatchDTO::getName, v -> v));
         if (ListUtil.isNotEmpty(originList)) {
             for (TcmsyndromeConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {
                     List<TcmsyndromeConfig> items = allMap.get(originItem.getHisName());
                     boolean flag = false;
                     for (TcmsyndromeConfig item : items) {
-                        if (uniqueNames.contains(item.getUniqueName())) {
+                        if (uniqueMap.containsKey(item.getUniqueName())) {
+                            item.setUniqueCode(uniqueMap.get(item.getUniqueName()).getCode());
                             retList.add(item);
                             flag = true;
                         }

cdssman-service/src/main/java/com/diagbot/facade/TransfusionConfigFacade.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.HosRelationNumDTO;
+import com.diagbot.dto.IndexBatchDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.TransfusionConfig;
 import com.diagbot.enums.ConceptTypeEnum;
@@ -319,9 +320,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));
@@ -523,9 +524,9 @@ public class TransfusionConfigFacade {
         ConceptVO conceptVO = new ConceptVO();
         conceptVO.setNames(precUniqueName);
         conceptVO.setType(ConceptTypeEnum.Transfusion.getKey());
-        RespDTO<List<String>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
+        RespDTO<List<IndexBatchDTO>> respDTO = cdssCoreClient.getConceptNames(conceptVO);
         RespDTOUtil.respNGDealCover(respDTO, "标准术语校验失败");
-        List<String> uniqueNames = respDTO.data;
+        List<String> uniqueNames = respDTO.data.stream().map(IndexBatchDTO::getName).collect(Collectors.toList());
         if (ListUtil.isNotEmpty(originList)) {
             for (TransfusionConfig originItem : originList) {
                 if (allMap.containsKey(originItem.getHisName())) {