Merge remote-tracking branch 'origin/dev_compare_data' into dev_compare_data

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<>();

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