diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java index a521596..dbeba79 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java @@ -216,9 +216,17 @@ public class PremaritalCheckupFacade { List checkupList = premaritalCheckupService.queryPremaritalCheckup(query); if (CollectionUtils.isNotEmpty(checkupList)) { PremaritalCheckup model = checkupList.get(0); - checkupResult.setSpouseName(model.getSpouseName()); - checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId()); - checkupResult.setSpouseCertificateNum(model.getCertificateNum()); + + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setYn(YnEnums.YES.getId()); + archiveQuery.setId(model.getParentId()); + List modelList = residentsArchiveService.queryResident(archiveQuery); + if (CollectionUtils.isNotEmpty(modelList)) { + ResidentsArchiveModel model1 = modelList.get(0); + checkupResult.setSpouseName(model1.getUsername()); + checkupResult.setSpouseCertificateTypeId(model.getCertificateTypeId()); + checkupResult.setSpouseCertificateNum(model.getCertificateNum()); + } } } archiveMap.put("spouseCode", spouseCode);