Merge remote-tracking branch 'origin/push-dev-ruletype' into push-test

common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -18,6 +18,7 @@ public class PretreatmentRule {
         //患者基本信息 性别 年龄 婚姻
         if (!StringUtils.isEmpty(searchData.getNormal())) {
             add2PreResultList(new PretreatmentNormal(), searchData.getNormal(), "normal", searchData);
+            add2PreResultList(new PretreatmentNormal(), searchData.getMarriage(), "normal", searchData);
         }
         //症状规则 主诉、现病史提取
         if (!StringUtils.isEmpty(searchData.getChief())) {
@@ -29,6 +30,7 @@ public class PretreatmentRule {
             add2PreResultList(new PretreatmentAllergy(), searchData.getSymptom(), "allergy", searchData);       //过敏史
             add2PreResultList(new PretreatmentSymptom(), searchData.getSymptom(), "symptom", searchData);       //症状
             add2PreResultList(new PretreatmentInfectious(), searchData.getSymptom(), "infectious", searchData);     //传染病史
+            add2PreResultList(new PretreatmentPacs(), searchData.getSymptom(), "pacs", searchData);         //检查
         }
         //体征数据 体征、现病史提取
         if (!StringUtils.isEmpty(searchData.getVital())) {

nlp/src/main/java/org/diagbot/nlp/rule/pretreat/PretreatmentNormal.java

@@ -34,6 +34,13 @@ public class PretreatmentNormal extends Pretreatment {
                     preResults.add(result);
                     return preResults;
                 }
+            } else if ("己婚".equals(l.getText()) || "未婚".equals(l.getText())){
+                PreResult result = new PreResult();
+                result.setUniqueName("其他--");
+                result.setDetailName("其他--");
+                result.setValue(l.getText());
+                preResults.add(result);
+                return preResults;
             }
         }
         return preResults;

nlp/src/main/java/org/diagbot/nlp/rule/pretreat/PretreatmentPacs.java

@@ -44,7 +44,12 @@ public class PretreatmentPacs extends Pretreatment {
                     result.setUniqueName("检查--");
                     preResultList.add(result);
                 }
-            } else if (NlpUtil.isFeature(l.getProperty(), nees_time_and_unit) && i > 0) {
+            }else if (NlpUtil.isFeature(l.getProperty(), nees_pacs_result) && i == 0){
+                PreResult result = new PreResult();
+                result.setValue(NlpUtil.concept(l, NegativeEnum.PACS_RESULT));
+                result.setUniqueName("检查--");
+                preResultList.add(result);
+            }else if (NlpUtil.isFeature(l.getProperty(), nees_time_and_unit) && i > 0) {
                 PreResult result = data2Object(lexemes, l, i, l.getProperty());
                 if (result != null) {
                     preResultList.add(result);