Merge remote-tracking branch 'origin/master'

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;
     /**
      * 报销类型
      */

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;
     /**
      * 报销类型
      */

nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/entity/ElderInfo.java

@@ -99,6 +99,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;
     /**
      * 报销类型
      */