修改了统计

yxh

2 天以前 a485c380200759905753498875dd260cce9cddf7

修改了统计

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonorchargeorganController.java

@@ -166,4 +166,16 @@
    public TableDataInfo getListBySpStatChange(@RequestBody SpStatChangeReq spStatChangeReq) {
        return getDataTable(serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq));
    }

    /**
     * 导出收款统计
     */
    @ApiOperation("导出收款统计")
    @Log(title = "收款统计", businessType = BusinessType.EXPORT)
    @GetMapping("/exportChange")
    public AjaxResult exportChange(SpStatChangeReq spStatChangeReq) {
        List<SpStatChange> list = serviceDonorchargeorganService.getListBySpStatChange(spStatChangeReq);
        ExcelUtil<SpStatChange> util = new ExcelUtil<SpStatChange>(SpStatChange.class);
        return util.exportExcel(list, "收款统计数据");
    }
}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceFunddetailController.java

@@ -12,6 +12,7 @@
import com.ruoyi.project.domain.FunddetailReqVo;
import com.ruoyi.project.domain.ServiceFunddetail;
import com.ruoyi.project.domain.SpStatBonus;
import com.ruoyi.project.domain.SpStatBonusDept;
import com.ruoyi.project.domain.SpStatBonusReq;
import com.ruoyi.project.domain.vo.TaxMoneyByItemEO;
import com.ruoyi.project.domain.vo.TaxMoneySumEO;
@@ -234,11 +235,58 @@
        // 金额 0.00 不显示
        for (SpStatBonus row : list) {
            row.setAmount(blankZero(row.getAmount()));
            row.setMamount(blankZero(row.getMamount()));
            row.setSamount(blankZero(row.getSamount()));
            row.setYamount(blankZero(row.getYamount()));
        }
        ExcelUtil<SpStatBonus> util = new ExcelUtil<SpStatBonus>(SpStatBonus.class);
        return util.exportExcel(list, "绩效统计数据");
    }

    /**
     * 导出绩效统计（按业务组）
     */
    @ApiOperation("导出绩效统计（按业务组）")
    @Log(title = "绩效统计", businessType = BusinessType.EXPORT)
    @GetMapping("/exportBonusDept")
    public AjaxResult exportBonusDept(SpStatBonusReq spStatBonusReq) {
        List<SpStatBonus> list = serviceFunddetailService.getListBySpStatBonus(spStatBonusReq);
        Map<String, SpStatBonusDept> grouped = new LinkedHashMap<String, SpStatBonusDept>();
        for (SpStatBonus row : list) {
            String key = row.getDeptId() != null ? String.valueOf(row.getDeptId()) : row.getDeptName();
            if (key == null) {
                key = "";
            }
            SpStatBonusDept dept = grouped.get(key);
            if (dept == null) {
                dept = new SpStatBonusDept();
                dept.setDeptname(row.getDeptName() == null ? "未分组" : row.getDeptName());
                dept.setAmount(BigDecimal.ZERO);
                dept.setMamount(BigDecimal.ZERO);
                dept.setSamount(BigDecimal.ZERO);
                dept.setYamount(BigDecimal.ZERO);
                grouped.put(key, dept);
            }
            dept.setAmount(dept.getAmount().add(nz(row.getAmount())));
            dept.setMamount(dept.getMamount().add(nz(row.getMamount())));
            dept.setSamount(dept.getSamount().add(nz(row.getSamount())));
            dept.setYamount(dept.getYamount().add(nz(row.getYamount())));
        }
        List<SpStatBonusDept> result = new ArrayList<SpStatBonusDept>(grouped.values());
        for (SpStatBonusDept dept : result) {
            dept.setAmount(blankZero(dept.getAmount()));
            dept.setMamount(blankZero(dept.getMamount()));
            dept.setSamount(blankZero(dept.getSamount()));
            dept.setYamount(blankZero(dept.getYamount()));
        }
        ExcelUtil<SpStatBonusDept> util = new ExcelUtil<SpStatBonusDept>(SpStatBonusDept.class);
        return util.exportExcel(result, "绩效统计（按业务组）");
    }

    private BigDecimal nz(BigDecimal value) {
        return value == null ? BigDecimal.ZERO : value;
    }

    private BigDecimal blankZero(BigDecimal value) {
        return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
    }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatCaseController.java

