From e3eda0315c8fd5e96995da6adc6e34de244b4cc0 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 26 Sep 2017 11:46:00 +0800 Subject: [PATCH] update code --- .../com/lyms/platform/operate/web/facade/SieveRecordFacade.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java index d462358..2e62949 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveRecordFacade.java @@ -278,9 +278,13 @@ public class SieveRecordFacade { map.put("certeTypeId",model.getPcerteTypeId()); //证件类型 map.put("phone",model.getPhone());//手机号码 map.put("birth",DateUtil.getyyyy_MM_dd(model.getBirth())); //出生日期 - map.put("age",DateUtil.getAge(model.getBirth(), new Date())); //年龄 + map.put("age",DateUtil.getAge(model.getBirth())); //年龄 map.put("lastMenses",DateUtil.getyyyy_MM_dd(model.getLastMenses())); //末次月经 - map.put("currentDueWeek",DateUtil.getWeekDesc(model.getLastMenses(), new Date())); //当前孕周 + + int days= DateUtil.daysBetween(model.getLastMenses(),new Date()); + String week = com.lyms.platform.common.utils.StringUtils.dueWeek(days); + + map.put("currentDueWeek",week); //当前孕周 map.put("dueDate",DateUtil.getyyyy_MM_dd(model.getDueDate())); //预产期 map.put("created",DateUtil.gety_m_dhm(model.getCreated()));//创建日期 map.put("status",model.getStatus());//导出状态 -- 1.8.3.1