emm

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java

@@ -97,6 +97,7 @@ public class DataSyncRecordDisabilityDTO implements Serializable {
      * 性别1男2女
      */
     private Integer gender;
+    private String genderCn;
 
     /**
      * 户籍地址

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/dataSync/ResiInfoDTO.java

@@ -40,6 +40,7 @@ public class ResiInfoDTO implements Serializable {
      * 残疾等级(状况)
      */
     private String cjzk;
+    private String cjzkCn;
 
     /**
      * 残疾类别
@@ -60,6 +61,7 @@ public class ResiInfoDTO implements Serializable {
      * 性别
      */
     private String gender;
+    private String genderCn;
 
     /**
      * 监护人

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java

@@ -100,6 +100,9 @@ public class DataSyncRecordDisabilityEntity extends BaseEpmetEntity {
 	 */
 	private Integer gender;
 
+	@TableField(exist = false)
+	private Integer genderCn;
+
 	/**
 	 * 户籍地址
 	 */

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDisabilityServiceImpl.java

@@ -97,12 +97,36 @@ 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 ? "男" : "女");
         IcResiUserDTO icResiUserDTO = icResiUserService.get(entity.getIcResiUserId());
         ResiInfoDTO resiInfoDTO = ConvertUtils.sourceToTarget(icResiUserDTO, ResiInfoDTO.class);
+        resiInfoDTO.setGenderCn(resiInfoDTO.getGender().equals(NumConstant.ONE_STR) ? "男" : "女");
+        resiInfoDTO.setCjzkCn(getCj(resiInfoDTO.getCjzk()));
         result.setResiInfo(resiInfoDTO);
         return result;
     }
 
+    public String getCj(String cj){
+        String result = "";
+        switch (cj){
+            case NumConstant.ONE_STR:
+                result = "一级";
+                break;
+            case NumConstant.TWO_STR:
+                result = "二级";
+                break;
+            case NumConstant.THREE_STR:
+                result = "三级";
+                break;
+            case NumConstant.FOUR_STR:
+                result = "四级";
+                break;
+            default:
+                break;
+        }
+        return result;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void save(DataSyncRecordDisabilityDTO dto) {