From b1f71eb64ff0b1e746c896eddf1c8c73c94369e4 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Tue, 25 Oct 2022 13:50:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=AF=A6=E6=83=85=E7=A9=BA=E6=8C=87?=
 =?UTF-8?q?=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataSyncRecordDisabilityServiceImpl.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
index e3d397c44d..d91d29cc3a 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
@@ -11,6 +11,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.page.PageData;
@@ -97,7 +98,10 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
     public DataSyncRecordDisabilityDTO get(String id) {
         DataSyncRecordDisabilityEntity entity = baseDao.selectById(id);
         DataSyncRecordDisabilityDTO result = ConvertUtils.sourceToTarget(entity, DataSyncRecordDisabilityDTO.class);
-        result.setGenderCn(result.getGender() == NumConstant.ONE ? "男" : "女");
+        result.setGenderCn(GenderEnum.UN_KNOWN.getName());
+        if (null != result.getGender()){
+            result.setGenderCn(result.getGender() == NumConstant.ONE ? "男" : "女");
+        }
         IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
         ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
         resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");

From 970e59652d2293733e56a936fb31347e04a026a8 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 25 Oct 2022 15:18:09 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/DataSyncRecordDisabilityDao.xml   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bca57f359e..1d16260551 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
@@ -112,7 +112,7 @@
                             when id = #{item.id} then '处理失败'
                         </when>
                         <otherwise>
-                            when id = #{item.id} then '处理成功'
+                            when id = #{item.id} then ''
                         </otherwise>
                     </choose>
                 </foreach>

From 1b69f4e0838c5758e2254ea816c47c79c99b0e96 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Tue, 25 Oct 2022 15:39:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=A4=84=E7=90=86=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DataSyncRecordDisabilityServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
index d91d29cc3a..4ee1cdb64e 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java
@@ -245,6 +245,7 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
         String customerId = tokenDto.getCustomerId();
         String userId = tokenDto.getUserId();
         List<String> all = Arrays.asList(ids);
+        // 根据IDs查询烟台拉取的残疾信息
         List<DataSyncRecordDisabilityEntity> entities = baseDao.selectBatchIds(all);
         IcFormOptionsQueryFormDTO formDTO = new IcFormOptionsQueryFormDTO();
         formDTO.setCustomerId(customerId);
@@ -273,7 +274,8 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
                 }
             });
         });
-        entities.stream().filter(e -> StringUtils.isBlank(e.getCjzk()) || StringUtils.isBlank(e.getCjlb())).forEach(e -> e.setUpdateStatus(true));
+        // cjzk，cjlb为空的，处理结果赋值 处理失败
+//        entities.stream().filter(e -> StringUtils.isBlank(e.getCjzk()) || StringUtils.isBlank(e.getCjlb())).forEach(e -> e.setUpdateStatus(true));
         // 变更记录
         List<CategoryStatusAndIdDTO> collect = entities.stream().map(m -> {
             CategoryStatusAndIdDTO dto = new CategoryStatusAndIdDTO();