diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java index 97bb9a4..528c1e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MicroelementFacade.java @@ -146,8 +146,8 @@ public class MicroelementFacade { data.put("week", DateUtil.getWeekDesc(pat.getLastMenses(), model.getCreated())); data.put("microelements", model.getMicroelements()); data.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); - - int week = DateUtil.getWeek(pat.getLastMenses(),model.getCreated()); + Date lastMenses = DateUtil.addDay(pat.getLastMenses(),1); + int week = DateUtil.getWeek(lastMenses,model.getCreated()); Map> contents = new HashMap<>(); boolean isNormal = false; @@ -182,16 +182,16 @@ public class MicroelementFacade { String nextCheckDate = ""; String nextCheckWeek = ""; - Date lastMenses = DateUtil.addDay(pat.getLastMenses(),1); + if (isNormal) { if (week < 13) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,13)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),13)); nextCheckWeek = "孕13周前后"; } else if (week >= 13 && week < 28) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,28)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),28)); nextCheckWeek = "孕28周前后"; } } @@ -199,27 +199,27 @@ public class MicroelementFacade { { if (week < 8) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,8)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),8)); nextCheckWeek = "孕8周前后"; } else if (week >= 8 && week < 13) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,13)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),13)); nextCheckWeek = "孕13周前后"; } else if (week >= 13 && week < 20) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,20)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),20)); nextCheckWeek = "孕20周前后"; } else if (week >= 20 && week < 28) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,28)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),28)); nextCheckWeek = "孕28周前后"; } else if (week >= 28 && week < 36) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,36)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),36)); nextCheckWeek = "孕36周前后"; } }