diff --git a/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java b/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java index d076bf3..c9159aa 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java @@ -81,4 +81,15 @@ public class NuCommonApi { redisUtil.sSet("canuploadparams", fileName + "-" + fileSize); return Result.ok(200); } + + /** + * 根据数据字典编码查询对应项 + * + * @param code 数据字典编码 + * @return + */ + @GetMapping("/queryAreaNameById") + public Result queryDictItemByCode(@RequestParam("code") String code) { + return Result.ok(); + } } diff --git a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java index 760dc23..7a7e2ce 100644 --- a/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java +++ b/nursing-unit-common/src/main/java/com/nu/dto/ElderInfoMQDto.java @@ -63,6 +63,17 @@ public class ElderInfoMQDto implements Serializable { * 医保类型 */ private String medicalType; + /** + *长者失能等级报销类型 + * 省医保syb_reimbursement_type + * 职工医保zgyb_reimbursement_type + * 居民医保jmyb_reimbursement_type + */ + private String disabilityReimbursementType; + /** + * 长者缴费状态 字典elder_payment_status + */ + private String paymentStatus; /** * 报销类型 */ diff --git a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java index f4fa713..46077bd 100644 --- a/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java +++ b/nursing-unit-common/src/main/java/com/nu/entity/ElderInfoEntity.java @@ -63,6 +63,17 @@ public class ElderInfoEntity implements Serializable { * 医保类型 */ private String medicalType; + /** + *长者失能等级报销类型 + * 省医保syb_reimbursement_type + * 职工医保zgyb_reimbursement_type + * 居民医保jmyb_reimbursement_type + */ + private String disabilityReimbursementType; + /** + * 长者缴费状态 字典elder_payment_status + */ + private String paymentStatus; /** * 报销类型 */ diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java index 43d6b6b..f5aaf24 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java @@ -102,6 +102,21 @@ public class ElderInfo implements Serializable { @Dict(dicCode = "medical_insurance_type") @ApiModelProperty(value = "医保类型") private java.lang.String medicalType; + /** + *长者失能等级报销类型 + * 省医保syb_reimbursement_type + * 职工医保zgyb_reimbursement_type + * 居民医保jmyb_reimbursement_type + */ + @ApiModelProperty(value = "长者失能等级报销类型") + private String disabilityReimbursementType; + /** + * 长者缴费状态 字典elder_payment_status + */ + @Excel(name = "医保类型", width = 15, dicCode = "elder_payment_status") + @Dict(dicCode = "elder_payment_status") + @ApiModelProperty(value = "长者缴费状态") + private String paymentStatus; /** * 报销类型 */