解决冲突

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

@@ -23,14 +23,14 @@ public class CacheFileManager {
 
     private String user = "root";
     private String password = "lantone";
-    private String url = "jdbc:mysql://192.168.2.241:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String url = "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8";
 
     private String path = "";
 
     public static void main(String[] args) {
         CacheFileManager cacheFileManager = new CacheFileManager();
-        String p = cacheFileManager.getClass().getClassLoader().getResource("").getPath();
-        p = "e:/cache_file/";
+        PropertiesUtil propertiesUtil = new PropertiesUtil("nlp.properties");
+        String p = propertiesUtil.getProperty("cache.file.dir");
         File file = new File(p);
         if (!file.exists()) {
             file.mkdirs();
@@ -261,30 +261,6 @@ public class CacheFileManager {
                 fw.write("\n");
             }
             fw.close();
-
-            //规则过滤信息
-            sql = "SELECT set_name, idx_name, min_operator, min_value, min_unit, max_operator, " +
-                    " max_value, max_unit, remind FROM kl_rule ";
-            st = conn.createStatement();
-            rs = st.executeQuery(sql);
-            fw = new FileWriter(path + "rule_filter.dict");
-            String r6, r7, r8, r9;
-            while (rs.next()) {
-                r1 = rs.getString(1);
-                r2 = rs.getString(2);
-                r3 = rs.getString(3);
-                r4 = rs.getString(4);
-                r5 = rs.getString(5);
-                r6 = rs.getString(6);
-                r7 = rs.getString(7);
-                r8 = rs.getString(8);
-                r9 = rs.getString(9);
-                fw.write(encrypDES.encrytor(r1+ "|" + r2 + "|" + r3 + "|" + r4 + "|" + r5
-                        + "|" + r6 + "|" + r7 + "|" + r8 + "|" + r9));
-                fw.write("\n");
-            }
-            fw.close();
-
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
@@ -342,7 +318,7 @@ public class CacheFileManager {
             }
             fw.close();
 
-            sql = "SELECT lib_name FROM kl_concept WHERE is_deleted = 'N' AND lib_name regexp '[0-9]'";
+            sql = "SELECT lib_name FROM kl_concept WHERE is_deleted = 'N' AND lib_type = 70 AND lib_name regexp '[0-9]'";
             st = conn.createStatement();
             rs = st.executeQuery(sql);
 

push-web/src/main/java/org/diagbot/push/convert/PreProcess.java

@@ -270,6 +270,9 @@ public class PreProcess {
     }
 
     private List<LisDetail> processLis(List<LisDetail> lisArr) {
+        if (lisArr == null) {
+            return new ArrayList<>();
+        }
         if (lisArr.size() == 0) {
             return lisArr;
         }