变更

liusheng

2024-07-26 fb4d7127cd860b39e1c1c4242cfbbc09a659fc7a

变更

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

@@ -1,6 +1,7 @@
package com.ruoyi.project.domain;

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -18,106 +19,143 @@
 */
@Data
@ApiModel("VIEW")
public class VDonationworkflow extends BaseEntity
{
public class VDonationworkflow {
    private static final long serialVersionUID = 1L;

    /** $column.columnComment */
    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    private Long id;

    /** 姓名 */
    /**
     * 姓名
     */
    @ApiModelProperty("姓名")
    @Excel(name = "姓名")
    private String name;

    /** 证件号码 */
    /**
     * 证件号码
     */
    @ApiModelProperty("证件号码")
    @Excel(name = "证件号码")
    private String idcardno;

    /** 工作流 */
    /**
     * 工作流
     */
    @ApiModelProperty("工作流")
    @Excel(name = "工作流")
    private Long workflow;

    /** 终止案例：0开启   1终止   默认 0 */
    /**
     * 终止案例：0开启   1终止   默认 0
     */
    @ApiModelProperty("终止案例：0开启   1终止   默认 0")
    @Excel(name = "终止案例：0开启   1终止   默认 0")
    private Long terminationcase;

    /** 部门/组编号 */
    /**
     * 部门/组编号
     */
    @ApiModelProperty("部门/组编号")
    @Excel(name = "部门/组编号")
    private Long deptid;

    /** 部门/组名称 */
    /**
     * 部门/组名称
     */
    @ApiModelProperty("部门/组名称")
    @Excel(name = "部门/组名称")
    private String deptname;

    /** 报告者编号 */
    /**
     * 报告者编号
     */
    @ApiModelProperty("报告者编号")
    @Excel(name = "报告者编号")
    private String reporterno;

    /** 报告者姓名 */
    /**
     * 报告者姓名
     */
    @ApiModelProperty("报告者姓名")
    @Excel(name = "报告者姓名")
    private String reportername;

