推送诊断

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

@@ -5,7 +5,6 @@ import lombok.Setter;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @Description: 推理出参
@@ -30,5 +29,6 @@ public class PushDTO {
     // 并发症
     private List<PushBaseDTO> complications = new ArrayList<>();
     //诊断
-    private Map<String, List<PushBaseDTO>> dis;
+//    private Map<String, List<PushBaseDTO>> dis;
+    private List<PushBaseDTO> dis;
 }

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

@@ -50,10 +50,10 @@ public class PushFacade {
         NeoPushVO pushVO = commonFacade.generatePushInput(wordCrfDTO);
         //图谱推送数据
         List<NeoPushDTO> push = neoFacade.getPush(pushVO);
+        int length = pushVo.getLength();
         if(ListUtil.isNotEmpty(push)){
             NeoPushDTO neoPushDTO = push.get(0);
             if(neoPushDTO != null){
-                int length = pushVo.getLength();
                 // 症状
                 if (ruleTypeList.contains("1") && ListUtil.isNotEmpty(neoPushDTO.getSymptoms())) {
                     List<PushBaseDTO> filterSymptoms = neoPushDTO.getSymptoms().stream().filter(x -> !typeWords.get(StandConvertEnum.symptom.getName()).contains(x.getName())).collect(Collectors.toList());
@@ -75,6 +75,11 @@ public class PushFacade {
                     pushDTO.setPacs(filterpacs.subList(0, filterpacs.size() >= length ? length : filterpacs.size()));
                 }
             }
+            //推送诊断
+            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());
+                pushDTO.setDis(fiterDiseases.subList(0, fiterDiseases.size() >= length ? length : fiterDiseases.size()));
+            }
 
         }