搜索接口出参修改

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

@@ -14,4 +14,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,69 +14,69 @@ 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<RetrievalConceptDTO> diseaseNames;
+    *//**
      * 药品
-     */
-    private List<DrugInfoDTO> drugNames;
-    /**
+     *//*
+    private List<RetrievalConceptDTO> drugNames;
+    *//**
      * 手术或操作
-     */
-    private List<OperationInfoDTO> operationNames;
-    /**
+     *//*
+    private List<RetrievalConceptDTO> operationNames;
+    *//**
      * 科室
-     */
+     *//*
     private List<RetrievalConceptDTO> deptNames;
-    /**
+    *//**
      * 输血
-     */
+     *//*
     private List<RetrievalConceptDTO> transfusionNames;
-    /**
+    *//**
      * 症状
-     */
+     *//*
     private List<RetrievalConceptDTO> symptomNames;
-    /**
+    *//**
      * 体征
-     */
+     *//*
     private List<RetrievalConceptDTO> vitalNames;
-    /**
+    *//**
      * 量表
-     */
-    private List<ScaleInfoDTO> scalenames;
-    /**
+     *//*
+    private List<RetrievalConceptDTO> scalenames;
+    *//**
      * 护理
-     */
-    private List<NurseInfoDTO> nursenames;
-    /**
+     *//*
+    private List<RetrievalConceptDTO> nursenames;
+    *//**
      * 中医诊断
-     */
-    private List<TcmdiseaseInfoDTO> tcmdiseaseNames;
-    /**
+     *//*
+    private List<RetrievalConceptDTO> tcmdiseaseNames;
+    *//**
      * 中医证候
-     */
-    private List<TcmsyndromeInfoDTO> tcmsyndromeNames;
-    /**
+     *//*
+    private List<RetrievalConceptDTO> tcmsyndromeNames;
+    *//**
      * 麻醉
-     */
-    private List<AnesthesiaInfoDTO> anesthesiaInfonames;
+     *//*
+    private List<RetrievalConceptDTO> anesthesiaInfonames;
 
-    /**
+    *//**
      * 药品剂型
-     */
-    private List<RetrievalConceptDTO> drugDosage;
+     *//*
+    private List<RetrievalConceptDTO> drugDosage;*/
 
 }

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

@@ -63,15 +63,16 @@ public class MedRetrievalFacade {
         /**
          * 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉
          */
+
         switch (retrievalVO.getType()) {
             case 1:
                 medRetrievalVO.setTypeId(LexiconEnum.LisName.getKey());
                 medRetrievalVO.getTypeIds().add(LexiconEnum.LisName.getKey());
+                List<RetrievalConceptDTO> nameList = new ArrayList<>();
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    List<RetrievalConceptDTO> lisNames = new ArrayList<>();
-                    lisNames = BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class);
-                    retrievalDTO.setLisNames(lisNames);
+                    nameList = BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class);
+                    retrievalDTO.setNameList(nameList);
                 }
                 break;
             case 2:
@@ -102,7 +103,7 @@ public class MedRetrievalFacade {
                 if (ListUtil.isNotEmpty(indexList)) {
                     List<RetrievalConceptDTO> pacsNames = new ArrayList<>();
                     pacsNames = BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class);
-                    retrievalDTO.setPacsNames(pacsNames);
+                    retrievalDTO.setNameList(pacsNames);
                 }
                 break;
             case 4:
@@ -110,7 +111,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Disease.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setDiseaseNames(BeanUtil.listCopyTo(indexList, DiseaseInfoDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
             case 5:
@@ -118,7 +119,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Medicine.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setDrugNames(BeanUtil.listCopyTo(indexList, DrugInfoDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
             case 6:
@@ -126,7 +127,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Operation.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setOperationNames(BeanUtil.listCopyTo(indexList, OperationInfoDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
             case 7:
@@ -136,7 +137,7 @@ public class MedRetrievalFacade {
                 if (ListUtil.isNotEmpty(indexList)) {
                     List<RetrievalConceptDTO> deptNames = new ArrayList<>();
                     deptNames = BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class);
-                    retrievalDTO.setDeptNames(deptNames);
+                    retrievalDTO.setNameList(deptNames);
                 }
                 break;
             case 8:
@@ -146,7 +147,7 @@ public class MedRetrievalFacade {
                 if (ListUtil.isNotEmpty(indexList)) {
                     List<RetrievalConceptDTO> transfusionNames = new ArrayList<>();
                     transfusionNames = BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class);
-                    retrievalDTO.setTransfusionNames(transfusionNames);
+                    retrievalDTO.setNameList(transfusionNames);
                 }
                 break;
             case 9:
@@ -156,7 +157,7 @@ public class MedRetrievalFacade {
                 if (ListUtil.isNotEmpty(indexList)) {
                     List<RetrievalConceptDTO> symptomNames = new ArrayList<>();
                     symptomNames = BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class);
-                    retrievalDTO.setSymptomNames(symptomNames);
+                    retrievalDTO.setNameList(symptomNames);
                 }
                 break;
             case 10:
@@ -164,7 +165,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Scale.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setScalenames(BeanUtil.listCopyTo(indexList, ScaleInfoDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
             case 11:
@@ -172,7 +173,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Nurse.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setNursenames(BeanUtil.listCopyTo(indexList, NurseInfoDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
             case 12:
@@ -180,7 +181,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Tcmdisease.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setTcmdiseaseNames(BeanUtil.listCopyTo(indexList, TcmdiseaseInfoDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
             case 13:
@@ -188,7 +189,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Tcmsyndrome.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setTcmsyndromeNames(BeanUtil.listCopyTo(indexList, TcmsyndromeInfoDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
             case 14:
@@ -196,7 +197,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Anesthesia.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setAnesthesiaInfonames(BeanUtil.listCopyTo(indexList, AnesthesiaInfoDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
             case 15:
@@ -204,7 +205,7 @@ public class MedRetrievalFacade {
                 medRetrievalVO.getTypeIds().add(LexiconEnum.Form.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setDrugDosage(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
+                    retrievalDTO.setNameList(BeanUtil.listCopyTo(indexList, RetrievalConceptDTO.class));
                 }
                 break;
         }

src/main/resources/mapper/KlConceptMapper.xml

@@ -21,7 +21,7 @@
 		t.id as id,
 		t.lib_name as name
 		<if test="typeId!=null and typeId==100">
-			,t.icd10Code as icd10Code
+			,t.code as code
 		</if>
 		<if test="typeId!=null and typeId==127">
 			,t.code as code
@@ -47,7 +47,7 @@
 		b.id,
 		b.lib_name
 		<if test="typeId!=null and typeId==100">
-			,c.icd10_code as icd10Code
+			,c.icd10_code as code
 		</if>
 		<if test="typeId!=null and typeId==127">
 			,c.code as code
@@ -113,7 +113,7 @@
 		b.id,
 		b.lib_name
 		<if test="typeId!=null and typeId==100">
-			,c.icd10_code as icd10Code
+			,c.icd10_code as code
 		</if>
 		<if test="typeId!=null and typeId==127">
 			,c.code as code
@@ -179,7 +179,7 @@
 		b.id,
 		b.lib_name
 		<if test="typeId!=null and typeId==100">
-			,c.icd10_code as icd10Code
+			,c.icd10_code as code
 		</if>
 		<if test="typeId!=null and typeId==127">
 			,c.code as code