Merge remote-tracking branch 'origin/master'

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

@@ -27,9 +27,11 @@ public class GraphCalculate {
         inputList.addAll(ss);
         Neo4jAPI neo4jAPI = new Neo4jAPI(DriverManager.newDrive());
         //处理化验数据
-        JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(searchData.getLisArr()));
-        List<String> lisResult = neo4jAPI.AnalysisLISResult(jsonArray);
-        inputList.addAll(lisResult);
+        if(searchData.getLisArr().size()!=0){
+            JSONArray jsonArray = JSONArray.parseArray(JSON.toJSONString(searchData.getLisArr()));
+            List<String> lisResult = neo4jAPI.AnalysisLISResult(jsonArray);
+            inputList.addAll(lisResult);
+        }
         //计算诊断
         Map<String, String> condition = neo4jAPI.getCondition((String[]) inputList.toArray(new String[inputList.size()]));
         List<FeatureRate> featureRates = new ArrayList<>();