From 52ecf77ae3ef244f19ee9af4201f40d8f5f3e1bb Mon Sep 17 00:00:00 2001 From: yangfei Date: Mon, 2 Jul 2018 10:51:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=B7=E5=B7=9E=E5=A6=87=E5=B9=BC=E5=AF=BC?= =?UTF-8?q?=E5=87=BAexcel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/PuerperaManageController.java | 9 +++++++++ .../java/com/lyms/platform/operate/web/facade/PatientFacade.java | 9 +++++++-- 2 files changed, 16 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 3300e70..56eb910 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 @@ -15,6 +15,7 @@ import com.lyms.platform.common.utils.ExcelUtil; import com.lyms.platform.common.utils.ExceptionUtils; import com.lyms.platform.common.utils.SystemConfig; import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; +import com.lyms.platform.operate.web.facade.AutoMatchFacade; import com.lyms.platform.operate.web.facade.BasicConfigFacade; import com.lyms.platform.operate.web.facade.PatientFacade; import com.lyms.platform.operate.web.request.*; @@ -46,6 +47,8 @@ public class PuerperaManageController extends BaseController { private PatientFacade patientFacade; @Autowired private AntenatalExaminationFacade antenatalExaminationFacade; + @Autowired + private AutoMatchFacade autoMatchFacade; /** * 产妇管理查询接口 @@ -384,11 +387,17 @@ public class PuerperaManageController extends BaseController { header.put("age", "年龄"); header.put("buildWeek", "建档孕周"); header.put("phone", "联系方式"); + header.put("cardNo", "身份证号"); header.put("husbandName", "丈夫姓名"); header.put("address", "居住地"); header.put("addressRegister", "户籍地"); header.put("bookbuildingDate", "建档时间"); header.put("bookbuildingDoctor", "建档医生"); + + String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); + if("1000000117".equals(hospitalId)){ + header.put("sendCareMan", "母子保健手册"); + } 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 5b61d36..b4d77f9 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 @@ -1111,8 +1111,13 @@ public class PatientFacade { } catch (Exception e) { // 什么都不干 } - patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); - patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); + if("1000000117".equals(patients.getHospitalId())){ + patientManagerQueryModel.setPhone(patients.getPhone()); + patientManagerQueryModel.setCardNo(patients.getCardNo()); + }else{ + patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); + patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); + } patientManagerQueryModel.setBuildWeek(dueWeek); String bookbuildingDoctor = ""; -- 1.8.3.1