Commit 7721bc004f671172c3026c2553eeeb749294dd57
Exists in
master
Merge remote-tracking branch 'origin/master'
Showing 1 changed file
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
View file @
7721bc0
| ... | ... | @@ -811,13 +811,18 @@ |
| 811 | 811 | dueWeek = "已分娩"; |
| 812 | 812 | } else { |
| 813 | 813 | int days = DateUtil.daysBetween(patients.getLastMenses(), patients.getBookbuildingDate()); |
| 814 | - String week = (days / 7) + ""; | |
| 815 | - int day = (days % 7); | |
| 816 | - dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 814 | + if (days > 7 * 42 - 1) { | |
| 815 | + dueWeek = "已分娩"; | |
| 816 | + } else { | |
| 817 | + String week = (days / 7) + ""; | |
| 818 | + int day = (days % 7); | |
| 819 | + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); | |
| 820 | + } | |
| 817 | 821 | } |
| 818 | 822 | } catch (Exception e) { |
| 819 | 823 | // 什么都不干 |
| 820 | 824 | } |
| 825 | + patientManagerQueryModel.setCardNo(DefenceUtils.getId(patients.getCardNo())); | |
| 821 | 826 | patientManagerQueryModel.setBuildWeek(dueWeek); |
| 822 | 827 | patientManagerQueryModel.setBookbuildingDoctor(StringUtils.isEmpty(patients.getBookbuildingDoctor()) ? "" : usersService.getUsers(Integer.valueOf(patients.getBookbuildingDoctor())).getName()); |
| 823 | 828 | patientManagerQueryModel.setBookbuildingDate(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate())); |