zhoutg 4 years ago
parent
commit
b25e7f988a

+ 8 - 6
src/main/java/com/diagbot/dto/PushDTO.java

@@ -16,13 +16,13 @@ import java.util.Map;
 @Getter
 @Getter
 @Setter
 @Setter
 public class PushDTO {
 public class PushDTO {
-    //症状
+    // 症状
     private List<PushBaseDTO> symptom = Lists.newArrayList();
     private List<PushBaseDTO> symptom = Lists.newArrayList();
-    //体格检查
+    // 体格检查
     private List<PushBaseDTO> vital = Lists.newArrayList();
     private List<PushBaseDTO> vital = Lists.newArrayList();
-    //检验
+    // 检验
     private List<PushBaseDTO> lis = Lists.newArrayList();
     private List<PushBaseDTO> lis = Lists.newArrayList();
-    //检查
+    // 检查
     private List<PushBaseDTO> pacs = Lists.newArrayList();
     private List<PushBaseDTO> pacs = Lists.newArrayList();
     // 手术
     // 手术
     private List<PushBaseDTO> operations = Lists.newArrayList();
     private List<PushBaseDTO> operations = Lists.newArrayList();
@@ -32,9 +32,11 @@ public class PushDTO {
     private List<PushBaseDTO> complications = Lists.newArrayList();
     private List<PushBaseDTO> complications = Lists.newArrayList();
     // 量表
     // 量表
     private List<PushBaseDTO> scale = Lists.newArrayList();
     private List<PushBaseDTO> scale = Lists.newArrayList();
-    //诊断
+    // 护理
+    private List<PushBaseDTO> nurse = Lists.newArrayList();
+    // 诊断
     private Map<String, List<PushBaseDTO>> dis = new LinkedHashMap<>();
     private Map<String, List<PushBaseDTO>> dis = new LinkedHashMap<>();
-    //一般治疗
+    // 一般治疗
     private List<TreatDTO> treat = Lists.newArrayList();
     private List<TreatDTO> treat = Lists.newArrayList();
 
 
     // 记录调试信息
     // 记录调试信息

+ 1 - 0
src/main/java/com/diagbot/enums/RelationshipEnum.java

@@ -19,6 +19,7 @@ public enum RelationshipEnum implements KeyedNamed {
     R507(507,"疾病相关手术治疗"),
     R507(507,"疾病相关手术治疗"),
     R508(508,"疾病相关鉴别诊断"),
     R508(508,"疾病相关鉴别诊断"),
     R509(509,"疾病相关量表"),
     R509(509,"疾病相关量表"),
+    R510(510,"疾病相关护理"),
     R600(600,"相关子类");
     R600(600,"相关子类");
 
 
     @Setter
     @Setter

+ 17 - 5
src/main/java/com/diagbot/process/PushProcess.java

@@ -430,6 +430,9 @@ public class PushProcess {
             if (ruleTypeList.contains("9")) {
             if (ruleTypeList.contains("9")) {
                 relationType.add(RelationshipEnum.R507.getKey()); // 手术
                 relationType.add(RelationshipEnum.R507.getKey()); // 手术
             }
             }
+            if (ruleTypeList.contains("12")) {
+                relationType.add(RelationshipEnum.R510.getKey()); // 护理
+            }
             reverseVO.setRelationType(relationType);
             reverseVO.setRelationType(relationType);
             List<ReverseDTO> reverseDTOList1 = conceptInfoFacade.getReverseFac(reverseVO);
             List<ReverseDTO> reverseDTOList1 = conceptInfoFacade.getReverseFac(reverseVO);
             reverseDTOList.addAll(reverseDTOList1);
             reverseDTOList.addAll(reverseDTOList1);
@@ -740,6 +743,14 @@ public class PushProcess {
                 pushDTO.setScale(generatePushBaseDTO(list, length)); // 放入对象返回
                 pushDTO.setScale(generatePushBaseDTO(list, length)); // 放入对象返回
             }
             }
         }
         }
+        // 护理
+        if (ruleTypeList.contains("12")) {
+            if (map.get(LexiconEnum.Nurse.getKey()) != null) {
+                List<String> list = map.get(LexiconEnum.Nurse.getKey()).stream().map(r -> r.getSonName()).collect(Collectors.toList());
+                // CoreUtil.removeRepeat(list, filterMap.get(StandConvertEnum.operation.toString())); // 过滤界面已有
+                pushDTO.setNurse(generatePushBaseDTO(list, length)); // 放入对象返回
+            }
+        }
     }
     }
 
 
     /**
     /**
@@ -808,15 +819,16 @@ public class PushProcess {
             if (ruleTypeList.contains("7")) {
             if (ruleTypeList.contains("7")) {
                 relationType.add(RelationshipEnum.R508.getKey()); // 鉴别诊断
                 relationType.add(RelationshipEnum.R508.getKey()); // 鉴别诊断
             }
             }
-            if (ruleTypeList.contains("8")) {
-                if (flag) {
+            if (flag) {
+                if (ruleTypeList.contains("8")) {
                     relationType.add(RelationshipEnum.R506.getKey()); // 药品
                     relationType.add(RelationshipEnum.R506.getKey()); // 药品
                 }
                 }
-            }
-            if (ruleTypeList.contains("9")) {
-                if (flag) {
+                if (ruleTypeList.contains("9")) {
                     relationType.add(RelationshipEnum.R507.getKey()); // 手术
                     relationType.add(RelationshipEnum.R507.getKey()); // 手术
                 }
                 }
+                if (ruleTypeList.contains("12")) {
+                    relationType.add(RelationshipEnum.R510.getKey()); // 护理
+                }
             }
             }
             if (ruleTypeList.contains("11")) {
             if (ruleTypeList.contains("11")) {
                 relationType.add(RelationshipEnum.R509.getKey()); // 量表
                 relationType.add(RelationshipEnum.R509.getKey()); // 量表

+ 2 - 1
src/main/java/com/diagbot/web/CoreController.java

@@ -42,7 +42,8 @@ public class CoreController {
         return RespDTO.onSuc(indicationDTO);
         return RespDTO.onSuc(indicationDTO);
     }
     }
 
 
-    @ApiOperation(value = "推送API[zhoutg]", notes = "featureType 类型(多选必填),1:症状,4:查体结果,5:检验,6:检查,7:诊断,8:药品,9:手术,10:一般治疗, 11:量表")
+    @ApiOperation(value = "推送API[zhoutg]", notes = "featureType 类型(多选必填),1:症状,4:查体结果,5:检验,6:检查," +
+            "7:诊断,8:药品,9:手术,10:一般治疗, 11:量表,12:护理")
     @PostMapping("/push")
     @PostMapping("/push")
     public RespDTO<PushDTO> push(@RequestBody PushVO pushVo) {
     public RespDTO<PushDTO> push(@RequestBody PushVO pushVo) {
         PushDTO pushDTO = pushFacade.pushFac(pushVo);
         PushDTO pushDTO = pushFacade.pushFac(pushVo);