Commit bf3e565d25297aae3c6a19f05667c957bacb5875
1 parent
69eaee85a1
Exists in
dev
#fix:优化产后康复服务开通结束时间计算逻辑
Showing 2 changed files with 20 additions and 12 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ViewController.java
View file @
bf3e565
| ... | ... | @@ -149,8 +149,8 @@ |
| 149 | 149 | public BaseObjectResponse AntExChuSyncXtlc(@RequestParam("startDate") String startDate, |
| 150 | 150 | @RequestParam("endDate") String endDate, |
| 151 | 151 | @RequestParam("parentId") String parentId) { |
| 152 | - System.out.println("------------------------------------------------------"); | |
| 153 | - System.out.println("---startDate----"+startDate +"------endDate----"+endDate+"------parentId----"+parentId ); | |
| 152 | + //System.out.println("------------------------------------------------------"); | |
| 153 | + // System.out.println("---startDate----"+startDate +"------endDate----"+endDate+"------parentId----"+parentId ); | |
| 154 | 154 | BaseObjectResponse br = antenatalExaminationFacade.AntExChuFuZSyncXtlc(startDate, endDate, parentId); |
| 155 | 155 | return br; |
| 156 | 156 | } |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
View file @
bf3e565
| ... | ... | @@ -685,14 +685,14 @@ |
| 685 | 685 | Integer doctorService = pser.getDoctorWeek(); |
| 686 | 686 | |
| 687 | 687 | if (serviceWeek != null) { |
| 688 | - | |
| 689 | 688 | Date endTime = DateUtil.addWeek(currentDate, serviceWeek); |
| 690 | - if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { | |
| 691 | - endTime = DateUtil.addWeek(lastMenses, 42); | |
| 689 | + if (pser.getPerType()==1){ | |
| 690 | + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { | |
| 691 | + endTime = DateUtil.addWeek(lastMenses, 42); | |
| 692 | + } | |
| 692 | 693 | } |
| 693 | 694 | Integer endWeek = DateUtil.getWeek(lastMenses, currentDate) + serviceWeek; |
| 694 | 695 | endWeek = endWeek > 42 ? 42 : endWeek; |
| 695 | - | |
| 696 | 696 | pser.setSerStartTime(currentDate); |
| 697 | 697 | pser.setSerEndTime(endTime); |
| 698 | 698 | pser.setSerStartWeek(DateUtil.getWeek(lastMenses, currentDate)); |
| 699 | 699 | |
| ... | ... | @@ -700,10 +700,13 @@ |
| 700 | 700 | } |
| 701 | 701 | if (doctorService != null) { |
| 702 | 702 | Date endTime = DateUtil.addWeek(currentDate, doctorService); |
| 703 | - if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { | |
| 704 | - endTime = DateUtil.addWeek(lastMenses, 42); | |
| 703 | + if (pser.getPerType()==1){ | |
| 704 | + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { | |
| 705 | + endTime = DateUtil.addWeek(lastMenses, 42); | |
| 706 | + } | |
| 705 | 707 | } |
| 706 | 708 | |
| 709 | + | |
| 707 | 710 | Integer endWeek = DateUtil.getWeek(lastMenses, currentDate) + doctorService; |
| 708 | 711 | endWeek = endWeek > 42 ? 42 : endWeek; |
| 709 | 712 | |
| 710 | 713 | |
| ... | ... | @@ -726,10 +729,13 @@ |
| 726 | 729 | |
| 727 | 730 | Date startTime = pser.getSerStartTime(); |
| 728 | 731 | Date endTime = DateUtil.addWeek(pser.getSerEndTime(), serviceWeek); |
| 729 | - if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { | |
| 730 | - endTime = DateUtil.addWeek(lastMenses, 42); | |
| 732 | + if (pser.getPerType()==1){ | |
| 733 | + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { | |
| 734 | + endTime = DateUtil.addWeek(lastMenses, 42); | |
| 735 | + } | |
| 731 | 736 | } |
| 732 | 737 | |
| 738 | + | |
| 733 | 739 | Integer startWeek = DateUtil.getWeek(lastMenses, startTime); |
| 734 | 740 | Integer endWeek = DateUtil.getWeek(lastMenses, pser.getSerEndTime()) + serviceWeek; |
| 735 | 741 | endWeek = endWeek > 42 ? 42 : endWeek; |
| ... | ... | @@ -750,8 +756,10 @@ |
| 750 | 756 | if (doctorWeek != null && doctorWeek > 0) { |
| 751 | 757 | if (pser.getDocEndTime() != null && pser.getDocEndTime().getTime() > new Date().getTime()) { |
| 752 | 758 | Date endTime = DateUtil.addWeek(pser.getDocEndTime(), doctorWeek); |
| 753 | - if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { | |
| 754 | - endTime = DateUtil.addWeek(lastMenses, 42); | |
| 759 | + if (pser.getPerType()==1){ | |
| 760 | + if (endTime.getTime() > DateUtil.addWeek(lastMenses, 42).getTime()) { | |
| 761 | + endTime = DateUtil.addWeek(lastMenses, 42); | |
| 762 | + } | |
| 755 | 763 | } |
| 756 | 764 | Date startTime = pser.getSerStartTime(); |
| 757 | 765 |