emm

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;
 
     /**
      * 民族

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) {

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