@@ -84,5 +84,46 @@
        return util.exportExcel(list, "案例统计数据");
    }

    /**
     * 导出案例统计（按业务组）
     */
    @ApiOperation("导出案例统计（按业务组）")
    @Log(title = "案例统计", businessType = BusinessType.EXPORT)
    @GetMapping("/exportDept")
    public AjaxResult exportDept(SpStatCaseReq spStatCaseReq) {
        List<SpStatCase> list = spstatCaseService.getListBypower(spStatCaseReq);
        Map<String, SpStatCaseDept> grouped = new LinkedHashMap<String, SpStatCaseDept>();
        for (SpStatCase row : list) {
            String key = StringUtils.isNotEmpty(row.getDeptid()) ? row.getDeptid() : row.getDeptname();
            if (key == null) {
                key = "";
            }
            SpStatCaseDept dept = grouped.get(key);
            if (dept == null) {
                dept = new SpStatCaseDept();
                dept.setDeptname(row.getDeptname() == null ? "未分组" : row.getDeptname());
                dept.setCaseTotal(0);
                dept.setTerminationTotal(0);
                grouped.put(key, dept);
            }
            dept.setCaseTotal(dept.getCaseTotal() + toInt(row.getWorkflowsum()));
            dept.setTerminationTotal(dept.getTerminationTotal() + toInt(row.getTerminationcase()));
        }
        List<SpStatCaseDept> result = new ArrayList<SpStatCaseDept>(grouped.values());
        ExcelUtil<SpStatCaseDept> util = new ExcelUtil<SpStatCaseDept>(SpStatCaseDept.class);
        return util.exportExcel(result, "案例统计（按业务组）");
    }

    private int toInt(String value) {
        if (StringUtils.isEmpty(value)) {
            return 0;
        }
        try {
            return Integer.parseInt(value.trim());
        } catch (NumberFormatException e) {
            return 0;
        }
    }


}

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/SpStatExpenseController.java

@@ -7,6 +7,7 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.SpStatExpense;
import com.ruoyi.project.domain.SpStatExpenseDept;
import com.ruoyi.project.domain.SpStatExpenseReq;
import com.ruoyi.project.service.SpstatExpenseService;
import io.swagger.annotations.Api;
@@ -20,7 +21,10 @@
import org.springframework.web.bind.annotation.RestController;

import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

/**
 * 报销统计
@@ -68,6 +72,56 @@
        return util.exportExcel(list, "费用统计数据");
    }

    /**
     * 导出费用统计（按业务组）
     */
    @ApiOperation("导出费用统计（按业务组）")
    @Log(title = "费用统计", businessType = BusinessType.EXPORT)
    @GetMapping("/exportDept")
    public AjaxResult exportDept(SpStatExpenseReq spStatExpenseReq) {
        List<SpStatExpense> list = spstatExpenseService.getListBySpstatExpense(spStatExpenseReq);
        Map<String, SpStatExpenseDept> grouped = new LinkedHashMap<String, SpStatExpenseDept>();
        for (SpStatExpense row : list) {
            String key = row.getDeptmentno() != null ? row.getDeptmentno() : row.getDeptmentName();
            if (key == null) {
                key = "";
            }
            SpStatExpenseDept dept = grouped.get(key);
            if (dept == null) {
                dept = new SpStatExpenseDept();
                dept.setDeptname(row.getDeptmentName() == null ? "未分组" : row.getDeptmentName());
                dept.setAmount(BigDecimal.ZERO);
                dept.setExpertfee(BigDecimal.ZERO);
                dept.setEthicalistfee(BigDecimal.ZERO);
                dept.setMedicalcost(BigDecimal.ZERO);
                dept.setOfficecost(BigDecimal.ZERO);
                dept.setReimcost(BigDecimal.ZERO);
                grouped.put(key, dept);
            }
            dept.setAmount(dept.getAmount().add(nz(row.getAmount())));
            dept.setExpertfee(dept.getExpertfee().add(nz(row.getExpertfee())));
            dept.setEthicalistfee(dept.getEthicalistfee().add(nz(row.getEthicalistfee())));
            dept.setMedicalcost(dept.getMedicalcost().add(nz(row.getMedicalcost())));
            dept.setOfficecost(dept.getOfficecost().add(nz(row.getOfficecost())));
            dept.setReimcost(dept.getReimcost().add(nz(row.getReimcost())));
        }
        List<SpStatExpenseDept> result = new ArrayList<SpStatExpenseDept>(grouped.values());
        for (SpStatExpenseDept dept : result) {
            dept.setAmount(blankZero(dept.getAmount()));
            dept.setExpertfee(blankZero(dept.getExpertfee()));
            dept.setEthicalistfee(blankZero(dept.getEthicalistfee()));
            dept.setMedicalcost(blankZero(dept.getMedicalcost()));
            dept.setOfficecost(blankZero(dept.getOfficecost()));
            dept.setReimcost(blankZero(dept.getReimcost()));
        }
        ExcelUtil<SpStatExpenseDept> util = new ExcelUtil<SpStatExpenseDept>(SpStatExpenseDept.class);
        return util.exportExcel(result, "费用统计（按业务组）");
    }

    private BigDecimal nz(BigDecimal value) {
        return value == null ? BigDecimal.ZERO : value;
    }

    private BigDecimal blankZero(BigDecimal value) {
        return (value == null || value.compareTo(BigDecimal.ZERO) == 0) ? null : value;
    }

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

