Merge remote-tracking branch 'origin/master' into push-test

# Conflicts:
#	common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java
#	graph-web/src/main/resources/url.properties
#	graph/src/main/resources/bolt.properties
#	graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java
#	graphdb/src/main/resources/application.yml

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

@@ -1811,6 +1811,9 @@ public class Neo4jAPI {
                 if (value != null && value.size() > 0) {
                     for (CrisisDetail crisisDetail : value) {
                         String[] crisisSplits = crisisDetail.getRemindText().split(":");
+                        if (crisisSplits.length == 1){
+                            continue;
+                        }
                         if(managerMap.containsKey(crisisSplits[0])){
                             List<String> manList = managerMap.get(crisisSplits[0]);
                             if(manList.indexOf(crisisSplits[1])<0){
@@ -1843,6 +1846,9 @@ public class Neo4jAPI {
                 if(value!=null && value.size()>0){
                     for (CrisisDetail crisisDetail:value) {
                         String[] crisisSplits = crisisDetail.getRemindText().split(":");
+                        if (crisisSplits.length == 1){
+                            continue;
+                        }
                         if(crisisMap.containsKey(crisisSplits[0])){
                             if("轻度".equals(crisisMap.get(crisisSplits[0])) && ("重度".equals(crisisSplits[1])||"中度".equals(crisisSplits[1]) )){
                                 crisisMap.put(crisisSplits[0],crisisSplits[1]);

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -12,6 +12,7 @@ import org.diagbot.common.push.bean.neo4j.*;
 import org.diagbot.common.push.cache.CacheUtil;
 import org.diagbot.common.push.filter.ClassifyDiag;
 import org.diagbot.common.push.filter.rule.PretreatmentRule;
+import org.diagbot.common.push.util.ListUtil;
 import org.diagbot.common.push.util.PushConstants;
 import org.diagbot.common.push.work.ParamsDataProxy;
 import org.diagbot.graphWeb.work.GraphCalculate;
@@ -36,6 +37,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @ClassName org.diagbot.push.controller.AlgorithmController
@@ -141,6 +143,14 @@ public class AlgorithmController extends BaseController {
         //数据预处理
         PretreatmentRule pretreatmentRule = new PretreatmentRule();
         pretreatmentRule.rule(searchData);
+
+        if(ListUtil.isNotEmpty(searchData.getPacs())){
+            List<String> collect = searchData.getPacs().stream().map(x -> x.getResult()).collect(Collectors.toList());
+            String join = String.join(",", collect);
+            searchData.setPacsString(join);
+        }
+
+
         //危机值
         CrisisApplication crisisApplication = new CrisisApplication();
         Map<String, List<CrisisDetail>> crisisDetailMap = crisisApplication.crisisContent(searchData);