diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 7c80873..51cca6e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -1069,7 +1069,8 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService String householdAddress = findName(pt.getProvinceId()) + findName(pt.getCityId()) + findName(pt.getAreaId()) + findName(pt.getStreetId()) + pt.getAddress(); temp.put("householdAddress", householdAddress.replace("null", "")); /** 户籍地 */ temp.put("week", DateUtil.getWeekDesc(pt.getLastMenses(), new Date())); /** 当前孕周 */ - temp.put("buildWeek", DateUtil.getWeekDesc(pt.getBookbuildingDate(), new Date())); /** 建档孕周 */ + System.out.println(pt.getBookbuildingDate().toLocaleString()); + temp.put("buildWeek", DateUtil.getWeekDesc(pt.getLastMenses(), pt.getBookbuildingDate())); /** 建档孕周 */ temp.put("buildDate", DateUtil.getyyyy_MM_dd(pt.getBookbuildingDate())); /** 建档日期 */ temp.put("doctorName", couponMapper.getUserName(pt.getBookbuildingDoctor())); temp.put("hospitalName", couponMapper.findHospitalNameById(pt.getHospitalId()));