From ef9cd6fb83cb5e4fda86865edbe65159a598f1b4 Mon Sep 17 00:00:00 2001 From: yangfei Date: Thu, 29 Mar 2018 15:55:19 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E7=94=9F=E6=97=A5=E3=80=81?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E5=AD=95=E5=91=A8=E8=AE=A1=E7=AE=97=E6=9C=AB?= =?UTF-8?q?=E6=AC=A1=E6=9C=88=E7=BB=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/operate/web/Test.java | 13 ++++++++++--- .../platform/operate/web/facade/BabyCheckFacade.java | 18 +++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java index 6f13e60..8a0d07a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/Test.java @@ -1,12 +1,12 @@ package com.lyms.platform.operate.web; -import com.lyms.platform.common.enums.BabyDeformityEnums; -import com.lyms.platform.common.utils.EnumUtil; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.pojo.BasicConfig; import net.sourceforge.pinyin4j.PinyinHelper; import org.apache.log4j.Logger; import java.util.Comparator; +import java.util.Date; import java.util.List; import java.util.Map; @@ -23,7 +23,14 @@ public class Test { // List jctc = EnumUtil.toJson(ChildCareEnums.JCTCEnums.class); // System.out.println(jctc); - System.out.println(EnumUtil.toJson(BabyDeformityEnums.class)); + //根据出生孕周计算末次月经 + Date LastMens = DateUtil.addWeek(DateUtil.parseYMD("2018-01-01"),-34); + //根据末次月经计算预产期 + Date dueDate = DateUtil.addMonth(LastMens, 9); + dueDate = DateUtil.addDay(dueDate, 7); + System.out.println(DateUtil.getyyyy_MM_dd(dueDate)); + // System.out.println(EnumUtil.toJson(BabyDeformityEnums.class)); + // int day = DateUtil.getExcludeMonthDay(DateUtil.parseYMD("2018-04-19"),new Date()); // System.out.println(day); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index b2c1620..4e77492 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -780,13 +780,17 @@ public class BabyCheckFacade { base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); //计算儿童的预产期 if(model.getBirth()!=null&&model.getDueWeek()!=null&&model.getDueWeek()<37){//早产儿，根据出生孕周计算末次月经，在根据末次月经计算预产期 - //根据出生孕周计算末次月经 - Date LastMens = DateUtil.addWeek(model.getBirth(),-model.getDueWeek()); - //根据末次月经计算预产期 - Date dueDate = DateUtil.addMonth(LastMens, 9); - dueDate = DateUtil.addDay(dueDate, 7); - //返回预产期 - base.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); + if(DateUtil.isGtOrEq(model.getBirth(),model.getDueDate())){//如果相等，预产期与生日一致 + //根据出生孕周计算末次月经 + Date LastMens = DateUtil.addWeek(model.getBirth(),-model.getDueWeek()); + //根据末次月经计算预产期 + Date dueDate = DateUtil.addMonth(LastMens, 9); + dueDate = DateUtil.addDay(dueDate, 7); + //返回预产期 + base.setDueDate(DateUtil.getyyyy_MM_dd(dueDate)); + }else{ + base.setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); + } } -- 1.8.3.1