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

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

@@ -249,7 +249,7 @@ public class CacheFileManager {
             }
             fw.close();
             //疾病科室信息
-            sql = "SELECT k1.lib_name diag_name, k2.lib_name dept_name FROM kl_concept_common kcc, kl_concept k1, kl_concept k2 " +
+            sql = "SELECT k1.lib_name diag_name, k2.lib_name dept_name FROM kl_disease kcc, kl_concept k1, kl_concept k2 " +
                     "where kcc.concept_id = k1.id and kcc.dept_id = k2.id " +
                     "and k1.lib_type = 18 and kcc.dept_id  is not null";
             st = conn.createStatement();
@@ -293,7 +293,7 @@ public class CacheFileManager {
         try {
             EncrypDES encrypDES = new EncrypDES();
             //疾病科室
-            String sql = "SELECT k1.lib_name diag_name, k2.lib_name dept_name FROM kl_concept_common kcc, kl_concept k1, kl_concept k2 " +
+            String sql = "SELECT k1.lib_name diag_name, k2.lib_name dept_name FROM kl_disease kcc, kl_concept k1, kl_concept k2 " +
                     "where kcc.concept_id = k1.id and kcc.dept_id = k2.id " +
                     "and k1.lib_type = 18 and kcc.dept_id  is not null";
             st = conn.createStatement();

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

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