Browse Source

指标整合

kongwz 5 years ago
parent
commit
dae24287d5

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

@@ -8,6 +8,8 @@ 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() {
@@ -31,4 +33,20 @@ public class MedicalIndication {
     public void setDetails(List<MedicalIndicationDetail> details) {
         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;
+    }
 }

+ 1 - 0
graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -1604,6 +1604,7 @@ 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;

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

@@ -194,8 +194,9 @@ public class PreProcess {
                 for (Rule rule : rules) {
                     if (rule.getMin_operator().equals("=") && otherval.contains(rule.getMin_value())) {
                         MedicalIndication medind = new MedicalIndication();
+                        medind.setSource(2);
                         medind.setName(rule.getRemind());
-                        medind.setRule(detailname + ": " + otherval);
+                        medind.setDescription(detailname + ": " + otherval);
                         reminder.add(medind);
 
                         System.out.println(medind.getRule() + " -> " + medind.getName());
@@ -235,8 +236,9 @@ public class PreProcess {
 
                     if (minmatch && maxmatch) {
                         MedicalIndication medind = new MedicalIndication();
+                        medind.setSource(2);
                         medind.setName(rule.getRemind());
-                        medind.setRule(detailname + ": " + numval + " " + unit);
+                        medind.setDescription(detailname + ": " + numval + " " + unit);
                         reminder.add(medind);
 
                         System.out.println(medind.getRule() + " -> " + medind.getName());