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

# Conflicts:
#	common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java
#	push-web/src/main/resources/static/dist/js/push.js

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

@@ -23,7 +23,7 @@ import org.neo4j.driver.v1.Driver;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class GraphCalculate {
+public class GraphCalculate implements AutoCloseable{
     Logger logger = LoggerFactory.getLogger(GraphCalculate.class);
     private static Driver driver;
     static {
@@ -36,6 +36,12 @@ public class GraphCalculate {
     private static Neo4jAPI neo4jAPI ;
     private static Map<String,List<String>> mergeMap;
 
+
+    @Override
+    public void close() throws Exception {
+        driver.close();
+    }
+
     /**
      * 返回诊断和治疗
      *
@@ -95,6 +101,7 @@ public class GraphCalculate {
         Map<String, Map<String, String>> excludelist = null;
         starttime = System.currentTimeMillis();
         if(featureTypeList.contains(Constants.feature_type_diag)){
+            // 暂停图谱查询服务
             condition = neo4jAPI.getNewCondition((String[]) inputList.toArray(new String[inputList.size()]),webDiag );
             System.out.println("推送诊断消耗："+(System.currentTimeMillis()-starttime)+"s");
             // 查找需要排除的诊断
@@ -116,9 +123,10 @@ public class GraphCalculate {
             responseData.setTreat(treat);
         }
         //管理评估(慢病才有)
-        if (featureTypeList.contains("11") && diseaseType == 1 && diseaseType != null) {
+        if (featureTypeList.contains("11") && diseaseType != null && diseaseType == 1) {
             logger.info("featureTypeList 包含11,走管理评估!!!");
             starttime = System.currentTimeMillis();
+            // 暂停图谱查询服务
             if(webDiag != null){
 //                MangementEvaluation mangementEvaluation = neo4jAPI.pushMe(webDiagList,lis_Result);
                 MangementEvaluation mangementEvaluation_new = neo4jAPI.pushMe_new(diseaseName,crisisDetails);
@@ -134,6 +142,8 @@ public class GraphCalculate {
             Set<String> newindSet = new HashSet<>();
             Set<String> newindSet1 = new HashSet<>();
             //查找指标
+            // 暂停图谱查询服务
+//            Set<String> indSet = new HashSet<>();
             Set<String> indSet = neo4jAPI.getInd((String[]) inputList.toArray(new String[inputList.size()]),sex,age,webDiagList);
             if(indSet != null && indSet.size()>0){
                 for (String ind:indSet) {
@@ -145,12 +155,14 @@ public class GraphCalculate {
                 }
             }
             Map<String, String> indLiang =null;
+            // 暂停图谱查询服务
             if(newindSet1 != null && newindSet1.size()>0){
                 indLiang =neo4jAPI.getIndLiang(newindSet1);
 
             }
             logger.info("featureTypeList 包含22,走指标推送!!!,图谱推出的指标为:" + indSet);
             List<MedicalIndication> idn =null;
+            // 暂停图谱查询服务
             if(newindSet.contains("肾功能不全")){
                 idn = neo4jAPI.getIdn(newindSet, age, sex,serumCreatinine);
                 if(idn!= null && idn.size()>0){
@@ -321,7 +333,9 @@ public class GraphCalculate {
      */
     public Map<String, List<FeatureRate>> getLisPacs(HttpServletRequest request, SearchData searchData) {
 
-        Map<String, List<FeatureRate>> lisPacs = neo4jAPI.getLisPacs(searchData);
+        Map<String, List<FeatureRate>> lisPacs = new HashMap<>();
+        // 暂停图谱查询服务
+        lisPacs = neo4jAPI.getLisPacs(searchData);
         return lisPacs;
     }
     /**
@@ -381,5 +395,8 @@ public class GraphCalculate {
 
         return exculdDiagFilds;
     }
+
+
+
 }
 

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

@@ -1,5 +1,5 @@
-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
+highrisk.http.url=http://192.168.2.241:5004/knowledge/getHighRisk
+lisPacs.http.url=http://192.168.2.241:5004/knowledge/getLisPacs
+disease.http.url=http://192.168.2.241: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/resources/bolt.properties

@@ -5,7 +5,7 @@ pass_235 = diagbot@20180822
 
 # neo4j bolt credentials
 #\u7EBF\u4E0A\u4F7F\u7528
-bolt.uri=bolt://192.168.2.123
+bolt.uri=bolt://192.168.2.232
 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.122:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String url = "jdbc:mysql://192.168.2.241: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.123:7687
+      uri: bolt://192.168.2.232:7687
       username: neo4j
       password: root
 
 # 驱动配置信息
   datasource:
     driver-class-name: org.neo4j.jdbc.Driver
-    url: jdbc:neo4j:http://192.168.2.123:7474
+    url: jdbc:neo4j:http://192.168.2.232:7474
     username: neo4j
     password: root
     #定义初始连接数

nlp/src/main/resources/nlp.properties

@@ -1,10 +1,10 @@
-#数据文件存放路径
+#\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u013C\uFFFD\uFFFD\uFFFD\uFFFD\u00B7\uFFFD\uFFFD
 cache.file.dir=/opt/diagbot-push/cache_file/
 #cache.file.dir=e:\\cache_file\\
 
-#抽取时——特征提取范围(不限制范围时配置:all)
+#\uFFFD\uFFFD\u0221\u02B1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0221\uFFFD\uFFFD\u03A7(\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01B7\uFFFD\u03A7\u02B1\uFFFD\uFFFD\uFFFD\uFFFD:all)
 extract.feature.num=all
-#推送时——特征提取范围(不限制范围时配置:all)
+#\uFFFD\uFFFD\uFFFD\uFFFD\u02B1\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u0221\uFFFD\uFFFD\u03A7(\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u01B7\uFFFD\u03A7\u02B1\uFFFD\uFFFD\uFFFD\uFFFD:all)
 push.feature.num=all
-#是否过滤(0.不过滤 1.过滤)
+#\uFFFD\u01F7\uFFFD\uFFFD\uFFFD\uFFFD(0.\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD 1.\uFFFD\uFFFD\uFFFD\uFFFD)
 extract.feature.filter=0

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
@@ -140,7 +142,15 @@ public class AlgorithmController extends BaseController {
         paramsDataProxy.createNormalInfo(searchData);
         //数据预处理
         PretreatmentRule pretreatmentRule = new PretreatmentRule();
-//        pretreatmentRule.rule(searchData);
+        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);

push-web/src/main/resources/static/dist/js/push.js

@@ -1,6 +1,6 @@
-var nlp_web_url = "http://192.168.2.234:5002/nlp-web";
-var bigdata_web_url = "http://192.168.2.234:5001/bigdata-web";
-var graph_web_url = "http://192.168.2.234:5003/graph-web";
+var nlp_web_url = "http://192.168.2.241:5002/nlp-web";
+var bigdata_web_url = "http://192.168.2.241:5001/bigdata-web";
+var graph_web_url = "http://192.168.2.241:5003/graph-web";
 // var push_web_url = "http://192.168.2.234:5008/push-web";
 
 // var nlp_web_url = "http://192.168.3.180:5002/nlp-web";