添加复检时,不良反应的处理

common-service/src/main/java/org/diagbot/common/work/Filnlly.java

@@ -1,10 +1,20 @@
 package org.diagbot.common.work;
 
 import java.util.ArrayList;
+import java.util.Map;
 
 public class Filnlly {
+    private Map<String,Map<String,Integer>> adverseEvent;
     private ArrayList<Drugs> treatment;
 
+    public Map<String, Map<String, Integer>> getAdverseEvent() {
+        return adverseEvent;
+    }
+
+    public void setAdverseEvent(Map<String, Map<String, Integer>> adverseEvent) {
+        this.adverseEvent = adverseEvent;
+    }
+
     public ArrayList<Drugs> getTreatment() {
         return treatment;
     }
@@ -12,4 +22,5 @@ public class Filnlly {
     public void setTreatment(ArrayList<Drugs> treatment) {
         this.treatment = treatment;
     }
+
 }

common-service/src/main/java/org/diagbot/common/work/FuzhenFilnlly.java

@@ -0,0 +1,25 @@
+package org.diagbot.common.work;
+
+import java.util.ArrayList;
+import java.util.Map;
+
+public class FuzhenFilnlly {
+    private Map<String,Map<String,Integer>> adverseEvent;
+    private ArrayList<Drugs> treatment;
+
+    public ArrayList<Drugs> getTreatment() {
+        return treatment;
+    }
+
+    public void setTreatment(ArrayList<Drugs> treatment) {
+        this.treatment = treatment;
+    }
+
+    public Map<String, Map<String, Integer>> getAdverseEvent() {
+        return adverseEvent;
+    }
+
+    public void setAdverseEvent(Map<String, Map<String, Integer>> adverseEvent) {
+        this.adverseEvent = adverseEvent;
+    }
+}

common-service/src/main/java/org/diagbot/common/work/SearchData.java

@@ -15,6 +15,8 @@ public class SearchData {
     protected String threshold = "0";
     //特征类别
     protected String featureType;
+    //诊断类别
+    protected String diseaseType; //0:复诊,1:急诊
     //特征类别对","进行分割后数据
     protected String[] featureTypes;
     //门诊 住院分类
@@ -39,6 +41,14 @@ public class SearchData {
     //阴性 页面录入数据需要对结果过滤的集合
     private Map<String, Map<String, String>> filters = new HashMap<>(10, 0.8f);
 
+    public String getDiseaseType() {
+        return diseaseType;
+    }
+
+    public void setDiseaseType(String diseaseType) {
+        this.diseaseType = diseaseType;
+    }
+
     public List<LisDetail> getLisArr() {
         return lisArr;
     }

graph-web/src/main/java/org/diagbot/graphWeb/work/GraphCalculate.java

@@ -15,6 +15,13 @@ import java.util.*;
 import org.diagbot.graphWeb.util.MapValueComparator;
 
 public class GraphCalculate {
+    /**
+     * 返回诊断和治疗
+     * @param request
+     * @param searchData
+     * @return
+     * @throws Exception
+     */
     public ResponseData calculate(HttpServletRequest request, SearchData searchData) throws Exception {
         ResponseData responseData = new ResponseData();
         ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
@@ -59,10 +66,13 @@ public class GraphCalculate {
         String webDiag = searchData.getDiag();
         //走治疗
         if(webDiag.trim()!=null && Arrays.asList(searchData.getFeatureTypes()).contains("8")){
+            //走平常诊断治疗
             Map<String, Filnlly> mulDiseaseTreat = neo4jAPI.getMulDiseaseTreat_2(webDiag, String.join(",", inputList));
             responseData.setTreat(mulDiseaseTreat);
         }
+        if("0".equals(searchData.getDiseaseType())){    //走复诊
 
+        }
         responseData.setGraphWords(graphWordfeatureRates);
         responseData.setDis(featureRates);