Merge remote-tracking branch 'origin/push-dev' into push-dev-edite

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 && !"2".equals(searchData.getSysCode())) {
+                        bigDataSearchData.setLength(6);//模型推送最多6个比较合理
+                    }
                     break;
                 case 2: //朴素贝叶斯算法推理
                     if (FeatureType.parse(featureTypes[i]) == FeatureType.DIAG) {

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

@@ -180,7 +180,7 @@ public class ResultDataProxy {
                 ResultMappingFilter filter = filterMap.get(featureRate.getFeatureName());
                 if (filter != null) {
                     if (filter.getSex() != null && !StringUtils.isEmpty(searchData.getSex())
-                            && !filter.getSex().equals(searchData.getSex())) {      //性别过滤
+                            && filter.getSex().equals(searchData.getSex()) || filter.getSex().equals("3")) {      //性别过滤
                         isFirst = true;
                     } else {
                         isFirst = false;

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

nlp/src/main/resources/nlp.properties

@@ -5,6 +5,6 @@ cache.file.dir=/opt/diagbot-push/cache_file/
 #抽取时——特征提取范围(不限制范围时配置:all)
 extract.feature.num=all
 #推送时——特征提取范围(不限制范围时配置:all)
-push.feature.num=10
+push.feature.num=all
 #是否过滤(0.不过滤 1.过滤)
 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);
 

push-web/src/main/resources/static/pages/algorithm/list.html

@@ -400,13 +400,13 @@
             $('#diag_list').html("");
             $('#before_combine_diag_list').html("");
             startDiag('/algorithm/page_neural', '#symptom_list', '1', resourceType, '111', '1');
-            startDiag('/algorithm/page_neural', '#vital_list', '3,2,7', resourceType, '131', '3');
+            startDiag('/algorithm/page_neural', '#vital_list', '3,2,7,42', resourceType, '131', '3');
             startDiag('/algorithm/page_neural', '#lis_list', '4,2,7', resourceType, '141', '4');
             startDiag('/algorithm/page_neural', '#pacs_list', '5,2,7', resourceType, '151', '5');
 
         } else {
             startDiag('/algorithm/page_neural', '#symptom_list', '1', resourceType, '11', '1');
-            startDiag('/algorithm/page_neural', '#vital_list', '3,2,7', resourceType, '31', '3');
+            startDiag('/algorithm/page_neural', '#vital_list', '3,2,7,42', resourceType, '31', '3');
             startDiag('/algorithm/page_neural', '#lis_list', '4,2,7', resourceType, '41', '4');
             startDiag('/algorithm/page_neural', '#pacs_list', '5,2,7', resourceType, '51', '5');