From aed95ab2728dea06b8d18de61169080b024b0fc4 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Oct 2022 15:45:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/DataSyncConfigServiceImpl.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
index c2e6565703..b7590a5987 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
@@ -252,6 +252,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
                 }
 
                 String thirdResultData = thirdResult.getData();
+                if(StringUtils.isBlank(thirdResultData)){
+                    continue;
+                }
                 JSONObject thirdResultObject = JSON.parseObject(thirdResultData);
 
                 LambdaQueryWrapper<DataSyncRecordDeathEntity> queryWrapper = new LambdaQueryWrapper<>();

From 972e583dfd924ff596b2b2fab49bcb8346067f8d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Fri, 21 Oct 2022 15:49:57 +0800
Subject: [PATCH 2/2] genderCn

---
 .../main/resources/mapper/DataSyncRecordDisabilityDao.xml   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
index 889ca27c1c..bca57f359e 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncRecordDisabilityDao.xml
@@ -132,6 +132,12 @@
                     when d.deal_status = 2 then '处理失败'
                 else '处理失败' end) as dealStatusName,
                d.now_add as address,
+               (
+                   case when d.GENDER='1' then '男'
+                   when d.GENDER='2' then '女'
+                   else '未知'
+                   end
+                )as genderCn,
                d.*
         FROM data_sync_record_disability d
         WHERE DEL_FLAG = 0