From 77bb6d8079899a1f3085deb2b57036990422c2c9 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 22 Sep 2016 10:30:40 +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

---
 .../platform/operate/web/facade/PatientFacade.java  |  7 ++++++-
 .../web/request/RiskPatientsQueryRequest.java       | 21 ++++++++++++++++++++-
 2 files changed, 26 insertions(+), 2 deletions(-)

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 46efe5e..e6fa8fe 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
@@ -214,10 +214,15 @@ public class PatientFacade {
         patientsQuery.setrLevel(riskPatientsQueryRequest.getrLevel());
         patientsQuery.setLastMensesStart(riskPatientsQueryRequest.capEnd());
         patientsQuery.setLastMensesEnd(riskPatientsQueryRequest.capStart());
+        if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTimeEnd())){
+            patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(riskPatientsQueryRequest.getBuildTimeEnd()));
+        }
+        if(StringUtils.isNotEmpty(riskPatientsQueryRequest.getBuildTimeStart())){
+            patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(riskPatientsQueryRequest.getBuildTimeStart()));
+        }
 
         if (null != riskPatientsQueryRequest.getStartAge()) {
             Date date = DateUtil.addYear(currentDate, -riskPatientsQueryRequest.getStartAge());
-
             patientsQuery.setBirthEnd(date);
         }
         if (null != riskPatientsQueryRequest.getEndAge()) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
index 74808e6..973a909 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java
@@ -61,11 +61,30 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     //体验会员 0非会员 1会员
     @FormParam
     private Integer expVip;
-
+    //建档时间开始
+    private String buildTimeStart;
+    //
+    private String buildTimeEnd;
 
     // 0 高危孕妇 1 全部孕妇 2全部产妇
     private Integer queryType;
 
+    public String getBuildTimeEnd() {
+        return buildTimeEnd;
+    }
+
+    public void setBuildTimeEnd(String buildTimeEnd) {
+        this.buildTimeEnd = buildTimeEnd;
+    }
+
+    public String getBuildTimeStart() {
+        return buildTimeStart;
+    }
+
+    public void setBuildTimeStart(String buildTimeStart) {
+        this.buildTimeStart = buildTimeStart;
+    }
+
     public Integer getQueryType() {
         return queryType;
     }
-- 
1.8.3.1