量表和指标结构优化

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

@@ -313,18 +313,28 @@ public class GraphCalculate {
             shiFouJson.put("details", shiFouList);
             medicalIndicationDetail3.setContent(shiFouJson);
             medicalIndicationDetailList.add(medicalIndicationDetail1);
-            Map<String, Object> maps = scaleCalcMethod(medicalIndicationDetail2);
+            //Map<String, Object> maps = scaleCalcMethod(medicalIndicationDetail2);
             JSONObject resultJson = new JSONObject();
-            resultJson.put("value", maps.get("value"));
+            JSONArray resultList = new JSONArray();
+            JSONObject result = new JSONObject();
+            result.put("text", "");
+            result.put("name", "GFR值");
+            resultList.add(result);
+            result = new JSONObject();
+            result.put("text", "");
+            result.put("name", "评估结论");
+            resultList.add(result);
+            /*resultJson.put("value", maps.get("value"));
             resultJson.put("unit", maps.get("unit"));
             resultJson.put("text", maps.get("text"));
-            gongshiJson.put("result", resultJson);
+            gongshiJson.put("result", resultJson);*/
+            gongshiJson.put("result", resultList);
             medicalIndicationDetail2.setContent(gongshiJson);
             medicalIndicationDetailList.add(medicalIndicationDetail2);
             medicalIndicationDetailList.add(medicalIndicationDetail3);
             medicalIndication.setDetails(medicalIndicationDetailList);
-        }else {
-            medicalIndication =null;
+        } else {
+            medicalIndication = null;
         }
         return medicalIndication;
     }

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

@@ -1840,7 +1840,7 @@ public class Neo4jAPI {
         titles.add(title);
         JSONObject titleJson = new JSONObject();
         titleJson.put("columns", titles);
-        titleJson.put("isShow", 1);
+        titleJson.put("isShow", 0);
 
         //分组计算结果
         JSONObject groupCalcJson = new JSONObject();
@@ -1849,7 +1849,7 @@ public class Neo4jAPI {
         groupCalcResult.put("unit", "");
         groupCalcResult.put("text", "");
         groupCalcJson.put("result", groupCalcResult);
-        groupCalcJson.put("isShow", 1);
+        groupCalcJson.put("isShow", 0);
 
         threeLevelItems.put("scaleType", 1);
         threeLevelItems.put("scaleName", scaleName);
@@ -1918,6 +1918,9 @@ public class Neo4jAPI {
                 }
                 if (groupList.size() == 0 || existGroup == false) {
                     groupItem.put("groupName", name);
+                    if (name.equals("感觉损伤")) {
+                        titleJson.put("isShow", 0);
+                    }
                     groupItem.put("title", titleJson);
                     groupItem.put("groupCalculate", groupCalcJson);
                 }