Commit f3790d7e77038f90fccc1ff75e79fb49243fa43d
1 parent
4d74e61d7a
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 11 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
View file @
f3790d7
| ... | ... | @@ -216,9 +216,17 @@ |
| 216 | 216 | List<PremaritalCheckup> checkupList = premaritalCheckupService.queryPremaritalCheckup(query); |
| 217 | 217 | if (CollectionUtils.isNotEmpty(checkupList)) { |
| 218 | 218 | PremaritalCheckup model = checkupList.get(0); |
| 219 | - checkupResult.setSpouseName(model.getSpouseName()); | |
| 220 | - checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId()); | |
| 221 | - checkupResult.setSpouseCertificateNum(model.getCertificateNum()); | |
| 219 | + | |
| 220 | + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); | |
| 221 | + archiveQuery.setYn(YnEnums.YES.getId()); | |
| 222 | + archiveQuery.setId(model.getParentId()); | |
| 223 | + List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(archiveQuery); | |
| 224 | + if (CollectionUtils.isNotEmpty(modelList)) { | |
| 225 | + ResidentsArchiveModel model1 = modelList.get(0); | |
| 226 | + checkupResult.setSpouseName(model1.getUsername()); | |
| 227 | + checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId()); | |
| 228 | + checkupResult.setSpouseCertificateNum(model.getCertificateNum()); | |
| 229 | + } | |
| 222 | 230 | } |
| 223 | 231 | } |
| 224 | 232 | archiveMap.put("spouseCode", spouseCode); |