From 1c8dd2cc5c544e55fd46aaf633f8f1436c22a41d Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 14 Jun 2017 09:48:22 +0800
Subject: [PATCH] commit

---
 .../main/java/com/lyms/platform/query/PatientsQuery.java  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index aa8325b..043700c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -381,6 +381,19 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
      * 高危因素
      */
     private String rFactor;
+    /**
+     * 高危因素集合
+     */
+    private List<String> rFactorList;
+
+    public List<String> getrFactorList() {
+        return rFactorList;
+    }
+
+    public void setrFactorList(List<String> rFactorList) {
+        this.rFactorList = rFactorList;
+    }
+
     private boolean norFactor;
 
 
@@ -1169,6 +1182,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             }else {
                 c1 = c.andCondition(MongoCondition.newInstance("riskFactorId", null, MongoOper.NE)).getCriteria();
             }
+        }else if(null!=rFactorList){
+            condition = condition.and("riskFactorId", rFactorList, MongoOper.IN);
         }
         if (-1 != yn) {
             condition = condition.and("yn", yn, MongoOper.IS);
-- 
1.8.3.1