From e4d3cd6a4ae67156c37f283c4d085cb7edf7ca19 Mon Sep 17 00:00:00 2001 From: landong2015 Date: Tue, 13 Dec 2016 09:27:56 +0800 Subject: [PATCH] update --- .../java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index 3c61be5..6efa494 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -96,6 +96,8 @@ public class FolicAcidFacade { model.setPhone(addRequest.getPhone()); model.setSex(SystemConfig.WOMAN_ID); + //建档日期 + model.setBuildDay(DateUtil.getYmd(new Date())); ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); @@ -179,10 +181,10 @@ public class FolicAcidFacade { archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); archiveMap.put("username", archiveModel.getUsername()); archiveMap.put("birthday",archiveModel.getBirthday()); - archiveMap.put("age", archiveModel.getAge()); + archiveMap.put("age", StringUtils.isEmpty(archiveModel.getBirthday()) ? "" : DateUtil.getAge(DateUtil.parseYMD(archiveModel.getBirthday()))); archiveMap.put("phone", archiveModel.getPhone()); archiveMap.put("id", archiveModel.getId()); - if (StringUtils.isNotEmpty(archiveModel.getSex()) && archiveModel.getSex().equals(SystemConfig.WOMAN_ID)){ + if (StringUtils.isEmpty(archiveModel.getSex()) || archiveModel.getSex().equals(SystemConfig.WOMAN_ID )){ archiveMap.put("sex", "女"); }else { archiveMap.put("sex", "男"); -- 1.8.3.1