From d06e3cc32bc741e8f23856c6b7bfe41849dee0a7 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 27 Sep 2016 11:23:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/query/PatientsQuery.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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 9ff97e2..a35d5e3 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
@@ -617,7 +617,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 
         if (null != lastRhTimeStart) {
             if(null!=c1){
-                c1 = c1.where("lastRhTime").gte(lastRhTimeStart);
+                c1 = c1.and("lastRhTime").gte(lastRhTimeStart);
             }else {
                 c1 = Criteria.where("lastRhTime").gte(lastRhTimeStart);
             }
@@ -632,7 +632,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != hScoreStart) {
             if (null != hScoreStart) {
                 if(null!=c1){
-                    c1 = c1.where("riskScore").gte(hScoreStart);
+                    c1 = c1.and("riskScore").gte(hScoreStart);
                 }else{
                     c1 = Criteria.where("riskScore").gte(hScoreStart);
                 }
@@ -650,7 +650,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 
         if (null != bookbuildingDateStart) {
             if(c1!=null){
-                c1 = c1.where("bookbuildingDate").gte(bookbuildingDateStart);
+                c1 = c1.and("bookbuildingDate").gte(bookbuildingDateStart);
             }else{
                 c1 = Criteria.where("bookbuildingDate").gte(bookbuildingDateStart);
             }
@@ -673,7 +673,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 //        Criteria c = null;
         if (null != lastMensesStart) {
             if(null!=c1){
-                c1 = c1.where("lastMenses").gte(lastMensesStart);
+                c1 = c1.and("lastMenses").gte(lastMensesStart);
             }else{
                 c1 = Criteria.where("lastMenses").gte(lastMensesStart);
             }
@@ -689,7 +689,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 
         if (null != dueDateStart) {
             if(null!=c1){
-                c1 = c1.where("dueDate").gte(dueDateStart);
+                c1 = c1.and("dueDate").gte(dueDateStart);
             }else{
                 c1 = Criteria.where("dueDate").gte(dueDateStart);
             }
@@ -703,7 +703,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         }
         if (null != birthStart) {
             if (null!=c1) {
-                c1 = c1.where("birth").gte(birthStart);
+                c1 = c1.and("birth").gte(birthStart);
             }else {
                 c1 = Criteria.where("birth").gte(birthStart);
             }
-- 
1.8.3.1