Commit 7212566437d363e671d97973f6e74778b8bf555f
1 parent
0c89449b5c
Exists in
master
and in
6 other branches
婚检
Showing 1 changed file with 7 additions and 1 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
7212566
| ... | ... | @@ -163,12 +163,18 @@ |
| 163 | 163 | archiveMap.put("sex", "男"); |
| 164 | 164 | } |
| 165 | 165 | } |
| 166 | - archiveMap.put("birthday", getBirthday(archiveModel.getBirthday()!=null ? DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()) : null )); | |
| 166 | + archiveMap.put("birthday", getBirthday(archiveModel.getBirthday() != null ? DateUtil.getyyyy_MM_dd(archiveModel.getBirthday()) : null)); | |
| 167 | 167 | archiveMap.put("phone", archiveModel.getPhone()); |
| 168 | 168 | archiveMap.put("residence", CommonsHelper.getResidence(archiveModel.getProvinceRegisterId(), archiveModel.getCityRegisterId(), |
| 169 | 169 | archiveModel.getAreaRegisterId(), archiveModel.getStreetRegisterId(), archiveModel.getAddressRegister(), basicConfigService)); |
| 170 | 170 | archiveMap.put("workUnit", archiveModel.getWorkUnit()); |
| 171 | 171 | archiveMap.put("buildDay", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); |
| 172 | + | |
| 173 | + //增加返回基本信息字段（gxk） | |
| 174 | + archiveMap.put("nation",FunvCommonUtil.getBaseicConfigByid(archiveModel.getLevelTypeId(), basicConfigService)); | |
| 175 | + archiveMap.put("address",CommonsHelper.getResidence(archiveModel.getProvinceId(),archiveModel.getCityId(), | |
| 176 | + archiveModel.getAreaId(),archiveModel.getStreetId(),archiveModel.getAddress(),basicConfigService)); | |
| 177 | + | |
| 172 | 178 | } |
| 173 | 179 | |
| 174 | 180 | resultMap.put("archiveResult", archiveMap); |