From e768545857d8e6e05f8affed7dd1b0af05950c2e Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 14 Oct 2022 09:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=B7=BB=E5=8A=A0=E7=81=AB?=
 =?UTF-8?q?=E5=8C=96=E6=97=B6=E9=97=B4=E3=80=81=E7=99=BB=E8=AE=B0=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E5=90=8D=E7=A7=B0=E3=80=81=E6=89=80=E5=B1=9E=E7=BD=91?=
 =?UTF-8?q?=E6=A0=BC=E8=B5=8B=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/DataSyncRecordDeathServiceImpl.java    | 4 ++++
 .../src/main/resources/mapper/DataSyncRecordDeathDao.xml      | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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<DataSyncReco
         formDTO.setAgencyId(null != staffInfoCacheResult ? staffInfoCacheResult.getAgencyId() : null);
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage());
         List<DataSyncRecordDeathDTO> 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<DataSyncRecordDeathDTO> 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