Commit 38611d53c54acf25965c178499caf6455fffe3a6
1 parent
8c00ca5040
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
38611d5
| ... | ... | @@ -777,8 +777,8 @@ |
| 777 | 777 | String householdAddress = findName(patient.getProvinceId()) + findName(patient.getCityId()) + findName(patient.getAreaId()) + findName(patient.getStreetId()) + patient.getAddress(); |
| 778 | 778 | temp.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */ |
| 779 | 779 | temp.put("lastMenses", DateUtil.getyyyy_MM_dd(patient.getLastMenses())); |
| 780 | - temp.put("week", 3 == patient.getType() ? "已分娩" : DateUtil.getWeekDesc(patient.getLastMenses(), new Date())); /** 当前孕周 */ | |
| 781 | - temp.put("buildWeek", DateUtil.getWeekDesc(patient.getLastMenses(), patient.getBookbuildingDate())); /** 建档孕周 */ | |
| 780 | + temp.put("week", DateUtil.getWeek(patient.getLastMenses(), new Date()) > 42 ? "已分娩" : DateUtil.getWeekDesc(patient.getLastMenses(), new Date())); /** 当前孕周 */ | |
| 781 | + temp.put("buildWeek", DateUtil.getWeek(patient.getLastMenses(), patient.getBookbuildingDate()) > 42 ? "已分娩" : DateUtil.getWeekDesc(patient.getLastMenses(), patient.getBookbuildingDate())); /** 建档孕周 */ | |
| 782 | 782 | temp.put("buildDate", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate())); /** 建档日期 */ |
| 783 | 783 | temp.put("doctorName", couponMapper.getUserName(patient.getBookbuildingDoctor())); |
| 784 | 784 | temp.put("hospitalName", couponMapper.findHospitalNameById(patient.getHospitalId())); |