Merge remote-tracking branch 'origin/push-dev' into push-grade-rule

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

@@ -160,9 +160,8 @@ public class GraphCalculate {
             Set<String> newindSet1 = new HashSet<>();
             //查找指标
             Set<String> indSet = neo4jAPI.getInd((String[]) inputList.toArray(new String[inputList.size()]));
-            if(indSet.contains("肾功能不全")){
-                for (String ind:indSet
-                     ) {
+            if(indSet != null && indSet.size()>0){
+                for (String ind:indSet) {
                     if("肾功能不全".equals(ind)){
                         newindSet.add(ind);
                     }else {
@@ -170,6 +169,8 @@ public class GraphCalculate {
                     }
                 }
             }
+
+
             Map<String, String> indLiang =null;
             if(newindSet1 != null && newindSet1.size()>0){
                 indLiang =neo4jAPI.getIndLiang(newindSet1);