From f4c5fa5296ad0028964a45ef045972d941a67d3f Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 25 Oct 2016 15:50:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=8D=E6=9F=A5=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E5=A4=A7=E4=BA=8E4=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/query/PatientsQuery.java   | 14 +++++++++++++-
 .../lyms/platform/operate/web/facade/PatientFacade.java    |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

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 2959cbf..f938bea 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
@@ -57,6 +57,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         this.dueStatus = dueStatus;
     }
 
+    public boolean isGtePostTimes() {
+        return gtePostTimes;
+    }
+
+    public void setGtePostTimes(boolean gtePostTimes) {
+        this.gtePostTimes = gtePostTimes;
+    }
 
     /**
      * 访视状态
@@ -84,6 +91,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     private Date lastCTimeStart;
     private Date lastCTimeEnd;
     private Integer postViewTimes;
+    private boolean gtePostTimes=false;
 
     public Integer getPostViewTimes() {
         return postViewTimes;
@@ -680,7 +688,11 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("type", type, MongoOper.IS);
         }
         if(null!=postViewTimes){
-            condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS);
+            if(gtePostTimes){
+                condition = condition.and("postViewTimes", postViewTimes, MongoOper.GTE);
+            }else{
+                condition = condition.and("postViewTimes", postViewTimes, MongoOper.IS);
+            }
         }
 
         if (null != lastRhTimeStart) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index b0af360..8ece7e2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -213,6 +213,9 @@ public class PatientFacade {
         Date currentDate = DateUtil.formatDate(new Date());
 
         patientsQuery.setPostViewTimes(riskPatientsQueryRequest.getPostViewTimes());
+        if(null!=riskPatientsQueryRequest.getPostViewTimes() &&riskPatientsQueryRequest.getPostViewTimes()>=4){
+            patientsQuery.setGtePostTimes(true);
+        }
 
         //服务类型
         if (null != riskPatientsQueryRequest.getServiceType() && ServiceTypeEnums.ALL_SERVICE.getId() != Integer.valueOf(riskPatientsQueryRequest.getServiceType())) {
-- 
1.8.3.1