jiangjiazhi / regional-platform

Download as
Browse Code ยป

Commit 464562ae4d6a4d8e7b32e7356400e0f34688afff

Authored by liquanyu
1 parent 776d9530b5
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 1 changed file with 9 additions and 1 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 464562a
... ... @@ -668,9 +668,17 @@
668 668 result.setCreateUserStr(createUserStr);
669 669 result.setCreateTime(DateUtil.getyyyy_MM_dd(model.getCreated()));
670 670  
671   - String addressStr = CommonsHelper.getFullAddress(model.getProvinceId(),model.getAreaId(),model.getStreetId(),model.getAddress(),basicConfigService);
  671 + String addressStr = CommonsHelper.getFullAddress(model.getProvinceId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService);
672 672 result.setAddressStr(addressStr);
673 673  
  674 +
  675 + ResidentsArchiveQuery archiveQuery = new ResidentsArchiveQuery();
  676 + archiveQuery.setId(model.getParentId());
  677 + List <ResidentsArchiveModel> residentsArchiveModels = residentsArchiveService.queryResident(archiveQuery);
  678 + if (CollectionUtils.isNotEmpty(residentsArchiveModels)) {
  679 + result.setNationStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getNationId(), basicConfigService));
  680 + result.setLevelTypeStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getLevelTypeId(), basicConfigService));
  681 + }
674 682 list.add(result);
675 683 }
676 684 return list;