    /** 案例时间 */
    /**
     * 案例时间
     */
    @ApiModelProperty("案例时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "案例时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date donatetime;

    /** 报告时间 */
    /**
     * 报告时间
     */
    @ApiModelProperty("报告时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "报告时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date reporttime;

    /** 省级评估组核心成员结论 见字典sys_CoreAssessConclusion */
    /**
     * 省级评估组核心成员结论 见字典sys_CoreAssessConclusion
     */
    @ApiModelProperty("省级评估组核心成员结论 见字典sys_CoreAssessConclusion")
    @Excel(name = "省级评估组核心成员结论 见字典sys_CoreAssessConclusion")
    private String coreteamassessconclusion;

    /** 省级评估组核心成员评估时间 */
    /**
     * 省级评估组核心成员评估时间
     */
    @ApiModelProperty("省级评估组核心成员评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "省级评估组核心成员评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date coreteamassesstime;

    /** 签署日期 */
    /**
     * 签署日期
     */
    @ApiModelProperty("签署日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "签署日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date signdate;

    /** 专家结论  见字典伦理结论 */
    /**
     * 专家结论  见字典伦理结论
     */
    @ApiModelProperty("专家结论  见字典伦理结论")
    @Excel(name = "专家结论  见字典伦理结论")
    private Long expertconclusion;

    /** 结论时间 */
    /**
     * 结论时间
     */
    @ApiModelProperty("结论时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "结论时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date conclusiontime;

    /** $column.columnComment */
    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "结论时间")
    private Long organcount;

    /** 手术开始时间 */
    /**
     * 手术开始时间
     */
    @ApiModelProperty("手术开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "手术开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date operationbegtime;

    /** 完成时间 */
    /**
     * 完成时间
     */
    @ApiModelProperty("完成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")

 ruoyi-project/src/main/java/com/ruoyi/project/service/IServiceDonateorganService.java

@@ -1,6 +1,7 @@
package com.ruoyi.project.service;

import java.util.List;
import java.util.Map;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonateorgan;
@@ -65,7 +66,7 @@

    List<organNumberByOrgVO> getOrganNumberByOrg(TimeVO timeVO);

    List<OrganInfoVO> getOrganCount(TimeVO timeVO);
    Map<String, Object> getOrganCount(TimeVO timeVO);

    List<ServiceDonateorgan> saveData(List<ServiceDonateorgan> serviceDonateorgans);


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

@@ -719,41 +719,33 @@
    }

    @Override
    public List<OrganInfoVO> getOrganCount(TimeVO timeVO) {
        List<OrganInfoVO> l = new ArrayList<>();

        //List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganMapper.selectAll(timeVO);
        Map<String, Integer> map_organs = new HashMap<String, Integer>();
        //List<String> organNo = new ArrayList<>();
    public Map<String, Object> getOrganCount(TimeVO timeVO) {
        Map<String, Object> map = new HashMap<>();
        List<OrganInfoVO> organInfoVOList = new ArrayList<>();
        Integer countSum = 0;
        Integer abandonCountSum = 0;

        List<SysDictData> data = dictDataMapper.selectDictDataByType("sys_Organ");
        if (StringUtils.isNull(data)) {
            data = new ArrayList<SysDictData>();
        }


        for (SysDictData sysDictData : data) {
            if (!sysDictData.getDictValue().equals("C00")) {
                DistinctOrgansCount distinctOrgansCount = serviceDonateorganMapper.getDistinctOrgansCount(sysDictData.getDictValue(), timeVO.getStarttime(), timeVO.getEndtime(), timeVO.getCity(), timeVO.getReporterno());
//                map_organs.put(sysDictData.getDictValue(), distinctOrgansCount.getGainsum());
//                map_organs.put("abandonCount", distinctOrgansCount.getAbandonCount());
                OrganInfoVO organ = new OrganInfoVO();
                organ.setOrganNo(sysDictData.getDictValue());
                organ.setCount(distinctOrgansCount.getGainsum());
                organ.setAbandonCount(distinctOrgansCount.getAbandonCount());
                l.add(organ);
                countSum = countSum + distinctOrgansCount.getGainsum();
                abandonCountSum = abandonCountSum + distinctOrgansCount.getAbandonCount();
                organInfoVOList.add(organ);
            }
        }
//        for (Map.Entry<String, Integer> entry : map_organs.entrySet()) {
//            OrganInfoVO organ = new OrganInfoVO();
//            organ.setOrganNo(entry.getKey());
//            //organ.setOrganName(serviceDonateorganMapper.getOrganNameByNo(entry.getKey()));
//            organ.setCount(entry.getValue());
//            organ.setAbandonCount();
//            l.add(organ);
//        }

        return l;
        map.put("countSum", countSum);
        map.put("abandonCountSum", abandonCountSum);
        map.put("organInfoVOList", organInfoVOList);
        return map;
    }

    @Override

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

@@ -27,10 +27,30 @@
    </resultMap>

    <sql id="selectVDonationworkflowVo">
        select id, name, IDCardNo, workflow, terminationCase, deptid, deptname, reporterNo, reporterName, donatetime, ReportTime, CoreTeamAssessConclusion, coreTeamAssessTime, signdate, ExpertConclusion, conclusionTime, organcount, operationBegTime, completeTime from v_donationworkflow
        select id,
               name,
               IDCardNo,
               workflow,
               terminationCase,
               deptid,
               deptname,
               reporterNo,
               reporterName,
               donatetime,
               ReportTime,
               CoreTeamAssessConclusion,
               coreTeamAssessTime,
               signdate,
               ExpertConclusion,
               conclusionTime,
               organcount,
               operationBegTime,
               completeTime
        from v_donationworkflow
    </sql>

    <select id="selectVDonationworkflowList" parameterType="com.ruoyi.project.domain.VDonationworkflow" resultMap="VDonationworkflowResult">
    <select id="selectVDonationworkflowList" parameterType="com.ruoyi.project.domain.VDonationworkflow"
            resultMap="VDonationworkflowResult">
        <include refid="selectVDonationworkflowVo"/>
        <where>
            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
@@ -40,10 +60,14 @@
            <if test="deptid != null "> and deptid = #{deptid}</if>
            <if test="deptname != null  and deptname != ''"> and deptname like concat('%', #{deptname}, '%')</if>
            <if test="reporterno != null  and reporterno != ''"> and reporterNo = #{reporterno}</if>
            <if test="reportername != null  and reportername != ''"> and reporterName like concat('%', #{reportername}, '%')</if>
            <if test="reportername != null  and reportername != ''">and reporterName like concat('%', #{reportername},
                '%')
            </if>
            <if test="donatetime != null "> and donatetime = #{donatetime}</if>
            <if test="reporttime != null "> and ReportTime = #{reporttime}</if>
            <if test="coreteamassessconclusion != null  and coreteamassessconclusion != ''"> and CoreTeamAssessConclusion = #{coreteamassessconclusion}</if>
            <if test="coreteamassessconclusion != null  and coreteamassessconclusion != ''">and CoreTeamAssessConclusion
                = #{coreteamassessconclusion}
            </if>
            <if test="coreteamassesstime != null "> and coreTeamAssessTime = #{coreteamassesstime}</if>
            <if test="signdate != null "> and signdate = #{signdate}</if>
            <if test="expertconclusion != null "> and ExpertConclusion = #{expertconclusion}</if>