diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java index 679dcbd..01765a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java @@ -1974,7 +1974,8 @@ public class PatientServiceFacade { String week = (patients.getFmWeek() / 7) + ""; int day = (patients.getFmWeek() % 7); dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); - babyWeek=DateUtil.getBabyMonthAge(patients.getFmDate(),new Date()); + int babyDay=DateUtil.daysBetween(patients.getFmDate(),new Date()); + babyWeek= babyDay/7 +""; } birthResult.setDueWeek(dueWeek); birthResult.setParentId(patients.getId()); @@ -2026,7 +2027,8 @@ public class PatientServiceFacade { String week = (patients.getFmWeek() / 7) + ""; int day = (patients.getFmWeek() % 7); dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); - babyWeek=DateUtil.getBabyMonthAge(patients.getFmDate(),new Date()); + int babyDay=DateUtil.daysBetween(patients.getFmDate(),new Date()); + babyWeek= babyDay/7 +""; } birthResult.setDueWeek(dueWeek);