From b2011fe4f240846d7d7af5ed410358e724614806 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Fri, 27 Oct 2017 17:11:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=8E=BF=E5=88=86=E5=A8=A9=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/controller/PuerperaManageController.java | 16 +++++++++++++++-
 .../lyms/platform/operate/web/facade/PatientFacade.java  |  2 +-
 .../operate/web/request/RiskPatientsQueryRequest.java    | 10 ++++++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 3c2c707..5cdb214 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -143,6 +143,20 @@ public class PuerperaManageController extends BaseController {
         patientFacade.exportAllPuer(patientsQueryRequest,loginState.getId(),response);
     }
 
+    /**
+     * 区县产妇统计
+     * @param patientsQueryRequest
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/exportAllPuerpera", method = RequestMethod.GET)
+    @TokenRequired
+    public void exportAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request,HttpServletResponse response) {
+        patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId());
+        patientsQueryRequest.setNotEnable("2");
+        patientFacade.exportAllPuer(patientsQueryRequest,0,response);
+    }
+
 
     /**
      * 全部产妇
@@ -297,7 +311,7 @@ public class PuerperaManageController extends BaseController {
     @TokenRequired
     public BaseResponse queryPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest,HttpServletRequest request){
         patientsQueryRequest.setFmHospital(patientsQueryRequest.gethId());
-
+        patientsQueryRequest.setNotEnable("2");
         return  patientFacade.queryHighRisk(patientsQueryRequest, null, 3,0,"true",Boolean.FALSE);
     }
 
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 ddfd1fa..86cf7da 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
@@ -228,7 +228,7 @@ public class PatientFacade {
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setPhone(riskPatientsQueryRequest.getPhone());
         patientsQuery.setCardNo(riskPatientsQueryRequest.getCardNo());
-
+        patientsQuery.setNotEnable(riskPatientsQueryRequest.getNotEnable());
 
         //设置为孕妇
         patientsQuery.setType(type);
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 f57351d..3311dae 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
@@ -142,6 +142,16 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest {
     private Integer buildWeekStart;
     private Integer buildWeekEnd;
 
+    private String notEnable;
+
+    public String getNotEnable() {
+        return notEnable;
+    }
+
+    public void setNotEnable(String notEnable) {
+        this.notEnable = notEnable;
+    }
+
     public Integer getBuildWeekStart() {
         return buildWeekStart;
     }
-- 
1.8.3.1