浏览代码

量表检索

zhaops 4 年之前
父节点
当前提交
b768723faf

+ 4 - 0
src/main/java/com/diagbot/dto/RetrievalDTO.java

@@ -53,4 +53,8 @@ public class RetrievalDTO {
      * 体征
      */
     private List<String> vitalNames;
+    /**
+     * 量表
+     */
+    private List<ScaleInfoDTO> scalenames;
 }

+ 19 - 0
src/main/java/com/diagbot/dto/ScaleInfoDTO.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/4/13 14:06
+ */
+@Getter
+@Setter
+public class ScaleInfoDTO {
+    /**
+     * 量表名称
+     */
+    private String name;
+}
+

+ 2 - 1
src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -89,10 +89,11 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             case 8:
                 retType = LexiconEnum.Transfusion.getKey();
                 break;
+            case 10:
+                retType = LexiconEnum.Scale.getKey();
             default:
                 break;
         }
-
         return retType;
     }
 

+ 17 - 10
src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -266,27 +266,34 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
         //检索类型(多选):0-全部、1-诊断、2-药品、3-检验、4-检查、5-手术和操作
         if (ListUtil.isEmpty(types)
                 || (ListUtil.isNotEmpty(types) && types.contains(0))) {
-            staticKnowledgeIndexPageVO.getTypeIds().addAll(Arrays.asList(new Integer[] { 100, 101, 106, 107, 108, 109, 110,124 }));
+            staticKnowledgeIndexPageVO.getTypeIds().addAll(Arrays.asList(new Integer[] { LexiconEnum.Disease.getKey(),
+                    LexiconEnum.Disease.getKey(),
+                    LexiconEnum.LisName.getKey(),
+                    LexiconEnum.LisSubName.getKey(),
+                    LexiconEnum.PacsName.getKey(),
+                    LexiconEnum.PacsSubName.getKey(),
+                    LexiconEnum.Operation.getKey(),
+                    LexiconEnum.Scale.getKey() }));
         } else {
             if (types.contains(1)) {
-                staticKnowledgeIndexPageVO.getTypeIds().add(100);
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Disease.getKey());
             }
             if (types.contains(2)) {
-                staticKnowledgeIndexPageVO.getTypeIds().add(101);
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Medicine.getKey());
             }
             if (types.contains(3)) {
-                staticKnowledgeIndexPageVO.getTypeIds().add(107);
-                staticKnowledgeIndexPageVO.getTypeIds().add(108);
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.LisName.getKey());
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.LisSubName.getKey());
             }
             if (types.contains(5)) {
-                staticKnowledgeIndexPageVO.getTypeIds().add(109);
-                staticKnowledgeIndexPageVO.getTypeIds().add(110);
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.PacsName.getKey());
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.PacsSubName.getKey());
             }
             if (types.contains(6)) {
-                staticKnowledgeIndexPageVO.getTypeIds().add(106);
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Operation.getKey());
             }
-            if(types.contains(8)){
-                staticKnowledgeIndexPageVO.getTypeIds().add(124);
+            if (types.contains(8)) {
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Scale.getKey());
             }
         }
         IPage<StaticKnowledgeIndexPageDTO> page = super.staticIndexPage(staticKnowledgeIndexPageVO);

+ 24 - 22
src/main/java/com/diagbot/facade/MedRetrievalFacade.java

@@ -7,6 +7,7 @@ import com.diagbot.dto.IndexDTO;
 import com.diagbot.dto.LisDetailDTO;
 import com.diagbot.dto.OperationInfoDTO;
 import com.diagbot.dto.RetrievalDTO;
+import com.diagbot.dto.ScaleInfoDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.enums.LexiconEnum;
 import com.diagbot.util.BeanUtil;
