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

common-push/src/main/java/org/diagbot/common/push/filter/pretreat/PretreatmentLis.java

@@ -24,7 +24,7 @@ public class PretreatmentLis extends Pretreatment {
                 PreResult result = new PreResult();
                 result = findPreResultPub(lexemes, result);
                 if (result != null) {
-                    result.setValue(l.getText());
+                    result.setOtherValue(l.getText());
                     preResults.add(result);
                 }
             }

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

@@ -79,7 +79,8 @@ public class PretreatmentRule {
             for (PreResult result : preResultList) {
                 //规则库中匹配
                 if (kl_rule_filter_map.get(result.getUniqueName()) != null) {
-                    if(StringUtils.isEmpty(result.getValue()) && !StringUtils.isEmpty(result.getOtherValue())) {
+                    //结构化数据进来非数字类型值保存在otherValue，赋值到value中
+                    if(!StringUtils.isEmpty(result.getOtherValue())) {
                         result.setValue(result.getOtherValue());
                     }
                     List<Rule> rules = kl_rule_filter_map.get(result.getUniqueName());
@@ -102,6 +103,10 @@ public class PretreatmentRule {
                             content = content + (rule.getRemind() == null ? "" : rule.getRemind());
                         }
                     }
+                    //还原回去
+                    if(!StringUtils.isEmpty(result.getOtherValue())) {
+                        result.setValue(null);
+                    }
                 }
             }