From 8133eee686b8f5cd671f5e18a5761bb8e585d88f Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 8 Aug 2016 18:50:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/query/PatientsQuery.java     | 37 ++++++++++------------
 1 file changed, 17 insertions(+), 20 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 62c69e3..c95fa8c 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
@@ -1,7 +1,6 @@
 package com.lyms.platform.query;
 
 import com.lyms.platform.common.base.IConvertToNativeQuery;
-import com.lyms.platform.common.core.annotation.form.FormParam;
 import com.lyms.platform.common.dao.BaseQuery;
 import com.lyms.platform.common.dao.operator.MongoCondition;
 import com.lyms.platform.common.dao.operator.MongoOper;
@@ -56,7 +55,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     }
 
 
-
     /**
      * 访视状态
      */
@@ -167,15 +165,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     private Integer yn = -1;
     /**
      * 1:孕妇,2:儿童
-     *
      */
     private Integer type = -1;
 
-    private String  hospitalId;
+    private String hospitalId;
 
     private String hcertificateNum;
 
-    private  Integer buildType= -1;
+    private Integer buildType = -1;
 
     public Integer getBuildType() {
         return buildType;
@@ -437,11 +434,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             MongoCondition con = MongoCondition.newInstance("areaPostRestId", areaIdOrRestId, MongoOper.IS);
             condition = condition.orCondition(new MongoCondition[]{con1, con});
         }
-        if(null!=dueStatus){
-            condition=condition.and("dueStatus",dueStatus,MongoOper.IS);
+        if (null != dueStatus) {
+            condition = condition.and("dueStatus", dueStatus, MongoOper.IS);
         }
-        if( buildType!=-1){
-            condition=condition.and("buildType",buildType,MongoOper.NE);
+        if (buildType != -1) {
+            condition = condition.and("buildType", buildType, MongoOper.NE);
         }
         if (visitstatus != -1) {
             condition = condition.and("isVisit", visitstatus, MongoOper.IS);
@@ -449,13 +446,16 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != communityId && !"-1".equals(communityId)) {
             condition = condition.and("communityId", communityId, MongoOper.IS);
         }
-        if(null!=created){
+        if (null != created) {
             condition = condition.and("created", created, MongoOper.LTE);
         }
         if (null != hScore) {
             condition = condition.and("riskScore", hScore, MongoOper.IS);
-        }else  if(null!=isHighRisk){
-            condition=condition.and("riskScore",0,MongoOper.GT);
+        }
+        if (null != isHighRisk) {
+            condition = condition.and("riskLevelId", null, MongoOper.NE);
+        } else if (null != rLevel) {
+            condition = condition.and("riskLevelId", rLevel, MongoOper.IS);
         }
         if (null != areaId) {
             condition = condition.and("areaId", areaId, MongoOper.IS);
@@ -475,13 +475,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         }
         if (null != name) {
             condition = condition.and("username", name, MongoOper.IS);
-        }else if(null!=likeName){
+        } else if (null != likeName) {
             condition = condition.and("username", likeName, MongoOper.LIKE);
         }
         if (null != hospitalId) {
             condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
-        if(null!=pid){
+        if (null != pid) {
             condition = condition.and("pid", pid, MongoOper.IS);
         }
 
@@ -505,7 +505,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("serviceType", serviceType, MongoOper.IS);
         }
 
-        if(null!=serviceStatus){
+        if (null != serviceStatus) {
             condition = condition.and("serviceStatus", serviceStatus, MongoOper.IS);
         }
 
@@ -515,15 +515,12 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 
         if (null != orServiceStatus && orServiceStatus.length > 1) {
             Criteria c = Criteria.where("serviceStatus").in(orServiceStatus[0], orServiceStatus[1]);
-            condition.andCondition( new MongoCondition(c));
+            condition.andCondition(new MongoCondition(c));
         }
         if (null != hcertificateNum) {
             condition = condition.and("hcertificateNum", hcertificateNum, MongoOper.LIKE);
         }
 
-        if (null != rLevel) {
-            condition = condition.and("riskLevelId", rLevel, MongoOper.IS);
-        }
 
         if (null != rFactor) {
             condition = condition.and("riskFactorId", rFactor, MongoOper.ALL);
@@ -541,7 +538,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         }
         boolean isAddStart = Boolean.FALSE;
         Criteria c = null;
-        if(null!=lastMensesStart){
+        if (null != lastMensesStart) {
             c = Criteria.where("lastMenses").gte(lastMensesStart);
             isAddStart = Boolean.TRUE;
         }
-- 
1.8.3.1