Merge branch 'master' of http://223.93.170.82:10080/louhr/push into his/shaoyifu

# Conflicts:
#	algorithm/src/main/resources/algorithm.properties
#	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
#	push-web/src/main/resources/static/dist/js/push.js

bigdata-web/src/main/java/org/diagbot/bigdata/work/AlgorithmCore.java

@@ -53,6 +53,9 @@ public class AlgorithmCore {
             switch (searchData.getAlgorithmType() == null ? 1 : searchData.getAlgorithmType()) {
                 case 1: //机器学习算法推理
                     executor = AlgorithmFactory.getInstance(classifies[i]);
+                    if (FeatureType.parse(featureTypes[i]) == FeatureType.DIAG) {
+                        bigDataSearchData.setLength(6);//模型推送最多6个比较合理
+                    }
                     break;
                 case 2: //朴素贝叶斯算法推理
                     if (FeatureType.parse(featureTypes[i]) == FeatureType.DIAG) {

common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java

@@ -448,10 +448,10 @@ public class CacheFileManager {
             fw.close();
 
             //化验辅检体征性别年龄
-            sql = "SELECT k1.lib_name, k1.lib_type, kcc.sex_type, kcc.min_age, kcc.max_age " +
-                    "FROM kl_concept_common kcc, kl_concept k1 " +
-                    "where kcc.concept_id = k1.id " +
-                    "and k1.lib_type in (1, 18,12,16,33,35)";
+            sql = "SELECT k1.lib_name, k1.lib_type, IFNULL(kcc.sex_type,3) sex_type, IFNULL(kcc.min_age, 0) min_age, IFNULL(kcc.max_age,200)  max_age\n" +
+                    "from kl_concept k1 LEFT JOIN kl_concept_common kcc on kcc.concept_id = k1.id \n" +
+                    "where  k1.lib_type in (1, 18,12,16,33,35)\n" +
+                    "AND k1.is_deleted = 'N'\n";
             st = conn.createStatement();
             rs = st.executeQuery(sql);
             fw = new FileWriter(path + "bigdata_lpv_sex_age_filter.dict");//化验辅检体征相关文件

common-push/src/main/java/org/diagbot/common/push/work/ParamsDataProxy.java

@@ -128,16 +128,16 @@ public class ParamsDataProxy {
             featuresList = fa.start(searchData.getDiag(), FeatureType.DIAG);
             paramFeatureInit(searchData, featuresList);
         }
-        if (!StringUtils.isEmpty(searchData.getPacs())) {
-            //关系抽取模型
-            AlgorithmCNNExecutorPacs algorithmCNNExecutor = RelationExtractionFactory.getInstance();
-            RelationExtractionUtil re = new RelationExtractionUtil();
-            //Pacs原始分词结果
-            List<List<String>> execute = algorithmCNNExecutor.execute(searchData.getPacs(), re.createTriad(searchData));
-            if (execute != null && execute.size() > 0) {
-                re.addToSearchDataInputs(execute, searchData);
-            }
-        }
+//        if (!StringUtils.isEmpty(searchData.getPacs())) {
+//            //关系抽取模型
+//            AlgorithmCNNExecutorPacs algorithmCNNExecutor = RelationExtractionFactory.getInstance();
+//            RelationExtractionUtil re = new RelationExtractionUtil();
+//            //Pacs原始分词结果
+//            List<List<String>> execute = algorithmCNNExecutor.execute(searchData.getPacs(), re.createTriad(searchData));
+//            if (execute != null && execute.size() > 0) {
+//                re.addToSearchDataInputs(execute, searchData);
+//            }
+//        }
         //模型需要病历文本信息传入
         Map<String, String> map = new HashMap<>();
         map.put("sentence", searchData.getSymptom());

graph/src/main/resources/bolt.properties

@@ -1,7 +1,7 @@
 #235Mysql\u6570\u636E\u5E93
-url_235 = jdbc:mysql://127.0.0.1:3306/scale?useUnicode=true&characterEncoding=UTF-8
+url_235 = jdbc:mysql://1.1.1.1:3306/scale?useUnicode=true&characterEncoding=UTF-8
 userNmae_235 = root
-pass_235 = langtong
+pass_235 = diagbot@20180822
 
 # neo4j bolt credentials
 #\u7EBF\u4E0A\u4F7F\u7528
@@ -11,7 +11,7 @@ bolt.passwd=root
 
 
 #\u6D4B\u8BD5\u4F7F\u7528
-bolt112.uri=bolt://127.0.0.1
+bolt112.uri=bolt://192.168.3.112
 bolt112.user=neo4j
 bolt112.passwd=123456
 

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

@@ -53,9 +53,9 @@ public class    KnowledgeServiceImpl implements KnowledgeService {
     @Autowired
     private BiRepository biRepository;
     private List<BaseNode> baseNodes;
-    private String user = "teamdata";
-    private String password = "jiO2rfnYhg";
-    private String url = "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    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 Pageable pageable;
     /**
      * 处理症状节点相关的申请

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=D:/work/bigdata/diagbot-push/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)
-push.feature.num=10
-#是否过滤(0.不过滤 1.过滤)
+#\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
+#\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

@@ -150,7 +150,7 @@ public class AlgorithmController extends BaseController {
         responseData.setCrisisDetails(crisisApplication.crisisContent(searchData));
 
         //大数据推送
-        searchData.setLength(6);    //模型推送最多6个比较合理
+//        searchData.setLength(6);    //模型推送最多6个比较合理
         AlgorithmCore core = new AlgorithmCore();
         ResponseData bigDataResponseData = core.algorithm(request, searchData, responseData);