diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java index 61097ca..8756681 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/utils/HelperUtils.java @@ -235,17 +235,23 @@ public class HelperUtils { /** * 返回孕周天数 - * @param lastMenses + * @param start * @return */ - public static String getYunWeekDay(Date lastMenses) { - if (lastMenses == null) + public static String getYunWeekDay(Date start) { + if(start == null) { + return "孕0周+0天"; + } + String weekStr = ""; + Integer betweenDay = DateUtils.daysBetween(start, new Date()); + Integer week = betweenDay / 7; + Integer day = betweenDay % 7; + weekStr = "孕" + week + "周"; + if (day > 0) { - return ""; + weekStr += day + "天"; } - int day = DateUtils.daysBetween(lastMenses,new Date()); - - return day+"天"; + return weekStr; }