From 559009f9846bcae0b9548d3615a791ee52e60e0f Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 3 Mar 2020 15:24:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E9=87=8F=E5=85=83=E7=B4=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/operate/web/facade/MicroelementFacade.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) 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 4cb7913..97bb9a4 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 @@ -182,15 +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(pat.getLastMenses(),13)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,13)); nextCheckWeek = "孕13周前后"; } else if (week >= 13 && week < 28) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),28)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,28)); nextCheckWeek = "孕28周前后"; } } @@ -198,27 +199,27 @@ public class MicroelementFacade { { if (week < 8) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),8)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,8)); nextCheckWeek = "孕8周前后"; } else if (week >= 8 && week < 13) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),13)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,13)); nextCheckWeek = "孕13周前后"; } else if (week >= 13 && week < 20) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),20)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,20)); nextCheckWeek = "孕20周前后"; } else if (week >= 20 && week < 28) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),28)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,28)); nextCheckWeek = "孕28周前后"; } else if (week >= 28 && week < 36) { - nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(pat.getLastMenses(),36)); + nextCheckDate = DateUtil.getyyyy_MM_dd1(DateUtil.addWeek(lastMenses,36)); nextCheckWeek = "孕36周前后"; } } -- 1.8.3.1