From a10c54d662c8421f7eb53517d6b6d8814b436507 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 27 Mar 2018 17:16:32 +0800 Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=84=BF=E4=BF=9D=E8=AE=A1?= =?UTF-8?q?=E7=AE=97=E9=A2=84=E4=BA=A7=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/BabyCheckFacade.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 6278e45..b2c1620 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 @@ -773,11 +773,23 @@ public class BabyCheckFacade { base.setId(id); base.setSex(model.getSex()); base.setDueWeek(model.getDueWeek()); - base.setDueDate(DateUtil.getyyyy_MM_dd(model.getDueDate())); + base.setName(model.getName()); base.setCardNo(model.getMcertNo()); base.setPregnantCertificateTypeId(model.getMcertTypeId()); 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)); + } + + 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