@@ -19,13 +19,6 @@
    private static final long serialVersionUID = 1L;

    /**
     * 统计月份
     */
    @ApiModelProperty("统计月份")
    @Excel(name = "统计月份", sort = 1)
    private String bonusmonth;

    /**
     * 部门id
     */
    @ApiModelProperty("部门id")
@@ -35,7 +28,7 @@
     * 部门名称
     */
    @ApiModelProperty("部门名称")
    @Excel(name = "业务组", sort = 2)
    @Excel(name = "业务组", sort = 1)
    private String deptName;

    /**
@@ -48,14 +41,35 @@
     * 收益人姓名
     */
    @ApiModelProperty("收益人姓名")
    @Excel(name = "专职人员", sort = 3)
    @Excel(name = "绩效人员", sort = 2)
    private String beneficiaryname;

    /**
     * 金额
     * 绩效金额
     */
    @ApiModelProperty("金额")
    @Excel(name = "金额", sort = 4, scale = 2)
    @ApiModelProperty("绩效金额")
    @Excel(name = "绩效金额", sort = 3, scale = 2)
    private BigDecimal amount;

    /**
     * 月度绩效金额
     */
    @ApiModelProperty("月度绩效金额")
    @Excel(name = "月度绩效", sort = 4, scale = 2)
    private BigDecimal mamount;

    /**
     * 季度绩效金额
     */
    @ApiModelProperty("季度绩效金额")
    @Excel(name = "季度绩效", sort = 5, scale = 2)
    private BigDecimal samount;

    /**
     * 年度绩效金额
     */
    @ApiModelProperty("年度绩效金额")
    @Excel(name = "年度绩效", sort = 6, scale = 2)
    private BigDecimal yamount;

}

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

@@ -41,11 +41,5 @@
    @ApiModelProperty("pausername")
    private String pausername = "";

    /**
     * 绩效类型：1、月度、2、季度、3、年度
     */
    @ApiModelProperty("绩效类型：1、月度、2、季度、3、年度")
    private String pabonustype = "";

}


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

@@ -1,61 +1,49 @@
package com.ruoyi.project.domain;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.Date;
import java.math.BigDecimal;

/**
 * SP_STAT_EXPENSE
 * 收款统计（SP_STAT_CHANGE）
 *
 * @author ls
 * @date 2024-03-11
 */
@Data
@ApiModel("SP_STAT_CHANGE ")
@ApiModel("SP_STAT_CHANGE")
public class SpStatChange {
    private static final long serialVersionUID = 1L;

    /**
     * 医院编号
     */
    @ApiModelProperty("医院编号")
    private String hospitalno;

    /**
     * 医院名称
     */
    @ApiModelProperty("医院名称")
    @Excel(name = "医院名称", sort = 1, width = 30)
    private String hospitalname;

    /**
     * 接收月份
     * 已收金额
     */
//    @ApiModelProperty("接收月份")
//    @JsonFormat(pattern = "yyyy-MM")
    private String receivemonth;
    @ApiModelProperty("已收金额")
    @Excel(name = "已收金额", sort = 2, width = 16, cellType = Excel.ColumnType.NUMERIC, scale = 2)
    private BigDecimal amount;

    /**
     * 器官实际收到费用
     * 未收金额
     */
    @ApiModelProperty("器官实际收到费用")
    private double amount;
    @ApiModelProperty("未收金额")
    @Excel(name = "未收金额", sort = 3, width = 16, cellType = Excel.ColumnType.NUMERIC, scale = 2)
    private BigDecimal nonpayment;

