From 70f0de402547c8b6c87b31de7ce85b0db0d92c0d Mon Sep 17 00:00:00 2001
From: hujiaqi <hujiaqi@lymsh.com>
Date: Thu, 22 Dec 2016 14:48:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A3=8E=E9=99=A9=E5=9B=A0?=
 =?UTF-8?q?=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/MatDeliverFacade.java    | 16 ++++++++++------
 .../lyms/platform/operate/web/facade/PatientFacade.java  |  2 ++
 .../operate/web/request/ChildbirthManagerRequest.java    | 10 ++++++++++
 .../operate/web/request/NewBabyManagerRequest.java       | 10 ++++++++++
 4 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 51142e6..0ce97d8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -966,9 +966,11 @@ public class MatDeliverFacade {
                 }
             }
         }
-        patientsQuery.setLimit(childbirthManagerRequest.getLimit());
-        patientsQuery.setPage(childbirthManagerRequest.getPage());
-        patientsQuery.setNeed("need");
+        if (!childbirthManagerRequest.isExcel()) {
+            patientsQuery.setLimit(childbirthManagerRequest.getLimit());
+            patientsQuery.setPage(childbirthManagerRequest.getPage());
+            patientsQuery.setNeed("need");
+        }
         patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterProvinceId()) ? null : childbirthManagerRequest.getRegisterProvinceId());
         patientsQuery.setCityRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterCityId()) ? null : childbirthManagerRequest.getRegisterCityId());
         patientsQuery.setAreaRegisterId(StringUtils.isEmpty(childbirthManagerRequest.getRegisterAreaId()) ? null : childbirthManagerRequest.getRegisterAreaId());
@@ -1256,10 +1258,12 @@ public class MatDeliverFacade {
             }
         }
         babyModelQuery.setDueType(StringUtils.isEmpty(newBabyManagerRequest.getDueType()) ? null : newBabyManagerRequest.getDueType());
-        babyModelQuery.setPage(newBabyManagerRequest.getPage());
-        babyModelQuery.setLimit(newBabyManagerRequest.getLimit());
+        if (!newBabyManagerRequest.isExcel()) {
+            babyModelQuery.setPage(newBabyManagerRequest.getPage());
+            babyModelQuery.setLimit(newBabyManagerRequest.getLimit());
+            babyModelQuery.setNeed("Need");
+        }
         babyModelQuery.setHospitalId(autoMatchFacade.getHospitalId(newBabyManagerRequest.getOperatorId()));
-        babyModelQuery.setNeed("Need");
         babyModelQuery.setBuildType(2);
         List<BabyModel> babyModelList = babyService.queryBabyWithQuery(babyModelQuery);
         if (CollectionUtils.isEmpty(babyModelList)) {
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 a7f9663..bed2228 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
@@ -756,6 +756,8 @@ public class PatientFacade {
 
         PatientsQuery patientsQuery = new PatientsQuery();
         patientsQuery.setYn(YnEnums.YES.getId());
+        patientsQuery.setLimit(patientManagerRequest.getLimit());
+        patientsQuery.setPage(patientManagerRequest.getLimit());
         patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()));
         patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId());
         patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
index a13dc6f..ba8a57a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java
@@ -149,8 +149,18 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest {
      */
     private String initQuery;
 
+    private boolean isExcel;
+
     private Integer operatorId;
 
+    public boolean isExcel() {
+        return isExcel;
+    }
+
+    public void setExcel(boolean excel) {
+        isExcel = excel;
+    }
+
     public String getQueryNo() {
         return queryNo;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java
index c629b87..2630871 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java
@@ -28,10 +28,20 @@ public class NewBabyManagerRequest extends BasePageQueryRequest {
      */
     private String dueType;
 
+    private boolean isExcel;
+
     // TODO 条码号暂时不管
 
     private Integer operatorId;
 
+    public boolean isExcel() {
+        return isExcel;
+    }
+
+    public void setExcel(boolean excel) {
+        isExcel = excel;
+    }
+
     public String getQueryNo() {
         return queryNo;
     }
-- 
1.8.3.1