diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java index 517a6bf26d..d6768e09da 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/DataSyncRecordDisabilityDTO.java +++ b/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; /** * 户籍地址 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 b42e47618d..f9a8295e53 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 @@ -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; /** * 监护人 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java index 5d2987cdb3..81f8fd7a06 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/DataSyncRecordDisabilityEntity.java +++ b/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; + /** * 户籍地址 */ 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 4fed49f5de..400e00f000 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 @@ -97,12 +97,36 @@ public class DataSyncRecordDisabilityServiceImpl extends BaseServiceImpl