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 3df9928..b3eade1 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 @@ -220,7 +220,7 @@ public class PuerperaManageController extends BaseController { @TokenRequired public BaseResponse list(@RequestParam(value = "pid", required = false) String pid, String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { - return rareBloodGroupService.list( pid,key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request)); + return rareBloodGroupService.list(pid, key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request)); } /** @@ -523,19 +523,26 @@ 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("bookbuildingDoctor", "建档医生"); - String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); if ("1000000114".equals(hospitalId)) { header.put("sendCareMan", "母子保健手册"); header.put("bookbuildingDate", "发放时间"); - } else { + header.put("cardNo", "身份证号"); + header.put("bookbuildingDoctor", "建档医生"); + } + //荣成对应的机构 + else if ("2100001750,2100001772,2100001785,2100001818,2100001820,2100001937".contains(hospitalId)) + { + header.put("bookbuildingDate", "领取时间"); + } + else { header.put("bookbuildingDate", "建档时间"); + header.put("cardNo", "身份证号"); + header.put("bookbuildingDoctor", "建档医生"); } httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("建档管理.xls").getBytes("UTF-8"), "ISO-8859-1"));