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

# 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/resources/application.yml

graph-web/src/main/resources/url.properties

@@ -1,5 +1,5 @@
-highrisk.http.url=http://192.168.2.234:5004/knowledge/getHighRisk
-lisPacs.http.url=http://192.168.2.234:5004/knowledge/getLisPacs
-disease.http.url=http://192.168.2.234:5004/knowledge/getDisease
+highrisk.http.url=http://192.168.2.123:5004/knowledge/getHighRisk
+lisPacs.http.url=http://192.168.2.123:5004/knowledge/getLisPacs
+disease.http.url=http://192.168.2.123:5004/knowledge/getDisease
 #lisPacs.http.url=http://192.168.3.9:5004/knowledge/getLisPacs
 #highrisk.http.url=http://192.168.3.9:5004/knowledge/getHighRisk

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]);

graph/src/main/resources/bolt.properties

@@ -5,7 +5,7 @@ pass_235 = diagbot@20180822
 
 # neo4j bolt credentials
 #\u7EBF\u4E0A\u4F7F\u7528
-bolt.uri=bolt://192.168.2.234
+bolt.uri=bolt://192.168.2.123
 bolt.user=neo4j
 bolt.passwd=root
 

graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -56,7 +56,7 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
     private List<BaseNode> baseNodes;
     private String user = "root";
     private String password = "lantone";
-    private String url = "jdbc:mysql://192.168.2.236:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String url = "jdbc:mysql://192.168.2.122:3306/med?useUnicode=true&characterEncoding=UTF-8";
     private Pageable pageable;
     /**
      * 处理症状节点相关的申请

graphdb/src/main/resources/application.yml

@@ -6,14 +6,14 @@ spring:
     active: local
   data:
     neo4j:
-      uri: bolt://192.168.2.234:7687
+      uri: bolt://192.168.2.123:7687
       username: neo4j
       password: root
 
 # 驱动配置信息
   datasource:
     driver-class-name: org.neo4j.jdbc.Driver
-    url: jdbc:neo4j:http://192.168.2.234:7474
+    url: jdbc:neo4j:http://192.168.2.123:7474
     username: neo4j
     password: root
     #定义初始连接数

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

@@ -140,7 +140,7 @@ public class AlgorithmController extends BaseController {
         paramsDataProxy.createNormalInfo(searchData);
         //数据预处理
         PretreatmentRule pretreatmentRule = new PretreatmentRule();
-        pretreatmentRule.rule(searchData);
+//        pretreatmentRule.rule(searchData);
         //危机值
         CrisisApplication crisisApplication = new CrisisApplication();
         Map<String, List<CrisisDetail>> crisisDetailMap = crisisApplication.crisisContent(searchData);