diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java index ff3eeb5..085bf51 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java @@ -270,7 +270,7 @@ public class ViewFacade { //产检基本信息 map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckTime())); //产检孕周 - map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients)); + map.put("cDueWeek", ResolveUtils.getPregnancyWeek(patients.getLastMenses(),data.getCheckTime())); String checkDoctor = ""; if (org.apache.commons.lang.StringUtils.isNotEmpty(data.getProdDoctor())){ @@ -601,7 +601,7 @@ public class ViewFacade { //产检基本信息 map.put("checkDate",DateUtil.getyyyy_MM_dd(data.getCheckDate())); - map.put("currentDueDate",checkWeek(patients)); + map.put("currentDueDate",ResolveUtils.getPregnancyWeek(patients.getLastMenses(), data.getCheckDate())); String checkDoctor = "";