    /**
     * nonpayment
     * 应收金额
     */
    @ApiModelProperty("nonpayment")
    private double nonpayment;

    /**
     * organcharge
     */
    @ApiModelProperty("organcharge")
    private double organcharge;

    @ApiModelProperty("应收金额")
    @Excel(name = "应收金额", sort = 4, width = 16, cellType = Excel.ColumnType.NUMERIC, scale = 2)
    private BigDecimal organcharge;

}


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

@@ -1,12 +1,11 @@
package com.ruoyi.project.domain;

import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * SP_STAT_EXPENSE
 * 收款统计查询条件
 *
 * @author ls
 * @date 2024-03-11
@@ -17,17 +16,21 @@
    private static final long serialVersionUID = 1L;

    /**
     * 医院编号
     * 案例时间开始
     */
    @ApiModelProperty("医院编号")
    private String pahospitalno = "";
    @ApiModelProperty("案例时间开始")
    private String pabegtime = "";

    /**
     * 0:未收款情况   1:已收款统计
     * 案例时间结束
     */
    @ApiModelProperty("0:未收款情况   1:已收款统计")
    private String pachageflag;
    @ApiModelProperty("案例时间结束")
    private String paendtime = "";

    /**
     * 医院名称（模糊）
     */
    @ApiModelProperty("医院名称")
    private String pahospitalname = "";

}


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

@@ -19,13 +19,6 @@
    private static final long serialVersionUID = 1L;

    /**
     * 统计月份
     */
    @ApiModelProperty("统计月份")
    @Excel(name = "统计月份", sort = 1)
    private String applymonth;

    /**
     * 人员编号
     */
    @ApiModelProperty("人员编号")
@@ -35,7 +28,7 @@
     * 人员姓名
     */
    @ApiModelProperty("人员姓名")
    @Excel(name = "专职人员", sort = 3)
    @Excel(name = "专职人员", sort = 2)
    private String username;

    /**
@@ -48,49 +41,49 @@
     * 部门名称
     */
    @ApiModelProperty("部门名称")
    @Excel(name = "业务组", sort = 2)
    @Excel(name = "业务组", sort = 1)
    private String deptmentName;

    /**
     * 金额合计
     */
    @ApiModelProperty("金额合计")
    @Excel(name = "报销总金额", sort = 4, scale = 2)
    @Excel(name = "报销总金额", sort = 3, scale = 2)
    private BigDecimal amount;

    /**
     * 专家劳务费
     */
    @ApiModelProperty("专家劳务费")
    @Excel(name = "专家费", sort = 5, scale = 2)
    @Excel(name = "专家费", sort = 4, scale = 2)
    private BigDecimal expertfee;

    /**
     * 伦理专家费
     */
    @ApiModelProperty("伦理专家费")
    @Excel(name = "伦理专家费", sort = 6, scale = 2)
    @Excel(name = "伦理专家费", sort = 5, scale = 2)
    private BigDecimal ethicalistfee;

    /**
     * 医学成本
     */
    @ApiModelProperty("医学成本")
    @Excel(name = "医学成本", sort = 7, scale = 2)
    @Excel(name = "医学成本", sort = 6, scale = 2)
    private BigDecimal medicalcost;

    /**
     * 办公费
     */
    @ApiModelProperty("办公费")
    @Excel(name = "办公费", sort = 8, scale = 2)
    @Excel(name = "办公费", sort = 7, scale = 2)
    private BigDecimal officecost;

    /**
     * 差旅费
     */
    @ApiModelProperty("差旅费")
    @Excel(name = "差旅费", sort = 9, scale = 2)
    @Excel(name = "差旅费", sort = 8, scale = 2)
    private BigDecimal reimcost;

}

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/ServiceDonorchargeorganMapper.java

@@ -31,6 +31,6 @@
    public Boolean updateDonorchargeorgan(ServiceDonorchargeorgan serviceDonorchargeorgan);


    public List<SpStatChange> getListBySpStatChange(@Param("PAHOSPITALNO") String PAHOSPITALNO, @Param("PACHAGEFLAG") String PACHAGEFLAG);
    public List<SpStatChange> getListBySpStatChange(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PAHOSPITALNAME") String PAHOSPITALNAME);

}

 ruoyi-project/src/main/java/com/ruoyi/project/mapper/SpStatBonusMapper.java

