diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java index d51b6b2fb6..e83e251478 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java @@ -50,6 +50,10 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl records = baseDao.pageSelect(formDTO.getCustomerId(),formDTO.getIdCard(), formDTO.getName(), formDTO.getAgencyId()); + records.forEach(r->{ + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(r.getGridId()); + r.setGridName(null != gridInfoCache ? gridInfoCache.getGridNamePath() : StrConstant.EPMETY_STR); + }); PageInfo pi = new PageInfo<>(records); return new PageData<>(records, pi.getTotal()); } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml index dc3a8511a7..67e8f18649 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDeathDao.xml @@ -40,7 +40,9 @@ d.ADDRESS, d.IC_RESI_USER_ID, d.GRID_ID, - d.AGENCY_ID + d.AGENCY_ID, + d.CREMATION_TIME, + d.ORGAN_NAME FROM data_sync_record_death d WHERE