Browse Source

1、护理相关

zhaops 4 years ago
parent
commit
04d56e99c8

+ 18 - 0
src/main/java/com/diagbot/dto/NurseInfoDTO.java

@@ -0,0 +1,18 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2021/4/23 10:55
+ */
+@Getter
+@Setter
+public class NurseInfoDTO {
+    /**
+     * 护理名称
+     */
+    private String name;
+}

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

@@ -57,4 +57,8 @@ public class RetrievalDTO {
      * 量表
      * 量表
      */
      */
     private List<ScaleInfoDTO> scalenames;
     private List<ScaleInfoDTO> scalenames;
+    /**
+     * 护理
+     */
+    private List<NurseInfoDTO> nursenames;
 }
 }

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

@@ -43,7 +43,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             return new ArrayList<>();
             return new ArrayList<>();
         }
         }
         List<String> retList = Lists.newLinkedList();
         List<String> retList = Lists.newLinkedList();
-        //type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血
+        //type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理
         Integer type = convertType(conceptVO.getType());
         Integer type = convertType(conceptVO.getType());
 
 
         QueryWrapper<KlConcept> queryWrapper = new QueryWrapper<>();
         QueryWrapper<KlConcept> queryWrapper = new QueryWrapper<>();
@@ -67,7 +67,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
 
 
     public Integer convertType(Integer type) {
     public Integer convertType(Integer type) {
         Integer retType = null;
         Integer retType = null;
-        //type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血
+        //type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理
         switch (type) {
         switch (type) {
             case 1:
             case 1:
                 retType = LexiconEnum.LisName.getKey();
                 retType = LexiconEnum.LisName.getKey();
@@ -95,6 +95,9 @@ public class KlConceptFacade extends KlConceptServiceImpl {
                 break;
                 break;
             case 10:
             case 10:
                 retType = LexiconEnum.Scale.getKey();
                 retType = LexiconEnum.Scale.getKey();
+                break;
+            case 11:
+                retType = LexiconEnum.Nurse.getKey();
             default:
             default:
                 break;
                 break;
         }
         }

+ 12 - 3
src/main/java/com/diagbot/facade/KlConceptStaticFacade.java

@@ -80,7 +80,7 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
         StaticKnowledgeDTO staticKnowledgeDTO = new StaticKnowledgeDTO();
         StaticKnowledgeDTO staticKnowledgeDTO = new StaticKnowledgeDTO();
         Integer type = convertType(staticKnowledgeVO.getType(), 1);
         Integer type = convertType(staticKnowledgeVO.getType(), 1);
         if (type == null) {
         if (type == null) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确类型(1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表)");
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确类型(1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理)");
         }
         }
         staticKnowledgeVO.setType(type);
         staticKnowledgeVO.setType(type);
 
 
@@ -331,7 +331,8 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
                     LexiconEnum.PacsName.getKey(),
                     LexiconEnum.PacsName.getKey(),
                     LexiconEnum.PacsSubName.getKey(),
                     LexiconEnum.PacsSubName.getKey(),
                     LexiconEnum.Operation.getKey(),
                     LexiconEnum.Operation.getKey(),
-                    LexiconEnum.Scale.getKey() }));
+                    LexiconEnum.Scale.getKey(),
+                    LexiconEnum.Nurse.getKey() }));
         } else {
         } else {
             if (types.contains(1)) {
             if (types.contains(1)) {
                 staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Disease.getKey());
                 staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Disease.getKey());
@@ -353,9 +354,12 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
             if (types.contains(8)) {
             if (types.contains(8)) {
                 staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Scale.getKey());
                 staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Scale.getKey());
             }
             }
+            if (types.contains(9)) {
+                staticKnowledgeIndexPageVO.getTypeIds().add(LexiconEnum.Nurse.getKey());
+            }
         }
         }
         if (ListUtil.isEmpty(staticKnowledgeIndexPageVO.getTypeIds())) {
         if (ListUtil.isEmpty(staticKnowledgeIndexPageVO.getTypeIds())) {
-            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确的检索类型(多选):0-全部、1-诊断、2-药品、3-检验、4-检查、5-手术和操作");
+            throw new CommonException(CommonErrorCode.PARAM_IS_ERROR, "请输入正确的检索类型(多选):0-全部、1-诊断、2-药品、3-检验、4-检查、7-手术和操作、8-量表、9-护理");
         }
         }
         IPage<StaticKnowledgeIndexPageDTO> page = super.staticIndexPage(staticKnowledgeIndexPageVO);
         IPage<StaticKnowledgeIndexPageDTO> page = super.staticIndexPage(staticKnowledgeIndexPageVO);
 
 
@@ -629,6 +633,9 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
                 case 8:
                 case 8:
                     retType = LexiconEnum.Scale.getKey();
                     retType = LexiconEnum.Scale.getKey();
                     break;
                     break;
+                case 9:
+                    retType = LexiconEnum.Nurse.getKey();
+                    break;
                 default:
                 default:
                     break;
                     break;
             }
             }