@@ -56,20 +57,20 @@ public class MedRetrievalFacade {
         List<IndexDTO> indexList = Lists.newLinkedList();
 
         /**
-         * 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状
+         * 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表
          */
         switch (retrievalVO.getType()) {
             case 1:
-                medRetrievalVO.setTypeId(107);
-                medRetrievalVO.getTypeIds().add(107);
+                medRetrievalVO.setTypeId(LexiconEnum.LisName.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.LisName.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     retrievalDTO.setLisNames(indexList.stream().map(i -> i.getName()).collect(Collectors.toList()));
                 }
                 break;
             case 2:
-                medRetrievalVO.setTypeId(108);
-                medRetrievalVO.getTypeIds().add(108);
+                medRetrievalVO.setTypeId(LexiconEnum.LisSubName.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.LisSubName.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     List<LisDetailDTO> lisDetails = Lists.newLinkedList();
@@ -88,67 +89,68 @@ public class MedRetrievalFacade {
                 }
                 break;
             case 3:
-                medRetrievalVO.setTypeId(109);
-                medRetrievalVO.getTypeIds().addAll(Arrays.asList(new Integer[] { 109, 110 }));
+                medRetrievalVO.setTypeId(LexiconEnum.PacsName.getKey());
+                medRetrievalVO.getTypeIds().addAll(Arrays.asList(new Integer[] { LexiconEnum.PacsName.getKey(),
+                        LexiconEnum.PacsSubName.getKey() }));
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     retrievalDTO.setPacsNames(indexList.stream().map(i -> i.getName()).collect(Collectors.toList()));
                 }
                 break;
             case 4:
-                medRetrievalVO.setTypeId(100);
-                medRetrievalVO.getTypeIds().add(100);
+                medRetrievalVO.setTypeId(LexiconEnum.Disease.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.Disease.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     retrievalDTO.setDiseaseNames(BeanUtil.listCopyTo(indexList, DiseaseInfoDTO.class));
                 }
                 break;
             case 5:
-                medRetrievalVO.setTypeId(101);
-                medRetrievalVO.getTypeIds().add(101);
+                medRetrievalVO.setTypeId(LexiconEnum.Medicine.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.Medicine.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     retrievalDTO.setDrugNames(BeanUtil.listCopyTo(indexList, DrugInfoDTO.class));
                 }
                 break;
             case 6:
-                medRetrievalVO.setTypeId(106);
-                medRetrievalVO.getTypeIds().add(106);
+                medRetrievalVO.setTypeId(LexiconEnum.Operation.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.Operation.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     retrievalDTO.setOperationNames(BeanUtil.listCopyTo(indexList, OperationInfoDTO.class));
                 }
                 break;
             case 7:
-                medRetrievalVO.setTypeId(115);
-                medRetrievalVO.getTypeIds().add(115);
+                medRetrievalVO.setTypeId(LexiconEnum.Dept.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.Dept.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     retrievalDTO.setDeptNames(indexList.stream().map(i -> i.getName()).collect(Collectors.toList()));
                 }
                 break;
             case 8:
-                medRetrievalVO.setTypeId(113);
-                medRetrievalVO.getTypeIds().add(113);
+                medRetrievalVO.setTypeId(LexiconEnum.Transfusion.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.Transfusion.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     retrievalDTO.setTransfusionNames(indexList.stream().map(i -> i.getName()).collect(Collectors.toList()));
                 }
                 break;
             case 9:
-                medRetrievalVO.setTypeId(103);
-                medRetrievalVO.getTypeIds().add(103);
+                medRetrievalVO.setTypeId(LexiconEnum.Symptom.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.Symptom.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
                     retrievalDTO.setSymptomNames(indexList.stream().map(i -> i.getName()).collect(Collectors.toList()));
                 }
                 break;
             case 10:
-                medRetrievalVO.setTypeId(124);
-                medRetrievalVO.getTypeIds().add(124);
+                medRetrievalVO.setTypeId(LexiconEnum.Scale.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.Scale.getKey());
                 indexList = klConceptFacade.index(medRetrievalVO);
                 if (ListUtil.isNotEmpty(indexList)) {
-                    retrievalDTO.setSymptomNames(indexList.stream().map(i -> i.getName()).collect(Collectors.toList()));
+                    retrievalDTO.setScalenames(BeanUtil.listCopyTo(indexList, ScaleInfoDTO.class));
                 }
                 break;
         }

+ 1 - 1
src/main/java/com/diagbot/web/RetrievalController.java

@@ -56,7 +56,7 @@ public class RetrievalController {
     }
 
     @ApiOperation(value = "术语批量查询[zhaops]",
-            notes = "type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-量表 <br>" +
+            notes = "type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表 <br>" +
                     "names: 术语列表<br>")
     @PostMapping("/getConceptNames")
     public RespDTO<List<String>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO) {