添加复检时,不良反应的处理更新(把返回结果的MAP类型转换为对象)

common-service/src/main/java/org/diagbot/common/javabean/Detail.java

@@ -0,0 +1,25 @@
+package org.diagbot.common.javabean;
+
+/**
+ * 指标的详细信息
+ */
+public class Detail {
+    private String name;
+    private Integer value;//0-未选中，1-选中
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getValue() {
+        return value;
+    }
+
+    public void setValue(Integer value) {
+        this.value = value;
+    }
+}

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

@@ -1,4 +1,4 @@
-package org.diagbot.common.work;
+package org.diagbot.common.javabean;
 
 import java.util.LinkedList;
 

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

@@ -1,17 +1,19 @@
-package org.diagbot.common.work;
+package org.diagbot.common.javabean;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 public class Filnlly {
-    private Map<String,Map<String,Integer>> adverseEvent;
+    private List<Indicators> adverseEvent;
     private ArrayList<Drugs> treatment;
 
-    public Map<String, Map<String, Integer>> getAdverseEvent() {
+
+    public List<Indicators> getAdverseEvent() {
         return adverseEvent;
     }
 
-    public void setAdverseEvent(Map<String, Map<String, Integer>> adverseEvent) {
+    public void setAdverseEvent(List<Indicators> adverseEvent) {
         this.adverseEvent = adverseEvent;
     }
 

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

@@ -1,4 +1,4 @@
-package org.diagbot.common.work;
+package org.diagbot.common.javabean;
 
 import java.util.ArrayList;
 import java.util.Map;

common-service/src/main/java/org/diagbot/common/javabean/Indicators.java

@@ -0,0 +1,36 @@
+package org.diagbot.common.javabean;
+
+import java.util.List;
+
+/**
+ * 指标
+ */
+public class Indicators {
+    private String name;
+    private Integer controlType;//控件类型:1-单选,2-多选
+    private List<Detail> details;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Integer getControlType() {
+        return controlType;
+    }
+
+    public void setControlType(Integer controlType) {
+        this.controlType = controlType;
+    }
+
+    public List<Detail> getDetails() {
+        return details;
+    }
+
+    public void setDetails(List<Detail> details) {
+        this.details = details;
+    }
+}

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

@@ -1,4 +1,4 @@
-package org.diagbot.common.work;
+package org.diagbot.common.javabean;
 
 /**
  * 药

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

@@ -1,4 +1,6 @@
 package org.diagbot.common.work;
+import org.diagbot.common.javabean.Filnlly;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;

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

@@ -2,9 +2,8 @@ package org.diagbot.graphWeb.work;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
 import org.diagbot.common.work.FeatureRate;
-import org.diagbot.common.work.Filnlly;
+import org.diagbot.common.javabean.Filnlly;
 import org.diagbot.common.work.ResponseData;
 import org.diagbot.common.work.SearchData;
 import org.diagbot.graph.jdbc.DriverManager;

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

@@ -1,8 +1,5 @@
 package org.diagbot.graphWeb.work;
 
-import com.alibaba.fastjson.JSONObject;
-import org.diagbot.common.work.Filnlly;
-import org.diagbot.common.work.ResponseData;
 import org.diagbot.common.work.SearchData;
 import org.diagbot.graph.javabean.GdbResponse;
 import org.diagbot.graph.jdbc.DriverManager;

graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -4,8 +4,8 @@ import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
+import org.diagbot.common.javabean.*;
 import org.diagbot.common.work.*;
-import org.diagbot.graph.javabean.BackLisPacs;
 import org.diagbot.pub.utils.PropertiesUtil;
 import org.neo4j.driver.v1.*;
 import org.neo4j.driver.v1.types.Node;
@@ -1133,22 +1133,54 @@ public class Neo4jAPI {
                             drugsList.add(drugs);
                         }
 
-
                         Filnlly filnlly = new Filnlly();
-                        Map<String, Map<String, Integer>> fuzhen1 = new HashMap<>();
-                        Map<String, Integer> fildsMap1 = new HashMap<>();
-                        fildsMap1.put("无", 0);
-                        fildsMap1.put("偶尔", 0);
-                        fildsMap1.put("频", 0);
-                        fuzhen1.put("低血糖反应", fildsMap1);
-                        Map<String, Integer> fildsMap2 = new HashMap<>();
-                        fildsMap2.put("腹胀", 0);
-                        fildsMap2.put("厌食", 0);
-                        fildsMap2.put("嗳气", 0);
-                        fildsMap2.put("恶心", 0);
-                        fildsMap2.put("呕吐", 0);
-                        fuzhen1.put("胃肠道不良反应", fildsMap2);
-                        filnlly.setAdverseEvent(fuzhen1);
+                        List<Indicators> indicatorsList1 = new ArrayList<>();
+                        List<Detail> detailList1 = new ArrayList<>();
+                        Detail detail1 = new Detail();
+                        detail1.setName("无");
+                        detail1.setValue(0);
+                        Detail detail2 = new Detail();
+                        detail2.setName("偶尔");
+                        detail2.setValue(0);
+                        Detail detail3 = new Detail();
+                        detail3.setName("频");
+                        detail3.setValue(0);
+                        detailList1.add(detail1);
+                        detailList1.add(detail2);
+                        detailList1.add(detail3);
+                        Indicators indicators1 = new Indicators();
+                        indicators1.setName("低血糖反应");
+                        indicators1.setControlType(2);
+                        indicators1.setDetails(detailList1);
+                        indicatorsList1.add(indicators1);
+
+                        List<Detail> detailList2 = new ArrayList<>();
+                        Detail detail11 = new Detail();
+                        detail11.setName("腹胀");
+                        detail11.setValue(0);
+                        Detail detail12 = new Detail();
+                        detail12.setName("厌食");
+                        detail12.setValue(0);
+                        Detail detail13 = new Detail();
+                        detail13.setName("嗳气");
+                        detail13.setValue(0);
+                        Detail detail14 = new Detail();
+                        detail14.setName("恶心");
+                        detail14.setValue(0);
+                        Detail detail15 = new Detail();
+                        detail15.setName("呕吐");
+                        detail15.setValue(0);
+                        detailList2.add(detail11);
+                        detailList2.add(detail12);
+                        detailList2.add(detail13);
+                        detailList2.add(detail14);
+                        detailList2.add(detail15);
+                        Indicators indicators11 = new Indicators();
+                        indicators11.setName("胃肠道不良反应");
+                        indicators11.setControlType(2);
+                        indicators11.setDetails(detailList2);
+                        indicatorsList1.add(indicators11);
+                        filnlly.setAdverseEvent(indicatorsList1);
                         filnlly.setTreatment(drugsList);
                         diagTreat.put(diseaseName, filnlly);
 

graph/src/main/java/org/diagbot/graph/util/MysqlConnUtil.java

@@ -0,0 +1,32 @@
+package org.diagbot.graph.util;
+
+import org.diagbot.pub.utils.PropertiesUtil;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+
+/**
+ * mysql连接
+ * Created by DELL on 2018/11/28.
+ */
+public class MysqlConnUtil {
+    /**
+     * 获取mysql连接
+     * @return
+     */
+    public Connection getMysqlConnection(){
+        PropertiesUtil propertiesUtil = new PropertiesUtil("bolt.properties");
+        String url = propertiesUtil.getProperty("url_235");
+        String userNmae = propertiesUtil.getProperty("userNmae_235");
+        String pass = propertiesUtil.getProperty("pass_235");
+        Connection conn =null;
+        try {
+            Class.forName("com.mysql.jdbc.Driver");
+            conn = DriverManager.getConnection(url, userNmae, pass);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return conn;
+    }
+}

graph/src/main/resources/bolt.properties

@@ -1,3 +1,8 @@
+#235Mysql\u6570\u636E\u5E93
+url_235 = jdbc:mysql://192.168.2.235:3306/diagbot-med?useUnicode=true&characterEncoding=UTF-8
+userNmae_235 = root
+pass_235 = diagbot@20180822
+
 # neo4j bolt credentials
 #\u7EBF\u4E0A\u4F7F\u7528
 bolt.uri=bolt://192.168.2.233

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -1,6 +1,9 @@
 package org.diagbot.push.controller;
 
 import org.diagbot.bigdata.work.AlgorithmCore;
+import org.diagbot.common.javabean.Drugs;
+import org.diagbot.common.javabean.Filnlly;
+import org.diagbot.common.javabean.Medicition;
 import org.diagbot.common.work.*;
 import org.diagbot.graphWeb.work.GraphCalculate;
 import org.diagbot.pub.api.Response;
@@ -8,7 +11,6 @@ import org.diagbot.pub.utils.PropertiesUtil;
 import org.diagbot.pub.utils.http.HttpApi;
 import org.diagbot.pub.web.BaseController;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;