提取特征修改为主诉 现病史 体征

nlp-web/src/main/java/org/diagbot/nlp/controller/FeatureController.java

@@ -179,7 +179,7 @@ public class FeatureController extends BaseController<Feature, FeatureWrapper, L
                                 propel = propelSymptom;
                                 break;
                             case FEATURE:
-                                content = info.getPresent();
+                                content = info.getChief() + info.getPresent() + info.getVital();
                                 propel = propelSymptom;
                                 break;
                             case VITAL:

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

@@ -80,7 +80,7 @@ public class AlgorithmController extends BaseController {
         Response<ResponseData> response = new Response<>();
 
         MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
-        List<Map<String, String>> data = nlpJdbc.query("doc_info_validate", new String[] { "pk_dcpv", "present", "diag", "sex", "age" }, "");
+        List<Map<String, String>> data = nlpJdbc.query("doc_info", new String[] { "pk_dcpv", "present", "diag", "sex", "age" }, "");
 
         Map<String, String> diags = NlpCache.getStandard_info_synonym_map().get(Constants.word_property_diagnose);
 
@@ -88,8 +88,8 @@ public class AlgorithmController extends BaseController {
         List<Map<String, Object>> wheres = new ArrayList<>();
         for (Map<String, String> map : data) {
             SearchData searchData = new SearchData();
-            searchData.setAge(Integer.parseInt(map.get("age")));
-            searchData.setSex(map.get("sex"));
+//            searchData.setAge(Integer.parseInt(map.get("age")));
+//            searchData.setSex(map.get("sex"));
             searchData.setSymptom(map.get("present"));
             searchData.setFeatureType("2");
             searchData.setSysCode("2");
@@ -109,7 +109,7 @@ public class AlgorithmController extends BaseController {
                 } else if ((fr.getFeatureName().equals(map.get("diag")) || fr.getFeatureName().equals(diags.get(map.get("diag")))) && i < 5) {
                     line.put("check_5", "1");
                 }
-                if (i > 0 && i < 5) {
+                if (i > 0 && i < 10) {
                     push_diag = push_diag + "," + fr.getFeatureName();
                 } else if (i == 0) {
                     push_diag = fr.getFeatureName();
@@ -122,7 +122,7 @@ public class AlgorithmController extends BaseController {
             wheres.add(where);
         }
 
-        nlpJdbc.update("doc_info_validate", updates, wheres);
+        nlpJdbc.update("doc_info", updates, wheres);
 
         return response;
     }