From 464562ae4d6a4d8e7b32e7356400e0f34688afff Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 23 Jul 2021 09:50:06 +0800 Subject: [PATCH] update --- .../operate/web/service/impl/CervicalCancerServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index e107334..b4f2186 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -668,9 +668,17 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { result.setCreateUserStr(createUserStr); result.setCreateTime(DateUtil.getyyyy_MM_dd(model.getCreated())); - String addressStr = CommonsHelper.getFullAddress(model.getProvinceId(),model.getAreaId(),model.getStreetId(),model.getAddress(),basicConfigService); + String addressStr = CommonsHelper.getFullAddress(model.getProvinceId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService); result.setAddressStr(addressStr); + + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery(); + archiveQuery.setId(model.getParentId()); + List residentsArchiveModels = residentsArchiveService.queryResident(archiveQuery); + if (CollectionUtils.isNotEmpty(residentsArchiveModels)) { + result.setNationStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getNationId(), basicConfigService)); + result.setLevelTypeStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getLevelTypeId(), basicConfigService)); + } list.add(result); } return list; -- 1.8.3.1