From 14a526e917bca52c4e9c77e3934525fb5feedd96 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Fri, 23 Dec 2016 11:34:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9excel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/PuerperaManageController.java | 10 +++++----- .../com/lyms/platform/operate/web/facade/PatientFacade.java | 8 +++++--- .../platform/operate/web/request/PatientManagerRequest.java | 10 ++++++++++ 3 files changed, 20 insertions(+), 8 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 207b129..4079e4e 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 @@ -292,6 +292,7 @@ public class PuerperaManageController extends BaseController { public void patientManagerExcel(HttpServletRequest httpServletRequest, @RequestBody PatientManagerRequest patientManagerRequest, HttpServletResponse httpServletResponse) { try { patientManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()); + patientManagerRequest.setExcel(true); // 这里返回的结果必然是这个泛型，之所以query返回的结果集没有用泛型是为了更好的传递数据 @SuppressWarnings("unchecked") List patientManagerQueryModelList = patientFacade.patientManager(patientManagerRequest).getData(); @@ -303,14 +304,13 @@ public class PuerperaManageController extends BaseController { Map header = new LinkedHashMap<>(); header.put("username", "姓名"); header.put("age", "年龄"); - header.put("phone", "联系电话"); - header.put("cardNo", "证件号码"); - header.put("addressRegister", "户口所在地"); + header.put("buildWeek", "建档孕周"); + header.put("phone", "联系方式"); header.put("husbandName", "丈夫姓名"); - header.put("husbandAddressRegister", "丈夫户口所在地"); + header.put("address", "居住地"); + header.put("addressRegister", "户籍地"); header.put("bookbuildingDate", "建档时间"); header.put("bookbuildingDoctor", "建档医生"); - header.put("serviceType", "服务类型"); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("建档管理.xls").getBytes("UTF-8"), "ISO-8859-1")); ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header); 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 c320bd9..16cf513 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 @@ -758,8 +758,11 @@ public class PatientFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setLimit(patientManagerRequest.getLimit()); - patientsQuery.setPage(patientManagerRequest.getPage()); + if (!patientManagerRequest.isExcel()) { + patientsQuery.setNeed("need"); + patientsQuery.setLimit(patientManagerRequest.getLimit()); + patientsQuery.setPage(patientManagerRequest.getPage()); + } patientsQuery.setHospitalId(autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId())); patientsQuery.setProvinceRegisterId(StringUtils.isEmpty(patientManagerRequest.getProvinceRegisterId()) ? null : patientManagerRequest.getProvinceRegisterId()); patientsQuery.setCityRegisterId(StringUtils.isEmpty(patientManagerRequest.getCityRegisterId()) ? null : patientManagerRequest.getCityRegisterId()); @@ -778,7 +781,6 @@ public class PatientFacade { patientsQuery.setProvinceId(StringUtils.isEmpty(patientManagerRequest.getProvinceId()) ? null : patientManagerRequest.getProvinceId()); patientsQuery.setCityId(StringUtils.isEmpty(patientManagerRequest.getCityId()) ? null : patientManagerRequest.getCityId()); patientsQuery.setAreaId(StringUtils.isEmpty(patientManagerRequest.getAreaId()) ? null : patientManagerRequest.getAreaId()); - patientsQuery.setNeed("need"); if (StringUtils.isNotEmpty(patientManagerRequest.getBookBuildingDate())) { try { patientsQuery.setBookbuildingDateStart(DateUtil.getSNDate(patientManagerRequest.getBookBuildingDate())[0]); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java index aaf6504..d63001d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientManagerRequest.java @@ -56,6 +56,16 @@ public class PatientManagerRequest extends BasePageQueryRequest { */ private String queryNo; + private boolean isExcel; + + public boolean isExcel() { + return isExcel; + } + + public void setExcel(boolean excel) { + isExcel = excel; + } + public String getProvinceRegisterId() { return provinceRegisterId; } -- 1.8.3.1