更新体征推送规则处理

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

@@ -328,6 +328,29 @@ 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 (IOException ioe) {
             ioe.printStackTrace();
         } catch (SQLException sqle) {

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

@@ -56,7 +56,7 @@ public class PreProcess {
 
             reminder = applytolis(sData.getLisArr(), rule);
 
-            applytovital(sData.getVital(), rule);
+            reminder.addAll(applytovital(sData.getVital(), rule));
 
             ruleResponse.setMedicalIndications(reminder);
 
@@ -131,16 +131,13 @@ public class PreProcess {
                         }
                     }
                 }
-                System.out.println(lexeme.getText() + ": " + lexeme.getProperty());
+//                System.out.println(lexeme.getText() + ": " + lexeme.getProperty());
             }
 
             for (Map<String, Object> obj : vitlist) {
                 String idx = obj.get(vitkeyset[0]).toString();
                 if (rule.get(idx) != null) {
-                    for (String key : obj.keySet()) {
-                        System.out.print(key + ": " + obj.get(key).toString() + "\t");
-                        reminder.addAll(comparevit(rule.get(idx), obj));
-                    }
+                    reminder.addAll(comparevit(rule.get(idx), obj));
                 }
             }
             System.out.println("\n");