术语映射检索出参修改

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

@@ -20,5 +20,5 @@ public class DiseaseInfoDTO {
     /**
      * ICD10编码
      */
-    private String icd10Code;
+    private String code;
 }

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

@@ -13,4 +13,5 @@ import lombok.Setter;
 public class RetrievalConceptDTO {
     private Long id;
     private String name;
+    private String code;
 }

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

@@ -14,51 +14,51 @@ import java.util.List;
 @Setter
 public class RetrievalDTO {
     /**
-     * 化验大项
+     * 化验大项 辅检 诊断 药品 手术或操作 科室 输血 量表 护理 中医诊断 中医证候
      */
-    private List<RetrievalConceptDTO> lisNames;
+    private List<RetrievalConceptDTO> nameList;
     /**
      * 化验小项
      */
     private List<LisDetailDTO> lisDetailNames;
     /**
      * 辅检
-     */
+     *//*
     private List<RetrievalConceptDTO> pacsNames;
-    /**
+    *//**
      * 诊断
-     */
+     *//*
     private List<DiseaseInfoDTO> diseaseNames;
-    /**
+    *//**
      * 药品
-     */
+     *//*
     private List<DrugInfoDTO> drugNames;
-    /**
+    *//**
      * 手术或操作
-     */
+     *//*
     private List<OperationInfoDTO> operationNames;
-    /**
+    *//**
      * 科室
-     */
+     *//*
     private List<RetrievalConceptDTO> deptNames;
-    /**
+    *//**
      * 输血
-     */
+     *//*
     private List<RetrievalConceptDTO> transfusionNames;
-    /**
+    *//**
      * 量表
-     */
+     *//*
     private List<ScaleInfoDTO> scalenames;
-    /**
+    *//**
      * 护理
-     */
+     *//*
     private List<NurseInfoDTO> nursenames;
-    /**
+    *//**
      * 中医诊断
-     */
+     *//*
     private List<TcmdiseaseInfoDTO> tcmdiseaseNames;
-    /**
+    *//**
      * 中医证候
-     */
-    private List<TcmsyndromeInfoDTO> tcmsyndromeNames;
+     *//*
+    private List<TcmsyndromeInfoDTO> tcmsyndromeNames;*/
 }

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

