指标结果参与推送

bigdata-web/src/main/java/org/diagbot/bigdata/work/ParamsDataProxy.java

@@ -41,7 +41,7 @@ public class ParamsDataProxy {
         }
         //所有信息参与推送
         searchData.setSymptom(searchData.getSymptom() + searchData.getVital()
-                + searchData.getLis() + searchData.getPacs() + searchData.getPast() + searchData.getOther());
+                + searchData.getLis() + searchData.getPacs() + searchData.getPast() + searchData.getOther()+ searchData.getIndications());
         searchData.setSymptom(searchData.getSymptom().trim());
         //一次推送多个类别信息
         String[] featureTypes = searchData.getFeatureType().split(",");

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

@@ -37,6 +37,8 @@ public class SearchData {
     //量表
     protected String scaleName = "";
 
+    //指标结果
+    protected String indications="";
     //模型
     protected String algorithmClassifyValue;
     //推送条件
@@ -233,4 +235,12 @@ public class SearchData {
     public void setPushDiags(List<FeatureRate> pushDiags) {
         this.pushDiags = pushDiags;
     }
+
+    public String getIndications() {
+        return indications;
+    }
+
+    public void setIndications(String indications) {
+        this.indications = indications;
+    }
 }

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

@@ -30,7 +30,7 @@ public class ParamsDataProxy {
 //        }
         //所有信息参与推送
         searchData.setSymptom(searchData.getSymptom() + searchData.getVital()
-                + searchData.getLis() + searchData.getPacs() + searchData.getPast() + searchData.getOther());
+                + searchData.getLis() + searchData.getPacs() + searchData.getPast() + searchData.getOther() + searchData.getIndications());
         searchData.setSymptom(searchData.getSymptom().trim());
         //一次推送多个类别信息
         String[] featureTypes = searchData.getFeatureType().split(",");

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

@@ -1849,12 +1849,12 @@ public class Neo4jAPI {
         groupCalcResult.put("unit", "");
         groupCalcResult.put("text", "");
         groupCalcJson.put("result", groupCalcResult);
-        groupCalcJson.put("isShow", 0);
+        groupCalcJson.put("isShow", 1);
 
         threeLevelItems.put("scaleType", 1);
         threeLevelItems.put("scaleName", scaleName);
         threeLevelItems.put("group", new JSONArray());
-        threeLevelItems.put("noCalc",1);
+        threeLevelItems.put("noCalc",0);
 
         Map<String, Object> calculate = new HashMap<>();
         Map<String, List<Map<String, String>>> nameDetails = new HashMap<>();

graphdb/src/main/java/org/diagbot/vo/domain/SearchData.java

@@ -43,6 +43,9 @@ public class SearchData {
     //量表
     protected String scaleName = "";
 
+    //指标结果
+    protected String indications="";
+
     //模型
     protected String algorithmClassifyValue;
     //推送条件