Commit 0cf20e999d1f467f0d5b1e8f45694312b77f655d
1 parent
5e5d8217e1
Exists in
master
and in
8 other branches
code update
Showing 2 changed files with 65 additions and 9 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
View file @
0cf20e9
| ... | ... | @@ -438,7 +438,7 @@ |
| 438 | 438 | List<MessageRequest> messages = new ArrayList<>(); |
| 439 | 439 | MessageRequest mr = new MessageRequest(); |
| 440 | 440 | Date dueDate = DateUtil.addDay(patient.getLastMenses(), 7); |
| 441 | - dueDate = DateUtil.addMonth(patient.getLastMenses(), 9); | |
| 441 | + dueDate = DateUtil.addMonth(dueDate, 9); | |
| 442 | 442 | String content = StringUtils.replaceEL(patient.getUsername(),dueDate,templateModel.getContent()); |
| 443 | 443 | |
| 444 | 444 | mr.setContent("【"+messagePrefix+"】"+content); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
0cf20e9
| ... | ... | @@ -580,12 +580,13 @@ |
| 580 | 580 | try { |
| 581 | 581 | BaseListResponse listResponse = null; |
| 582 | 582 | List<Map<String,Object>> datas = new ArrayList<>(); |
| 583 | + Map<String,String> cnames = new HashMap<>(); | |
| 583 | 584 | if (patientsQueryRequest.getQueryType() != null) |
| 584 | 585 | { |
| 585 | 586 | // 0 高危孕妇 1 全部孕妇 2全部产妇 |
| 586 | 587 | if (patientsQueryRequest.getQueryType() == 0) |
| 587 | 588 | { |
| 588 | - listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId,"true"); | |
| 589 | + listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId,null); | |
| 589 | 590 | List list = listResponse.getData(); |
| 590 | 591 | for (Object obj : list) |
| 591 | 592 | { |
| ... | ... | @@ -605,8 +606,6 @@ |
| 605 | 606 | data.put("lName",rp.getlName()); |
| 606 | 607 | data.put("phone",rp.getPhone()); |
| 607 | 608 | } |
| 608 | - | |
| 609 | - Map<String,String> cnames = new HashMap<>(); | |
| 610 | 609 | cnames.put("name", "姓名"); |
| 611 | 610 | cnames.put("age","当前年龄"); |
| 612 | 611 | cnames.put("dueWeek","当前孕周"); |
| 613 | 612 | |
| 614 | 613 | |
| 615 | 614 | |
| 616 | 615 | |
| ... | ... | @@ -619,20 +618,77 @@ |
| 619 | 618 | cnames.put("dueDate","预产期"); |
| 620 | 619 | cnames.put("checkDoctor","产检医生"); |
| 621 | 620 | cnames.put("lName","登记人"); |
| 622 | - cnames.put("phone","联系方式"); | |
| 621 | + cnames.put("phone", "联系方式"); | |
| 623 | 622 | |
| 624 | - OutputStream out = response.getOutputStream(); | |
| 625 | - ExcelUtil.toExcel(out, datas, cnames); | |
| 626 | 623 | } |
| 627 | 624 | else if (patientsQueryRequest.getQueryType() == 1) |
| 628 | 625 | { |
| 629 | - listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest,null,1,userId,"true"); | |
| 626 | + listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest,null,1,userId,null); | |
| 627 | + List list = listResponse.getData(); | |
| 628 | + for (Object obj : list) | |
| 629 | + { | |
| 630 | + Map<String,Object> data = new HashMap<>(); | |
| 631 | + QuanPatientsResult rp = (QuanPatientsResult)obj; | |
| 632 | + data.put("name", rp.getName()); | |
| 633 | + data.put("age",rp.getAge()); | |
| 634 | + data.put("dueWeek",rp.getDueWeek()); | |
| 635 | + data.put("rLevel", rp.getrLevel()); | |
| 636 | + data.put("cTimes", rp.getcTime()); | |
| 637 | + data.put("cHTimes",rp.getcHTimes()); | |
| 638 | + data.put("cTime",rp.getcTime()); | |
| 639 | + data.put("dueDate",rp.getDueDate()); | |
| 640 | + data.put("checkDoctor",rp.getCheckDoctor()); | |
| 641 | + data.put("lName",rp.getlName()); | |
| 642 | + data.put("phone",rp.getPhone()); | |
| 643 | + } | |
| 644 | + cnames.put("name", "姓名"); | |
| 645 | + cnames.put("age","当前年龄"); | |
| 646 | + cnames.put("dueWeek","当前孕周"); | |
| 647 | + cnames.put("rLevel", "高危等级"); | |
| 648 | + cnames.put("cTimes", "总产检次数"); | |
| 649 | + cnames.put("cHTimes","本院产检次数"); | |
| 650 | + cnames.put("cTime","预约产检日期"); | |
| 651 | + cnames.put("dueDate","预产期"); | |
| 652 | + cnames.put("checkDoctor","产检医生"); | |
| 653 | + cnames.put("lName","登记人"); | |
| 654 | + cnames.put("phone", "联系方式"); | |
| 655 | + cnames.put("serviceType", "服务类型"); | |
| 630 | 656 | } |
| 631 | 657 | else if (patientsQueryRequest.getQueryType() == 2) |
| 632 | 658 | { |
| 633 | - listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, null, 3,userId,"true"); | |
| 659 | + listResponse = (BaseListResponse)queryHighRisk(patientsQueryRequest, null, 3,userId,null); | |
| 660 | + List list = listResponse.getData(); | |
| 661 | + for (Object obj : list) | |
| 662 | + { | |
| 663 | + Map<String,Object> data = new HashMap<>(); | |
| 664 | + QuanChanResult rp = (QuanChanResult)obj; | |
| 665 | + data.put("name", rp.getName()); | |
| 666 | + data.put("age",rp.getAge()); | |
| 667 | + data.put("dueWeek",rp.getDueWeek()); | |
| 668 | + data.put("cTime",rp.getcTime()); | |
| 669 | + data.put("nextCheckTime", rp.getNextCheckTime()); | |
| 670 | + data.put("cTimes", rp.getcTime()); | |
| 671 | + data.put("cHTimes",rp.getcHTimes()); | |
| 672 | + data.put("checkDoctor",rp.getCheckDoctor()); | |
| 673 | + data.put("lName",rp.getlName()); | |
| 674 | + data.put("phone",rp.getPhone()); | |
| 675 | + } | |
| 676 | + cnames.put("name", "姓名"); | |
| 677 | + cnames.put("age","分娩年龄"); | |
| 678 | + cnames.put("dueWeek","分娩日期"); | |
| 679 | + cnames.put("cTime", "产后时间"); | |
| 680 | + cnames.put("nextCheckTime", "预约下次复查"); | |
| 681 | + cnames.put("cTimes", "总复查次数"); | |
| 682 | + cnames.put("cHTimes", "本院复查次数"); | |
| 683 | + cnames.put("checkDoctor","检查医生"); | |
| 684 | + cnames.put("phone","联系方式"); | |
| 685 | + cnames.put("lName","登记人"); | |
| 634 | 686 | } |
| 635 | 687 | } |
| 688 | + | |
| 689 | + | |
| 690 | + OutputStream out = response.getOutputStream(); | |
| 691 | + ExcelUtil.toExcel(out, datas, cnames); | |
| 636 | 692 | }catch (IOException e) { |
| 637 | 693 | e.printStackTrace(); |
| 638 | 694 | } |