判断diagOrder不为null

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

@@ -72,13 +72,16 @@ public class GraphCalculate {
         }
         logger.info("图谱开始推送诊断!!!!!!!!!!!");
         String webDiag = "";
-        for (PreResult preResult : searchData.getDiagOrder()) {
-            if (StringUtils.isEmpty(webDiag)) {
-                webDiag = preResult.getValue();
-            } else {
-                webDiag = webDiag + "," + preResult.getValue();
+        if(searchData.getDiagOrder() !=null){
+            for (PreResult preResult : searchData.getDiagOrder()) {
+                if (StringUtils.isEmpty(webDiag)) {
+                    webDiag = preResult.getValue();
+                } else {
+                    webDiag = webDiag + "," + preResult.getValue();
+                }
             }
         }
+
         logger.info("页面诊断为 :"+webDiag);
         String[] webDiagList = webDiag.split(",|，|、|;|:|；");
         //处理血肌酐

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

@@ -2068,13 +2068,16 @@ public class Neo4jAPI {
         Map<String, List<FeatureRate>> lisPacsFeature = new HashMap<>();
         List<String> featureList = Arrays.asList(searchData.getFeatureTypes());
         String webDiag = "";
-        for (PreResult preResult : searchData.getDiagOrder()) {
-            if (StringUtils.isEmpty(webDiag)) {
-                webDiag = preResult.getValue();
-            } else {
-                webDiag = webDiag + "," + preResult.getValue();
+        if(searchData.getDiagOrder() != null){
+            for (PreResult preResult : searchData.getDiagOrder()) {
+                if (StringUtils.isEmpty(webDiag)) {
+                    webDiag = preResult.getValue();
+                } else {
+                    webDiag = webDiag + "," + preResult.getValue();
+                }
             }
         }
+
         List<String> webDiagList = null;
         if (webDiag != null && webDiag != "") {
             webDiagList = Arrays.asList(webDiag.split(",|，|、"));