From c339e54033e25628258779a3c0d41f960ff8e791 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Sat, 31 Mar 2018 22:46:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E4=BF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) 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 c448218..f5010b1 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,7 +780,9 @@ public class BabyCheckFacade { base.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); //计算儿童的预产期 if(model.getBirth()!=null&&model.getDueWeek()!=null&&model.getDueWeek()<37){//早产儿，根据出生孕周计算末次月经，在根据末次月经计算预产期 - if(DateUtil.isGtOrEq(model.getBirth(),model.getDueDate())){//如果相等，预产期与生日一致 + String birthStr = DateUtil.getyyyy_MM_dd(model.getBirth()); + Date ymdBirth = DateUtil.parseYMD(birthStr); + if(model.getDueDate()==null || ymdBirth.getTime() == model.getDueDate().getTime()){//预产期为空或者预产期与生日一致进行计算真实预产期 //根据出生孕周计算末次月经 Date LastMens = DateUtil.addWeek(model.getBirth(),-model.getDueWeek()); //根据末次月经计算预产期 @@ -793,7 +795,6 @@ public class BabyCheckFacade { } } - base.setBirthday(DateUtil.getyyyy_MM_dd(model.getBirth())); base.setSourceId(org.apache.commons.lang.StringUtils.isNotEmpty(model.getSource())?model.getSource():model.getId()); if (model.getPid() != null) { -- 1.8.3.1