Commit e4d3cd6a4ae67156c37f283c4d085cb7edf7ca19
1 parent
779a61ee60
Exists in
master
and in
8 other branches
update
Showing 1 changed file with 4 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
View file @
e4d3cd6
| ... | ... | @@ -96,6 +96,8 @@ |
| 96 | 96 | model.setPhone(addRequest.getPhone()); |
| 97 | 97 | |
| 98 | 98 | model.setSex(SystemConfig.WOMAN_ID); |
| 99 | + //建档日期 | |
| 100 | + model.setBuildDay(DateUtil.getYmd(new Date())); | |
| 99 | 101 | |
| 100 | 102 | ResidentsArchiveModel residentsArchiveModel = residentsArchiveService.addResident(model); |
| 101 | 103 | |
| 102 | 104 | |
| ... | ... | @@ -179,10 +181,10 @@ |
| 179 | 181 | archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); |
| 180 | 182 | archiveMap.put("username", archiveModel.getUsername()); |
| 181 | 183 | archiveMap.put("birthday",archiveModel.getBirthday()); |
| 182 | - archiveMap.put("age", archiveModel.getAge()); | |
| 184 | + archiveMap.put("age", StringUtils.isEmpty(archiveModel.getBirthday()) ? "" : DateUtil.getAge(DateUtil.parseYMD(archiveModel.getBirthday()))); | |
| 183 | 185 | archiveMap.put("phone", archiveModel.getPhone()); |
| 184 | 186 | archiveMap.put("id", archiveModel.getId()); |
| 185 | - if (StringUtils.isNotEmpty(archiveModel.getSex()) && archiveModel.getSex().equals(SystemConfig.WOMAN_ID)){ | |
| 187 | + if (StringUtils.isEmpty(archiveModel.getSex()) || archiveModel.getSex().equals(SystemConfig.WOMAN_ID )){ | |
| 186 | 188 | archiveMap.put("sex", "女"); |
| 187 | 189 | }else { |
| 188 | 190 | archiveMap.put("sex", "男"); |