推送危急值，字段修改

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

@@ -8,8 +8,6 @@ import java.util.List;
 public class MedicalIndication {
     private String name;
     private String rule;
-    private String description; //规则解释
-    private Integer source;//1 诊断依据推理， 2 危急值推理
     private List<MedicalIndicationDetail> details;
 
     public String getName() {
@@ -34,19 +32,4 @@ public class MedicalIndication {
         this.details = details;
     }
 
-    public String getDescription() {
-        return description;
-    }
-
-    public void setDescription(String description) {
-        this.description = description;
-    }
-
-    public Integer getSource() {
-        return source;
-    }
-
-    public void setSource(Integer source) {
-        this.source = source;
-    }
 }

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

@@ -3,7 +3,7 @@ package org.diagbot.common.javabean;
 import com.alibaba.fastjson.JSONObject;
 
 public class MedicalIndicationDetail {
-    private Integer type;//1-量表,2-公式,3-其他指标
+    private Integer type;//1-量表,2-公式,3-其他指标,4-危急值
     private JSONObject content;
 
     public Integer getType() {

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

@@ -1604,7 +1604,6 @@ public class Neo4jAPI {
                 MedicalIndication medicalIndication = new MedicalIndication();
                 List<MedicalIndicationDetail> medicalIndicationDetailList = new ArrayList<>();
                 medicalIndication.setName(s);
-                medicalIndication.setSource(1);
                 MedicalIndicationDetail medicalIndicationDetail1 = null;
                 MedicalIndicationDetail medicalIndicationDetail2 = null;
                 MedicalIndicationDetail medicalIndicationDetail3 = null;

push-web/src/main/java/org/diagbot/push/convert/PreProcess.java

@@ -1,7 +1,9 @@
 package org.diagbot.push.convert;
 
+import com.alibaba.fastjson.JSONObject;
 import org.diagbot.bigdata.common.ApplicationCacheUtil;
 import org.diagbot.common.javabean.MedicalIndication;
+import org.diagbot.common.javabean.MedicalIndicationDetail;
 import org.diagbot.common.javabean.Rule;
 import org.diagbot.common.work.LisDetail;
 import org.diagbot.common.work.ResponseData;
@@ -194,9 +196,16 @@ public class PreProcess {
                 for (Rule rule : rules) {
                     if (rule.getMin_operator().equals("=") && otherval.contains(rule.getMin_value())) {
                         MedicalIndication medind = new MedicalIndication();
-                        medind.setSource(2);
+                        List<MedicalIndicationDetail> k = new ArrayList<>();
+                        MedicalIndicationDetail mid = new MedicalIndicationDetail();
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("name",detailname + ": " + otherval+ ", " +rule.getRemind());
+                        jsonObject.put("controlType",2);
+                        mid.setType(4);
+                        mid.setContent(jsonObject);
+                        k.add(mid);
                         medind.setName(rule.getRemind());
-                        medind.setDescription(detailname + ": " + otherval+ ", " +rule.getRemind() );
+                        medind.setDetails(k);
                         reminder.add(medind);
 
                         System.out.println(medind.getRule() + " -> " + medind.getName());
@@ -236,9 +245,16 @@ public class PreProcess {
 
                     if (minmatch && maxmatch) {
                         MedicalIndication medind = new MedicalIndication();
-                        medind.setSource(2);
+                        List<MedicalIndicationDetail> k = new ArrayList<>();
+                        MedicalIndicationDetail mid = new MedicalIndicationDetail();
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("name",detailname + ": " + numval + " " + unit+ "," +rule.getRemind());
+                        jsonObject.put("controlType",2);
+                        mid.setType(4);
+                        mid.setContent(jsonObject);
+                        k.add(mid);
                         medind.setName(rule.getRemind());
-                        medind.setDescription(detailname + ": " + numval + " " + unit+ "," +rule.getRemind());
+                        medind.setDetails(k);
                         reminder.add(medind);
 
                         System.out.println(medind.getRule() + " -> " + medind.getName());