同步捐献器官费用表明细

sinake

4 天以前 4e7c32e0ac0496b54582c6a84b30abc34ee03b1c

同步捐献器官费用表明细

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorgan.java

@@ -90,6 +90,14 @@
    private String organname;

    /**
     * 付款器官名称
     */
    @ApiModelProperty("付款器官名称")
    @Excel(name = "付款器官名称")
    @TableField("pay_organ_name")
    private String payOrganName;

    /**
     * 器官应收费用
     */
    @ApiModelProperty("器官应收费用")

 ruoyi-project/src/main/java/com/ruoyi/project/domain/ServiceDonorchargeorganVO.java

@@ -94,6 +94,12 @@
    @Excel(name = "器官类别名称 详见字典sys_Organ")
    private String organname;

    /**
     * 付款器官名称
     */
    @ApiModelProperty("付款器官名称")
    @Excel(name = "付款器官名称")
    private String payOrganName;

    /**
     * 器官应收费用

 ruoyi-project/src/main/java/com/ruoyi/project/domain/dto/OrganfeeExportDto.java

@@ -40,6 +40,12 @@
    private String organname;

    /**
     * 付款器官名称
     */
    @Excel(name = "付款器官名称", width = 18)
    private String payOrganName;

    /**
     * 器官分配编号
     */
    @Excel(name = "器官分配编号", width = 25)
@@ -72,7 +78,7 @@
    /**
     * 应收金额-实收金额
     */
    @Excel(name = "应收金额-实收金额", width = 18, cellType = Excel.ColumnType.NUMERIC)
    @Excel(name = "未付金额", width = 18, cellType = Excel.ColumnType.NUMERIC)
    private BigDecimal receivableBalance;

    /**

 ruoyi-project/src/main/resources/mapper/project/ServiceDonorchargeorganMapper.xml

@@ -15,6 +15,7 @@
        <result property="hospitalno" column="HospitalNo"/>
        <result property="organno" column="OrganNo"/>
        <result property="organname" column="OrganName"/>
        <result property="payOrganName" column="pay_organ_name"/>
        <result property="organcharge" column="organcharge"/>
        <result property="organtime" column="organtime"/>
        <result property="chargeoperator" column="chargeoperator"/>
@@ -48,6 +49,7 @@
               HospitalNo,
               OrganNo,
               OrganName,
               pay_organ_name,
               organcharge,
               organtime,
               chargeoperator,
@@ -109,6 +111,7 @@
        o.HospitalNo,
        o.OrganNo,
        o.OrganName,
        o.pay_organ_name,
        o.organcharge,
        o.organtime,
        o.chargeoperator,
@@ -173,6 +176,7 @@
            <if test="hospitalno != null  and hospitalno != ''">HospitalNo = #{hospitalno},</if>
            <if test="organno != null  and organno != ''">OrganNo = #{organno},</if>
            <if test="organname != null  and organname != ''">OrganName = #{organname},</if>
            <if test="payOrganName != null  and payOrganName != ''">pay_organ_name = #{payOrganName},</if>
            <if test="organcharge != null ">organcharge = #{organcharge},</if>
            <if test="organtime != null ">organtime = #{organtime},</if>
            <if test="chargeoperator != null  and chargeoperator != ''">chargeoperator = #{chargeoperator},</if>