Commit 532fbbab593139376b2fbe43bbbfd26fcf7c09ff
1 parent
07c7958dd4
Exists in
master
and in
6 other branches
改bug
Showing 1 changed file with 2 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
532fbba
| ... | ... | @@ -1069,7 +1069,8 @@ |
| 1069 | 1069 | String householdAddress = findName(pt.getProvinceId()) + findName(pt.getCityId()) + findName(pt.getAreaId()) + findName(pt.getStreetId()) + pt.getAddress(); |
| 1070 | 1070 | temp.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */ |
| 1071 | 1071 | temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); /** 当前孕周 */ |
| 1072 | - temp.put("buildWeek", DateUtil.getWeekDesc(pt.getBookbuildingDate(), new Date())); /** 建档孕周 */ | |
| 1072 | + System.out.println(pt.getBookbuildingDate().toLocaleString()); | |
| 1073 | + temp.put("buildWeek", DateUtil.getWeekDesc(pt.getLastMenses(), pt.getBookbuildingDate())); /** 建档孕周 */ | |
| 1073 | 1074 | temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); /** 建档日期 */ |
| 1074 | 1075 | temp.put("doctorName", couponMapper.getUserName(pt.getBookbuildingDoctor())); |
| 1075 | 1076 | temp.put("hospitalName", couponMapper.findHospitalNameById(pt.getHospitalId())); |