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

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

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

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

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