Merge remote-tracking branch 'origin/push-dev-ruletype' into push-test

# Conflicts:
#	graph-web/src/main/java/org/diagbot/graphWeb/work/ScaleCalculate.java

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

@@ -72,7 +72,7 @@ public class GraphCalculate {
         }
         logger.info("图谱开始推送诊断!!!!!!!!!!!");
         String webDiag = "";
-        for (PreResult preResult : searchData.getDiag()) {
+        for (PreResult preResult : searchData.getDiagOrder()) {
             if (StringUtils.isEmpty(webDiag)) {
                 webDiag = preResult.getValue();
             } else {

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

@@ -215,18 +215,16 @@ public class ScaleCalculate {
                     }
                 }
                 double eGFR3 = 141 * Math.pow((scr / k), a) * Math.pow(0.993, age) * denger;
-                String unit = "ml/min•1.73m2";
-                String text = null;
-                if(eGFR3 > 0 && eGFR3 < 15) {
-                    text = "肾功能衰竭";
-                } else if (eGFR3 >= 15 && eGFR3 <= 29) {
-                    text = "重度下降";
+                String unit = "min•1.73㎡";
+                String text = "";
+                if (eGFR3 > 0 && eGFR3 <= 29) {
+                    text = "重度肾功能不全";
                 } else if (eGFR3 > 29 && eGFR3 < 60) {
-                    text = "中度下降";
+                    text = "中度肾功能不全";
                 } else if (eGFR3 >= 60 && eGFR3 <= 89) {
-                    text = "轻度下降";
+                    text = "轻度肾功能不全";
                 } else if (eGFR3 > 89) {
-                    text = "正常或肾损伤代偿期";
+                    text = "肾功能正常";
                 }
 
                 valueResult.put("name", "GFR值");

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

@@ -2074,7 +2074,7 @@ public class Neo4jAPI {
         Map<String, List<FeatureRate>> lisPacsFeature = new HashMap<>();
         List<String> featureList = Arrays.asList(searchData.getFeatureTypes());
         String webDiag = "";
-        for (PreResult preResult : searchData.getDiag()) {
+        for (PreResult preResult : searchData.getDiagOrder()) {
             if (StringUtils.isEmpty(webDiag)) {
                 webDiag = preResult.getValue();
             } else {