@@ -22,6 +22,6 @@
@Mapper
public interface SpStatBonusMapper extends BaseMapper<SpStatBonus> {

    List<SpStatBonus> getListBySpStatBonus(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME, @Param("PABONUSTYPE") String PABONUSTYPE);
    List<SpStatBonus> getListBySpStatBonus(@Param("PABEGTIME") String PABEGTIME, @Param("PAENDTIME") String PAENDTIME, @Param("PADEPTNO") String PADEPTNO, @Param("PAUSERNAME") String PAUSERNAME);

}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceDonorchargeorganServiceImpl.java

@@ -111,7 +111,10 @@

    @Override
    public List<SpStatChange> getListBySpStatChange(SpStatChangeReq spStatChangeReq) {
        return serviceDonorchargeorganMapper.getListBySpStatChange(spStatChangeReq.getPahospitalno(), spStatChangeReq.getPachageflag());
        return serviceDonorchargeorganMapper.getListBySpStatChange(
                spStatChangeReq.getPabegtime(),
                spStatChangeReq.getPaendtime(),
                spStatChangeReq.getPahospitalname());
    }

}

 ruoyi-project/src/main/java/com/ruoyi/project/service/impl/ServiceFunddetailServiceImpl.java

@@ -505,11 +505,6 @@

    @Override
    public List<SpStatBonus> getListBySpStatBonus(SpStatBonusReq spStatBonusReq) {
        // PABONUSTYPE 在存储过程中是 INTEGER，空串会报 Incorrect integer value；空值按 0（全部）处理
        String bonusType = spStatBonusReq.getPabonustype();
        if (bonusType == null || bonusType.trim().isEmpty()) {
            bonusType = "0";
        }
        return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername(), bonusType);
        return spStatBonusMapper.getListBySpStatBonus(spStatBonusReq.getPabegtime(), spStatBonusReq.getPaendtime(), spStatBonusReq.getPadeptno(), spStatBonusReq.getPausername());
    }
}

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

@@ -148,9 +148,20 @@
        where id = #{id} and del_flag=0
    </update>

    <resultMap id="SpStatChangeResult" type="com.ruoyi.project.domain.SpStatChange">
        <result property="hospitalname" column="HospitalName"/>
        <result property="amount" column="amount"/>
        <result property="nonpayment" column="nonpayment"/>
        <result property="organcharge" column="organcharge"/>
    </resultMap>

    <select id="getListBySpStatChange" statementType="CALLABLE"
            resultType="com.ruoyi.project.domain.SpStatChange">
        call `SP_STAT_CHANGE`(#{PAHOSPITALNO,mode=IN,jdbcType=VARCHAR},#{PACHAGEFLAG,mode=IN,jdbcType=VARCHAR})
            resultMap="SpStatChangeResult">
        call `SP_STAT_CHANGE`(
            #{PABEGTIME,mode=IN,jdbcType=VARCHAR},
            #{PAENDTIME,mode=IN,jdbcType=VARCHAR},
            #{PAHOSPITALNAME,mode=IN,jdbcType=VARCHAR}
        )
    </select>

</mapper>

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

@@ -6,18 +6,19 @@

    <!-- 新 SP 返回 dept_id / dept_name 下划线列，项目未开启 mapUnderscoreToCamelCase，需显式映射 -->
    <resultMap id="SpStatBonusResult" type="com.ruoyi.project.domain.SpStatBonus">
        <result property="bonusmonth" column="bonusmonth"/>
        <result property="deptId" column="dept_id"/>
        <result property="deptName" column="dept_name"/>
        <result property="beneficiaryno" column="BeneficiaryNo"/>
        <result property="beneficiaryname" column="BeneficiaryName"/>
        <result property="amount" column="amount"/>
        <result property="mamount" column="mamount"/>
        <result property="samount" column="samount"/>
        <result property="yamount" column="yamount"/>
    </resultMap>

    <select id="getListBySpStatBonus" statementType="CALLABLE"
            resultMap="SpStatBonusResult">
        call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR},#{PABONUSTYPE,mode=IN,jdbcType=VARCHAR
        })
        call `SP_STAT_BONUS`(#{PABEGTIME,mode=IN,jdbcType=VARCHAR},#{PAENDTIME,mode=IN,jdbcType=VARCHAR},#{PADEPTNO,mode=IN,jdbcType=VARCHAR},#{PAUSERNAME,mode=IN,jdbcType=VARCHAR})
    </select>

</mapper>