From 1f27e4341aaf3bffe393c3e75e987ed21072d2b1 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 17 Oct 2022 10:08:23 +0800
Subject: [PATCH] emm

---
 .../com/epmet/dto/form/dataSync/ResiInfoDTO.java   |  1 +
 .../impl/DataSyncRecordDisabilityServiceImpl.java  | 14 ++++++++++++++
 .../com/epmet/service/impl/IcNatServiceImpl.java   |  2 +-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java
index f9a8295e53..1f148219b5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java
@@ -46,6 +46,7 @@ public class ResiInfoDTO implements Serializable {
      * 残疾类别
      */
     private String cjlb;
+    private String cjlbCn;
 
     /**
      * 民族
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 400e00f000..3b564f19e7 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
@@ -102,6 +102,7 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
         ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
         resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");
         resiInfoDTO.setCjzkCn(getCj(resiInfoDTO.getCjzk()));
+        resiInfoDTO.setCjlbCn(getCjlb(resiInfoDTO.getCjlb(),entity.getCustomerId()));
         result.setResiInfo(resiInfoDTO);
         return result;
     }
@@ -127,6 +128,19 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl<DataSyn
         return result;
     }
 
+    public String getCjlb(String cjlb,String customerId){
+        IcFormOptionsQueryFormDTO formDTO = new IcFormOptionsQueryFormDTO();
+        formDTO.setCustomerId(customerId);
+        formDTO.setFormCode("resi_base_info");
+        formDTO.setColumnName("CJLB");
+        Result<Map<String, String>> cjlbOptionsMap = operCustomizeOpenFeignClient.getOptionsMap(formDTO);
+        if (!cjlbOptionsMap.success()){
+            throw new EpmetException("operCustomizeOpenFeignClient.getOptionsMap执行失败");
+        }
+        Map<String, String> data = cjlbOptionsMap.getData();
+        return data.get(cjlb);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(DataSyncRecordDisabilityDTO dto) {
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
index 08c6fa1079..3a9282b9bb 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcNatServiceImpl.java
@@ -94,7 +94,7 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
          * 1.采样时间为空，检测时间和结果有一个为空就报错
          * 2.采样时间不为空，检测时间和结果可以为空【如果不为空 检测时间和结果都不为空】
          */
-        if ((null == formDTO.getSampleTime() && null == formDTO.getNatTime() || org.apache.commons.lang3.StringUtils.isBlank(formDTO.getNatResult()))){
+        if ((null == formDTO.getSampleTime() && (null == formDTO.getNatTime() || org.apache.commons.lang3.StringUtils.isBlank(formDTO.getNatResult())))){
             throw new EpmetException(EpmetErrorCode.SAMPLE_TIME_AND_RESULT_IS_NULL_ERROR.getCode());
         }
         if(null != formDTO.getSampleTime() && org.apache.commons.lang3.StringUtils.isNotBlank(formDTO.getNatResult()) && null == formDTO.getNatTime()){