@@ -649,6 +656,8 @@ public class KlConceptStaticFacade extends KlConceptStaticServiceImpl {
                 retType = 7;
                 retType = 7;
             } else if (type.equals(LexiconEnum.Scale.getKey())) {
             } else if (type.equals(LexiconEnum.Scale.getKey())) {
                 retType = 8;
                 retType = 8;
+            } else if (type.equals(LexiconEnum.Nurse.getKey())) {
+                retType = 9;
             }
             }
         }
         }
         return retType;
         return retType;

+ 16 - 3
src/main/java/com/diagbot/facade/MedRetrievalFacade.java

@@ -5,6 +5,7 @@ import com.diagbot.dto.DiseaseInfoDTO;
 import com.diagbot.dto.DrugInfoDTO;
 import com.diagbot.dto.DrugInfoDTO;
 import com.diagbot.dto.IndexDTO;
 import com.diagbot.dto.IndexDTO;
 import com.diagbot.dto.LisDetailDTO;
 import com.diagbot.dto.LisDetailDTO;
+import com.diagbot.dto.NurseInfoDTO;
 import com.diagbot.dto.OperationInfoDTO;
 import com.diagbot.dto.OperationInfoDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.ScaleInfoDTO;
 import com.diagbot.dto.ScaleInfoDTO;
@@ -57,7 +58,7 @@ public class MedRetrievalFacade {
         List<IndexDTO> indexList = Lists.newLinkedList();
         List<IndexDTO> indexList = Lists.newLinkedList();
 
 
         /**
         /**
-         * 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表
+         * 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理
          */
          */
         switch (retrievalVO.getType()) {
         switch (retrievalVO.getType()) {
             case 1:
             case 1:
@@ -153,6 +154,14 @@ public class MedRetrievalFacade {
                     retrievalDTO.setScalenames(BeanUtil.listCopyTo(indexList, ScaleInfoDTO.class));
                     retrievalDTO.setScalenames(BeanUtil.listCopyTo(indexList, ScaleInfoDTO.class));
                 }
                 }
                 break;
                 break;
+            case 11:
+                medRetrievalVO.setTypeId(LexiconEnum.Nurse.getKey());
+                medRetrievalVO.getTypeIds().add(LexiconEnum.Nurse.getKey());
+                indexList = klConceptFacade.index(medRetrievalVO);
+                if (ListUtil.isNotEmpty(indexList)) {
+                    retrievalDTO.setNursenames(BeanUtil.listCopyTo(indexList, NurseInfoDTO.class));
+                }
+                break;
         }
         }
         return retrievalDTO;
         return retrievalDTO;
     }
     }
@@ -175,7 +184,7 @@ public class MedRetrievalFacade {
         Map<String, String> dicTypeMap = EntityUtil.makeMapWithKeyValue(dicType, "name", "val");
         Map<String, String> dicTypeMap = EntityUtil.makeMapWithKeyValue(dicType, "name", "val");
         List<DictionaryInfoDTO> dicTypeName = dictionaryFacade.getListByGroupType(13);
         List<DictionaryInfoDTO> dicTypeName = dictionaryFacade.getListByGroupType(13);
 
 
-        //检索类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表
+        //检索类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理
         if (ListUtil.isEmpty(types)
         if (ListUtil.isEmpty(types)
                 || (ListUtil.isNotEmpty(types) && types.contains(0))) {
                 || (ListUtil.isNotEmpty(types) && types.contains(0))) {
             staticKnowledgeIndexVO.getTypeIds().addAll(Arrays.asList(new Integer[] { LexiconEnum.Disease.getKey(),
             staticKnowledgeIndexVO.getTypeIds().addAll(Arrays.asList(new Integer[] { LexiconEnum.Disease.getKey(),
@@ -185,7 +194,8 @@ public class MedRetrievalFacade {
                     LexiconEnum.PacsName.getKey(),
                     LexiconEnum.PacsName.getKey(),
                     LexiconEnum.PacsSubName.getKey(),
                     LexiconEnum.PacsSubName.getKey(),
                     LexiconEnum.Operation.getKey(),
                     LexiconEnum.Operation.getKey(),
-                    LexiconEnum.Scale.getKey() }));
+                    LexiconEnum.Scale.getKey(),
+                    LexiconEnum.Nurse.getKey() }));
         } else {
         } else {
             if (types.contains(1)) {
             if (types.contains(1)) {
                 staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Disease.getKey());
                 staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Disease.getKey());
@@ -207,6 +217,9 @@ public class MedRetrievalFacade {
             if (types.contains(8)) {
             if (types.contains(8)) {
                 staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Scale.getKey());
                 staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Scale.getKey());
             }
             }
+            if (types.contains(9)) {
+                staticKnowledgeIndexVO.getTypeIds().add(LexiconEnum.Nurse.getKey());
+            }
         }
         }
 
 
         List<StaticKnowledgeIndexDTO> retList = klConceptFacade.staticIndex(staticKnowledgeIndexVO);
         List<StaticKnowledgeIndexDTO> retList = klConceptFacade.staticIndex(staticKnowledgeIndexVO);

+ 5 - 5
src/main/java/com/diagbot/web/KlConceptStaticController.java

@@ -44,7 +44,7 @@ public class KlConceptStaticController {
     KlConceptStaticFacade klConceptStaticFacade;
     KlConceptStaticFacade klConceptStaticFacade;
 
 
     @ApiOperation(value = "获取静态知识[zhaops]",
     @ApiOperation(value = "获取静态知识[zhaops]",
-            notes = "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表 <br>" +
+            notes = "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理 <br>" +
                     "contentTypes: 内容类型(多选):1-静态信息、2-注意事项、3-临床路径、4-治疗方案<br>" +
                     "contentTypes: 内容类型(多选):1-静态信息、2-注意事项、3-临床路径、4-治疗方案<br>" +
                     "name: 标准术语名称<br>")
                     "name: 标准术语名称<br>")
     @PostMapping("/getStaticKnowledge")
     @PostMapping("/getStaticKnowledge")
@@ -55,7 +55,7 @@ public class KlConceptStaticController {
     }
     }
 
 
     @ApiOperation(value = "获取静态知识列表[zhaops]",
     @ApiOperation(value = "获取静态知识列表[zhaops]",
-            notes = "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表 <br>" +
+            notes = "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理  <br>" +
                     "name: 术语名称<br>" +
                     "name: 术语名称<br>" +
                     "status: 启用状态:1-启用、0-禁用<br>")
                     "status: 启用状态:1-启用、0-禁用<br>")
     @PostMapping("/getPage")
     @PostMapping("/getPage")
@@ -69,7 +69,7 @@ public class KlConceptStaticController {
     }
     }
 
 
     @ApiOperation(value = "静态知识检索(分页返回)[zhaops]",
     @ApiOperation(value = "静态知识检索(分页返回)[zhaops]",
-            notes = "types: 类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表 <br>" +
+            notes = "types: 类型(多选):0-全部、1-诊断、2-药品、3-检验、5-检查、6-手术和操作、8-量表、9-护理  <br>" +
                     "inputStr: 检索内容<br>")
                     "inputStr: 检索内容<br>")
     @PostMapping("/staticIndexPage")
     @PostMapping("/staticIndexPage")
     @SysLogger("staticIndexPage")
     @SysLogger("staticIndexPage")