@@ -486,7 +486,7 @@ public class DiseaseConfigFacade {
         List<DiseaseConfig> diseaseConfigList = diseaseConfigService.getDiseasesIndex(retrievalVO);
         for (DiseaseConfig diseaseConfig : diseaseConfigList) {
             DiseaseInfoDTO diseaseInfoDTO = new DiseaseInfoDTO();
-            diseaseInfoDTO.setIcd10Code(diseaseConfig.getIcdCode());
+            diseaseInfoDTO.setCode(diseaseConfig.getIcdCode());
             diseaseInfoDTO.setName(diseaseConfig.getHisName());
             diseaseNames.add(diseaseInfoDTO);
         }

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

@@ -1,9 +1,16 @@
 package com.diagbot.facade;
 
 import com.diagbot.client.CdssCoreClient;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.DrugInfoDTO;
+import com.diagbot.dto.NurseInfoDTO;
+import com.diagbot.dto.OperationInfoDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalConceptDTO;
 import com.diagbot.dto.RetrievalDTO;
+import com.diagbot.dto.ScaleInfoDTO;
+import com.diagbot.dto.TcmdiseaseInfoDTO;
+import com.diagbot.dto.TcmsyndromeInfoDTO;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
@@ -80,12 +87,12 @@ public class RetrievalFacade {
                     case 1:
                         List<RetrievalConceptDTO> lisNames = new ArrayList<>();
                         List<String> lisPacks = lisConfigFacade.getLisPacks(retrievalVO);
-                       for (String str : lisPacks) {
+                        for (String str : lisPacks) {
                             RetrievalConceptDTO data = new RetrievalConceptDTO();
                             data.setName(str);
                             lisNames.add(data);
                         }
-                        retrievalDTO.setLisNames(lisNames);
+                        retrievalDTO.setNameList(lisNames);
                         break;
                     case 2:
                         retrievalDTO.setLisDetailNames(lisConfigFacade.getLis(retrievalVO));
@@ -98,16 +105,19 @@ public class RetrievalFacade {
                             data.setName(str);
                             Pacss.add(data);
                         }
-                        retrievalDTO.setPacsNames(Pacss);
+                        retrievalDTO.setNameList(Pacss);
                         break;
                     case 4:
-                        retrievalDTO.setDiseaseNames(diseaseConfigFacade.getDiseases(retrievalVO));
+                        List<DiseaseInfoDTO> diseases = diseaseConfigFacade.getDiseases(retrievalVO);
+                        retrievalDTO.setNameList(BeanUtil.listCopyTo(diseases, RetrievalConceptDTO.class));
                         break;
                     case 5:
-                        retrievalDTO.setDrugNames(drugConfigFacade.getMedicines(retrievalVO));
+                        List<DrugInfoDTO> medicines = drugConfigFacade.getMedicines(retrievalVO);
+                        retrievalDTO.setNameList(BeanUtil.listCopyTo(medicines, RetrievalConceptDTO.class));
                         break;
                     case 6:
-                        retrievalDTO.setOperationNames(operationConfigFacade.getOperations(retrievalVO));
+                        List<OperationInfoDTO> operations = operationConfigFacade.getOperations(retrievalVO);
+                        retrievalDTO.setNameList(BeanUtil.listCopyTo(operations, RetrievalConceptDTO.class));
                         break;
                     case 7:
                         List<RetrievalConceptDTO> Depts = new ArrayList<>();
@@ -117,7 +127,7 @@ public class RetrievalFacade {
                             data.setName(str);
                             Depts.add(data);
                         }
-                        retrievalDTO.setDeptNames(Depts);
+                        retrievalDTO.setNameList(Depts);
                         break;
                     case 8:
                         List<RetrievalConceptDTO> Transfusion = new ArrayList<>();
@@ -127,19 +137,23 @@ public class RetrievalFacade {
                             data.setName(str);
                             Transfusion.add(data);
                         }
-                        retrievalDTO.setTransfusionNames(Transfusion);
+                        retrievalDTO.setNameList(Transfusion);
                         break;
                     case 10:
-                        retrievalDTO.setScalenames(scaleConfigFacade.getScales(retrievalVO));
+                        List<ScaleInfoDTO> scales = scaleConfigFacade.getScales(retrievalVO);
+                        retrievalDTO.setNameList(BeanUtil.listCopyTo(scales, RetrievalConceptDTO.class));
                         break;
                     case 11:
-                        retrievalDTO.setNursenames(nurseConfigFacade.getNurses(retrievalVO));
+                        List<NurseInfoDTO> nurses = nurseConfigFacade.getNurses(retrievalVO);
+                        retrievalDTO.setNameList(BeanUtil.listCopyTo(nurses, RetrievalConceptDTO.class));
                         break;
                     case 12:
-                        retrievalDTO.setTcmdiseaseNames(tcmdiseaseConfigFacade.getTcmdiseases(retrievalVO));
+                        List<TcmdiseaseInfoDTO> tcmdiseases = tcmdiseaseConfigFacade.getTcmdiseases(retrievalVO);
+                        retrievalDTO.setNameList(BeanUtil.listCopyTo(tcmdiseases, RetrievalConceptDTO.class));
                         break;
                     case 13:
-                        retrievalDTO.setTcmsyndromeNames(tcmsyndromeConfigFacade.getTcmsyndromes(retrievalVO));
+                        List<TcmsyndromeInfoDTO> tcmsyndromes = tcmsyndromeConfigFacade.getTcmsyndromes(retrievalVO);
+                        retrievalDTO.setNameList(BeanUtil.listCopyTo(tcmsyndromes, RetrievalConceptDTO.class));
                         break;
                 }
             }