Commit 10be9da4f852ec1f9359e358730e0c8dbe59d562
1 parent
f4f2885802
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 13 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
View file @
10be9da
| ... | ... | @@ -220,7 +220,7 @@ |
| 220 | 220 | @TokenRequired |
| 221 | 221 | public BaseResponse list(@RequestParam(value = "pid", required = false) String pid, |
| 222 | 222 | String key, String vcCardNo, Integer weekStart, Integer weekEnd, Integer age, Integer page, Integer limit, HttpServletRequest request) { |
| 223 | - return rareBloodGroupService.list( pid,key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request)); | |
| 223 | + return rareBloodGroupService.list(pid, key, vcCardNo, weekStart, weekEnd, age, page, limit, getUserId(request)); | |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | /** |
| 227 | 227 | |
| 228 | 228 | |
| 229 | 229 | |
| ... | ... | @@ -523,19 +523,26 @@ |
| 523 | 523 | header.put("age", "年龄"); |
| 524 | 524 | header.put("buildWeek", "建档孕周"); |
| 525 | 525 | header.put("phone", "联系方式"); |
| 526 | - header.put("cardNo", "身份证号"); | |
| 526 | + | |
| 527 | 527 | header.put("husbandName", "丈夫姓名"); |
| 528 | 528 | header.put("address", "居住地"); |
| 529 | 529 | header.put("addressRegister", "户籍地"); |
| 530 | - | |
| 531 | - header.put("bookbuildingDoctor", "建档医生"); | |
| 532 | - | |
| 533 | 530 | String hospitalId = autoMatchFacade.getHospitalId(patientManagerRequest.getOperatorId()); |
| 534 | 531 | if ("1000000114".equals(hospitalId)) { |
| 535 | 532 | header.put("sendCareMan", "母子保健手册"); |
| 536 | 533 | header.put("bookbuildingDate", "发放时间"); |
| 537 | - } else { | |
| 534 | + header.put("cardNo", "身份证号"); | |
| 535 | + header.put("bookbuildingDoctor", "建档医生"); | |
| 536 | + } | |
| 537 | + //荣成对应的机构 | |
| 538 | + else if ("2100001750,2100001772,2100001785,2100001818,2100001820,2100001937".contains(hospitalId)) | |
| 539 | + { | |
| 540 | + header.put("bookbuildingDate", "领取时间"); | |
| 541 | + } | |
| 542 | + else { | |
| 538 | 543 | header.put("bookbuildingDate", "建档时间"); |
| 544 | + header.put("cardNo", "身份证号"); | |
| 545 | + header.put("bookbuildingDoctor", "建档医生"); | |
| 539 | 546 | } |
| 540 | 547 | httpServletResponse.setContentType("application/force-download"); |
| 541 | 548 | httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("建档管理.xls").getBytes("UTF-8"), "ISO-8859-1")); |