Commit 6fc9dc18de6ef6602677cd16e64ca768c097499c
1 parent
46b3d82436
Exists in
master
bug
Showing 1 changed file with 8 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
6fc9dc1
| ... | ... | @@ -806,13 +806,18 @@ |
| 806 | 806 | dueWeek = "已分娩"; |
| 807 | 807 | } else { |
| 808 | 808 | int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); |
| 809 | - String week = (days / 7) + ""; | |
| 810 | - int day = (days % 7); | |
| 811 | - dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 809 | + if (days > 7 * 42 - 1) { | |
| 810 | + dueWeek = "已分娩"; | |
| 811 | + } else { | |
| 812 | + String week = (days / 7) + ""; | |
| 813 | + int day = (days % 7); | |
| 814 | + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 815 | + } | |
| 812 | 816 | } |
| 813 | 817 | } catch (Exception e) { |
| 814 | 818 | // 什么都不干 |
| 815 | 819 | } |
| 820 | + patientManagerQueryModel.setCardNo(DefenceUtils.getId(patients.getCardNo())); | |
| 816 | 821 | patientManagerQueryModel.setBuildWeek(dueWeek); |
| 817 | 822 | patientManagerQueryModel.setBookbuildingDoctor(StringUtils.isEmpty(patients.getBookbuildingDoctor()) ? "" : usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor())).getName()); |
| 818 | 823 | patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); |