Commit 52ecf77ae3ef244f19ee9af4201f40d8f5f3e1bb
1 parent
9096c8015c
Exists in
master
and in
6 other branches
德州妇幼导出excel
Showing 2 changed files with 16 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
52ecf77
... | ... | @@ -15,6 +15,7 @@ |
15 | 15 | import com.lyms.platform.common.utils.ExceptionUtils; |
16 | 16 | import com.lyms.platform.common.utils.SystemConfig; |
17 | 17 | import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade; |
18 | +import com.lyms.platform.operate.web.facade.AutoMatchFacade; | |
18 | 19 | import com.lyms.platform.operate.web.facade.BasicConfigFacade; |
19 | 20 | import com.lyms.platform.operate.web.facade.PatientFacade; |
20 | 21 | import com.lyms.platform.operate.web.request.*; |
... | ... | @@ -46,6 +47,8 @@ |
46 | 47 | private PatientFacade patientFacade; |
47 | 48 | @Autowired |
48 | 49 | private AntenatalExaminationFacade antenatalExaminationFacade; |
50 | + @Autowired | |
51 | + private AutoMatchFacade autoMatchFacade; | |
49 | 52 | |
50 | 53 | /** |
51 | 54 | * 产妇管理查询接口 |
52 | 55 | |
... | ... | @@ -384,11 +387,17 @@ |
384 | 387 | header.put("age", "年龄"); |
385 | 388 | header.put("buildWeek", "建档孕周"); |
386 | 389 | header.put("phone", "联系方式"); |
390 | + header.put("cardNo", "身份证号"); | |
387 | 391 | header.put("husbandName", "丈夫姓名"); |
388 | 392 | header.put("address", "居住地"); |
389 | 393 | header.put("addressRegister", "户籍地"); |
390 | 394 | header.put("bookbuildingDate", "建档时间"); |
391 | 395 | header.put("bookbuildingDoctor", "建档医生"); |
396 | + | |
397 | + String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); | |
398 | + if("1000000117".equals(hospitalId)){ | |
399 | + header.put("sendCareMan", "母子保健手册"); | |
400 | + } | |
392 | 401 | httpServletResponse.setContentType("application/force-download"); |
393 | 402 | httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("建档管理.xls").getBytes("UTF-8"), "ISO-8859-1")); |
394 | 403 | ExcelUtil.toExcel(httpServletResponse.getOutputStream(), list, header); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
52ecf77
... | ... | @@ -1111,8 +1111,13 @@ |
1111 | 1111 | } catch (Exception e) { |
1112 | 1112 | // 什么都不干 |
1113 | 1113 | } |
1114 | - patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); | |
1115 | - patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); | |
1114 | + if("1000000117".equals(patients.getHospitalId())){ | |
1115 | + patientManagerQueryModel.setPhone(patients.getPhone()); | |
1116 | + patientManagerQueryModel.setCardNo(patients.getCardNo()); | |
1117 | + }else{ | |
1118 | + patientManagerQueryModel.setPhone(DefenceUtils.getPhone(patients.getPhone())); | |
1119 | + patientManagerQueryModel.setCardNo(DefenceUtils.getCardNo(patients.getCardNo())); | |
1120 | + } | |
1116 | 1121 | patientManagerQueryModel.setBuildWeek(dueWeek); |
1117 | 1122 | |
1118 | 1123 | String bookbuildingDoctor = ""; |