浏览代码

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

kongwz 5 年之前
父节点
当前提交
332e63de4a
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java

+ 4 - 4
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");//化验辅检体征相关文件