推送

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

@@ -2,6 +2,7 @@ package com.diagbot.dto;
 
 import lombok.Data;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -25,7 +26,7 @@ public class NeoPushDTO {
      *     operation:[  ]
      *     drug:[  ]
      */
-    private Map<String,List<PushBaseDTO>> treat;//治疗
+    private Map<String,List<PushBaseDTO>> treat = new HashMap<>();//治疗
     private List<PushBaseDTO> diagnosticBasis;//诊断依据
 
 

src/main/java/com/diagbot/enums/MedicalAdviceEnum.java

@@ -11,8 +11,9 @@ import lombok.Setter;
 
 public enum MedicalAdviceEnum implements KeyedNamed {
 
-    drug(1, "药品"),
-    operation(2, "手术");
+    drug(1, "药物"),
+    operation(2, "手术"),
+    handle(3, "操作");
 
     @Setter
     private int key;

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

@@ -52,6 +52,21 @@ public class PushFacade {
         NeoPushVO pushVO = commonFacade.generatePushInput(wordCrfDTO);
         //图谱推送数据
         List<NeoPushDTO> push = neoFacade.getPush(pushVO);
+        NeoPushDTO neoPushDTO1 = new NeoPushDTO();
+        PushBaseDTO disease = new PushBaseDTO();
+        disease.setName("急性胰腺炎");
+        neoPushDTO1.setDisease(disease);
+        List<PushBaseDTO> vitals = new ArrayList<>();
+        PushBaseDTO vital1 = new PushBaseDTO();
+        vital1.setName("心率快");
+        vitals.add(vital1);
+        PushBaseDTO vital2 = new PushBaseDTO();
+        vital2.setName("淋巴肿大");
+        vitals.add(vital2);
+        neoPushDTO1.setVitals(vitals);
+        push.add(neoPushDTO1);
+
+
         int length = pushVo.getLength();
         if(ListUtil.isNotEmpty(push)){
             NeoPushDTO neoPushDTO = push.get(0);
@@ -87,7 +102,7 @@ public class PushFacade {
                     pushDTO.setMedicines(pushOperationBaseDTOS.subList(0, pushOperationBaseDTOS.size() >= length ? length : pushOperationBaseDTOS.size()));
                 }
             }
-            Map<String, List<PushBaseDTO>> dis = pushDTO.getDis();
+            Map<String, List<PushBaseDTO>> dis = new HashMap<>();
             //推送诊断
             if (ruleTypeList.contains("7")) {
                 List<PushBaseDTO> fiterDiseases = push.stream().map(x -> x.getDisease()).filter(y -> !typeWords.get(StandConvertEnum.disease.getName()).contains(y.getName())).collect(Collectors.toList());
@@ -110,6 +125,7 @@ public class PushFacade {
                 }).collect(Collectors.toList());
                 dis.put(DiseaseTypeEnum.identify.getName(),filterDifferentDis);
             }
+            pushDTO.setDis(dis);
 
         }