@@ -85,7 +85,7 @@ public class KlConceptStaticController {
     @ApiOperation(value = "保存静态知识-新增或修改[zhaops]",
     @ApiOperation(value = "保存静态知识-新增或修改[zhaops]",
             notes = "id: id <br>" +
             notes = "id: id <br>" +
                     "name: 术语名称 <br>" +
                     "name: 术语名称 <br>" +
-                    "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表 <br>" +
+                    "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理  <br>" +
                     "clinicalPathwayName: 临床路径名称<br>" +
                     "clinicalPathwayName: 临床路径名称<br>" +
                     "noticeName: 注意事项名称<br>" +
                     "noticeName: 注意事项名称<br>" +
                     "details: 明细<br>")
                     "details: 明细<br>")
@@ -119,7 +119,7 @@ public class KlConceptStaticController {
 
 
     @ApiOperation(value = "静态知识是否存在[zhaops]",
     @ApiOperation(value = "静态知识是否存在[zhaops]",
             notes = "name: 术语名称 <br>" +
             notes = "name: 术语名称 <br>" +
-                    "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表 <br>")
+                    "type: 类型:1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理  <br>")
     @PostMapping("/isExist")
     @PostMapping("/isExist")
     @SysLogger("isExist")
     @SysLogger("isExist")
     public RespDTO<Boolean> isExist(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {
     public RespDTO<Boolean> isExist(@Valid @RequestBody KlConceptStaticVO klConceptStaticVO) {

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

@@ -39,7 +39,7 @@ public class RetrievalController {
 
 
 
 
     @ApiOperation(value = "术语检索[zhaops]",
     @ApiOperation(value = "术语检索[zhaops]",
-            notes = "type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表 <br>" +
+            notes = "type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理 <br>" +
                     "inputStr: 检索内容<br>" +
                     "inputStr: 检索内容<br>" +
                     "sex: 性别:1-男、2-女、3-通用 <br>" +
                     "sex: 性别:1-男、2-女、3-通用 <br>" +
                     "age: 年龄<br>")
                     "age: 年龄<br>")
@@ -59,7 +59,7 @@ public class RetrievalController {
     }
     }
 
 
     @ApiOperation(value = "术语批量查询[zhaops]",
     @ApiOperation(value = "术语批量查询[zhaops]",
-            notes = "type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表 <br>" +
+            notes = "type: 类型:1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、10-量表、11-护理<br>" +
                     "names: 术语列表<br>")
                     "names: 术语列表<br>")
     @PostMapping("/getConceptNames")
     @PostMapping("/getConceptNames")
     public RespDTO<List<String>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO) {
     public RespDTO<List<String>> getConceptNames(@Valid @RequestBody ConceptVO conceptVO) {