Commit 689436379a556f758300042283a7a946e2b47a54
1 parent
ce7c1fe690
Exists in
master
and in
7 other branches
update bug
Showing 2 changed files with 2 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
6894363
| ... | ... | @@ -139,7 +139,7 @@ |
| 139 | 139 | archiveMap.put("certificateNum", archiveModel.getCertificateNum()); |
| 140 | 140 | archiveMap.put("certificateTypeId", archiveModel.getCertificateTypeId()); |
| 141 | 141 | archiveMap.put("username", archiveModel.getUsername()); |
| 142 | - archiveMap.put("age", archiveModel.getAge()); | |
| 142 | + archiveMap.put("age", DateUtil.getAge(archiveModel.getBirthday())); | |
| 143 | 143 | if (archiveModel.getSex()!=null){ |
| 144 | 144 | if (archiveModel.getSex().equals(SystemConfig.WOMAN_ID)){ |
| 145 | 145 | archiveMap.put("sex", "女"); |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
View file @
6894363
| ... | ... | @@ -213,7 +213,7 @@ |
| 213 | 213 | |
| 214 | 214 | //历史建档记录 |
| 215 | 215 | Map<String,Object> mapData = new HashMap<>(); |
| 216 | - mapData.put("firstBuildData",newModel); | |
| 216 | + mapData.put("firstBuildData",getResult(newModel)); | |
| 217 | 217 | mapData.put("archiveHistory",resultList); |
| 218 | 218 | mapData.put("initBuildDate", DateUtil.getyyyy_MM_dd(new Date())); |
| 219 | 219 | list.add(mapData); |