代码提交

liusheng

2026-01-28 0bb9f6c3e894e56ff58d335110fbe4cfa87b64b2

代码提交

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

@@ -1,6 +1,5 @@
package com.ruoyi.web.controller.project;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -10,7 +9,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDeathinfo;
import com.ruoyi.project.domain.dto.DeathBaseInfoDTO;
import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
import com.ruoyi.project.domain.vo.DeathBaseInfoVO;
import com.ruoyi.project.service.IServiceDeathinfoService;
import io.swagger.annotations.Api;

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

@@ -78,12 +78,10 @@
     * 查询捐献基础列表
     */
    @ApiOperation("潜在捐献信息列表")
    //// @PreAuthorize("@ss.hasPermi('project:donatebaseinfo:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("潜在捐献信息列表：{}", serviceDonatebaseinfo);
        startPage();
        //List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
        List<ServiceDonatebaseinfo> list = serviceDonatebaseinfoService.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
        return getDataTable(list);
    }

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

@@ -9,10 +9,13 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
@@ -60,17 +63,25 @@
        configuration.setDefaultEncoding("utf-8");
    }

//    /**
//     * 查询捐献完成列表
//     */
//    @ApiOperation("查询捐献完成列表")
//    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
//    @GetMapping("/list")
//    public Map<String, Object> list(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
//        log.info("查询捐献完成列表：{}", donationCompletionBaseInfoVO);
//        List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(donationCompletionBaseInfoVO);
//        return getDataTable(list);
//    }
    /**
     * 查询捐献完成列表基本信息
     */
    @ApiOperation("查询捐献完成列表基本信息（器官利用）")
    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:list')")
    @PostMapping("/getDonationCompletionBaseInfo")
    public Map<String, Object> getDonationCompletionBaseInfo(@RequestBody DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
        log.info("查询捐献完成列表基本信息：{}", donationCompletionBaseInfoVO);
        Integer offset = PageUtils.getOffset(donationCompletionBaseInfoVO.getPageNum(), donationCompletionBaseInfoVO.getPageSize());
        donationCompletionBaseInfoVO.setPageNum(offset);
        List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);

        donationCompletionBaseInfoVO.setPageNum(null);
        donationCompletionBaseInfoVO.setPageSize(null);
        Integer totalCount = 0;
        List<DonationCompletionBaseInfoDTO> total = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
        if (!org.springframework.util.CollectionUtils.isEmpty(total)) totalCount = total.size();
        return getDataTable(donationCompletionBaseInfoDTOList,totalCount);
    }


    /**

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

@@ -69,9 +69,9 @@
    @Excel(name = "死亡判定医生二")
    private String deathjudgedoctt;

    /** 死亡证明附件路径,多张用;号隔开 */
    @ApiModelProperty("死亡证明附件路径,多张用;号隔开")
    @Excel(name = "死亡证明附件路径,多张用;号隔开")
    /** 死亡证明附件 */
    @ApiModelProperty("死亡证明附件")
    @Excel(name = "死亡证明附件")
    private String deathjudgeannex;

    /** 是否默哀缅怀仪式 0：否；1：是 */

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

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

import com.baomidou.mybatisplus.annotation.FieldFill;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -103,7 +104,6 @@
     * 出生日期
     */
    @ApiModelProperty("出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date birthday;

    /**
@@ -557,7 +557,7 @@
    private String businessarea;


    @ApiModelProperty("附件地址")
    @ApiModelProperty("附件地址（供者评估各项记录）")
    @Excel(name = "附件地址")
    private String annexfiles;

@@ -571,9 +571,10 @@
    @Excel(name = "终止案例")
    private Integer terminationCase;

    /** 案例时间 */
    @ApiModelProperty("案例时间")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @TableField(fill = FieldFill.INSERT_UPDATE)
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date donatetime;

    @ApiModelProperty("案例序号")

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

@@ -158,33 +158,20 @@
    private String assessannex;

    /**
     * 评估状态：   首次：1.评估通过  2评估不通过         最终：3.评估通过  4评估不通过
     * 评估状态：  1.评估通过  2评估不通过
     */
    @ApiModelProperty("评估状态：   首次：1.评估通过  2评估不通过         最终：3.评估通过  4评估不通过")
    private String firstAssessState;

    /**
     * 评估状态：   首次：1.评估通过  2评估不通过         最终：3.评估通过  4评估不通过
     */
    @ApiModelProperty("评估状态：   首次：1.评估通过  2评估不通过         最终：3.评估通过  4评估不通过")
    private String secondAssessState;
    @ApiModelProperty("评估状态：  1.评估通过  2评估不通过 ")
    private String assessState;


    /**
     * 首次评估时间
     * 评估时间
     */
    @ApiModelProperty("首次评估时间")
    @ApiModelProperty("评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "首次评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessFirstTime;
    @Excel(name = "评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessTime;

    /**
     * 二次评估时间
     */
    @ApiModelProperty("二次评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "二次评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessSecondTime;

}


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

@@ -65,34 +65,6 @@
    @Excel(name = "器官编号 ")
    private String organnumber;

    /**
     * 器官评估状态 ：1：可用，2：不可用
     */
    @ApiModelProperty("器官评估状态 ：1：可用，2：不可用")
    @Excel(name = "器官评估状态 ：1：可用，2：不可用")
    private String organState;

    /**
     * 不可用原因
     */
    @ApiModelProperty("不可用原因")
    @Excel(name = "不可用原因")
    private String notgetreason;

    /**
     * 器官评估时间
     */
    @ApiModelProperty("器官评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "器官评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date organAssessTime;

    /**
     * 评估医生姓名
     */
    @ApiModelProperty("评估医生姓名")
    @Excel(name = "评估医生姓名")
    private String organAssessDoct;

    /**
     * 器官获取机构编号 对应机构表
@@ -150,5 +122,14 @@
    @Excel(name = "功能延迟性恢复，参见sys_0_1")
    private String isdgf;


    /**
     * 多次评估意见
     */
    @ApiModelProperty("多次评估意见")
    @Excel(name = "多次评估意见")
    private String assesscontent;


}


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

@@ -16,7 +16,7 @@
 */
@Data
@ApiModel("VIEW")
public class VUserOrg extends BaseEntity
public class VUserOrg
{
    private static final long serialVersionUID = 1L;


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

@@ -26,6 +26,12 @@
    @ApiModelProperty("baseInfo的ID")
    private Long infoid;

    /**
     * DeathBaseInfo的ID
     */
    @ApiModelProperty("DeathBaseInfo的ID")
    private Long id;


    /**
     * 记录状态

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

@@ -21,6 +21,11 @@
@ApiModel("捐献进度基础信息")
public class DonatebaseinfoProgressDTO extends BaseEntity {
    private static final long serialVersionUID = 1L;
    /**
     * Donatebaseinfo的ID
     */
    @ApiModelProperty("Donatebaseinfo的ID")
    private Long id;

    /**
     * 治疗医院
@@ -77,6 +82,12 @@
    private Long age;

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

    /**
     * 年龄单位
     */
    @ApiModelProperty("年龄单位")
@@ -118,32 +129,21 @@


    /**
     * 第一次评估时间
     * 评估状态：1.评估通过  2评估不通过
     */
    @ApiModelProperty("第一次评估时间")
    @ApiModelProperty("评估状态：1.评估通过  2评估不通过  ")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "第一次评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessFirstTime;
    @Excel(name = "评估状态：1.评估通过  2评估不通过  ", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private String assessState;

    /**
     * 第二次评估时间
     * 评估时间
     */
    @ApiModelProperty("第二次评估时间")
    @ApiModelProperty("评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "第二次评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessSecondTime;
    @Excel(name = "评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessTime;

    /**
     * 第一次评估结论
     */
    @ApiModelProperty("第一次评估结论")
    private String firstAssessState;

    /**
     * 第二次评估结论
     */
    @ApiModelProperty("第二次评估结论")
    private String secondAssessState;

    /**
     * 亲属确认时间

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

@@ -3,11 +3,13 @@

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

import java.util.Date;
import java.util.List;

@Data
@ApiModel("器官捐献完成基本信息响应对象（器官利用响应对象）")
@@ -17,6 +19,12 @@
     */
    @ApiModelProperty("baseInfo的ID")
    private Long infoid;

    /**
     * DonationCompletion的ID
     */
    @ApiModelProperty("DonationCompletion的ID")
    private Long id;

    /**
     * 记录状态
@@ -64,6 +72,27 @@
    @Excel(name = "捐献者编号")
    private String donorno;

    /**
     * 是否遗体捐献
     */
    @ApiModelProperty("是否遗体捐献")
    @Excel(name = "是否遗体捐献")
    private String isbodydonation;


    /**
     * 接收单位名称
     */
    @ApiModelProperty("接收单位名称")
    @Excel(name = "接收单位名称")
    private String receivingunitname;

    /**
     * 接收单位
     */
    @ApiModelProperty("接收单位")
    @Excel(name = "接收单位")
    private String receivingunit;

    /**
     * 捐献者姓名
@@ -119,4 +148,50 @@
    @Excel(name = "负责人姓名")
    private String responsibleusername;

    /**
     * 协调员一编号
     */
    @ApiModelProperty("协调员一编号")
    private String coordinateduserido;

    /**
     * 协调员一姓名
     */
    @ApiModelProperty("协调员一姓名")
    @Excel(name = "协调员一姓名")
    private String coordinatedusernameo;

    /**
     * 协调员二编号
     */
    @ApiModelProperty("协调员二编号")
    private String coordinateduseridt;

    /**
     * 协调员二姓名
     */
    @ApiModelProperty("协调员二姓名")
    @Excel(name = "协调员二姓名")
    private String coordinatedusernamet;


    /**
     * 附件
     */
    @ApiModelProperty("附件")
    private String assessannex;

    /**
     * 捐献器官
     */
    @ApiModelProperty("捐献器官")
    @Excel(name = "捐献器官")
    private String donateorgan;

    /**
     * 捐献器官移植详情
     */
    @ApiModelProperty("捐献器官移植详情")
    private List<ServiceDonatecomporgan> serviceDonatecomporganList;

}

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

@@ -8,6 +8,7 @@
import lombok.Data;

import java.util.Date;
import java.util.List;

/**
 * 医学评估对象 service_medicalevaluation
@@ -16,7 +17,7 @@
 * @date 2021-11-19
 */
@Data
@ApiModel("医学评估基础信息")
@ApiModel("医学评估基础信息响应对象")
public class MedicalevaluationBaseInfoDTO {
    private static final long serialVersionUID = 1L;

@@ -110,32 +111,19 @@


    /**
     * 首次评估时间
     * 评估时间
     */
    @ApiModelProperty("首次评估时间")
    @ApiModelProperty("评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "首次评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessFirstTime;
    @Excel(name = "评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessTime;


    /**
     * 评估状态：   首次：1.评估通过  2评估不通过
     * 评估状态：待评估、评估中、已完成
     */
    @ApiModelProperty("评估状态：   首次：1.评估通过  2评估不通过     ")
    private String firstAssessState;

    /**
     * 评估状态：   首次：1.评估通过  2评估不通过
     */
    @ApiModelProperty("评估状态：  再次：1.评估通过  2评估不通过")
    private String secondAssessState;
    /**
     * 二次评估时间
     */
    @ApiModelProperty("二次评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "二次评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessSecondTime;
    @ApiModelProperty("评估状态：1.待评估、2.评估中、3.已完成   ")
    private String assessState;

    /**
     * 评估附件
@@ -147,7 +135,7 @@
     * 器官评估详情
     */
    @ApiModelProperty("器官评估详情")
    private ServiceMedicalevaluationorgan serviceMedicalevaluationorgan;
    private List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans;


}

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

@@ -24,6 +24,13 @@


    /**
     * 器官捐献确认的ID
     */
    @ApiModelProperty("器官捐献确认的ID")
    private Long id;


    /**
     * 记录状态
     */
    @ApiModelProperty("记录状态")

 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonatebaseinfoProgressVO.java

@@ -39,6 +39,12 @@
    @Excel(name = "案例编号")
    private String caseNo;

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


    /**
     * 姓名

 ruoyi-project/src/main/java/com/ruoyi/project/domain/vo/DonationCompletionBaseInfoVO.java

@@ -3,6 +3,7 @@

import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -11,7 +12,7 @@

@Data
@ApiModel("器官捐献完成基本信息请求对象（器官利用请求对象）")
public class DonationCompletionBaseInfoVO {
public class DonationCompletionBaseInfoVO extends BaseEntity {
    /**
     * baseInfo的ID
     */

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

@@ -6,6 +6,8 @@
import java.util.Date;
import java.util.List;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.TimeVO;
import org.apache.ibatis.annotations.Mapper;
@@ -13,7 +15,7 @@

/**
 * 捐献完成Mapper接口
 * 
 *
 * @author ruoyi
 * @date 2021-11-19
 */
@@ -40,4 +42,6 @@
    List<ServiceDonatecompletioninfo> getCompletionDonatePeopleByTime(TimeVO timeVO);

    public void delDuplicateDonateCompletioninfo(@Param("infoid") long infoid,@Param("createby") String createby);

    List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO);
}

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

@@ -19,17 +19,16 @@
 * @date 2021-11-17
 */
@Mapper
public interface ServiceDonationwitnessMapper extends BaseMapper<ServiceDonationwitness>
{
public interface ServiceDonationwitnessMapper extends BaseMapper<ServiceDonationwitness> {
    /**
     * 查询捐献见证列表
     *
     * @param serviceDonationwitness 捐献见证
     * @return 捐献见证集合
     */
     List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);
    List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);

     List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO);
    List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO);

    List<ServiceDonationwitness> getWitnessList();

@@ -46,7 +45,6 @@
    Integer countNumber(TimeVO timeVO);

    ServiceDonationwitness selectByInfoId(Long infoid);


    List<ServiceDonationwitness> getAllDonatePeople();


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

@@ -2,6 +2,8 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;

import java.util.List;
@@ -22,6 +24,14 @@
     */
    public List<ServiceDonatecompletioninfo> queryList(ServiceDonatecompletioninfo serviceDonatecompletioninfo);

    /**
     * 查询捐献完成列表基本信息
     *
     * @param donationCompletionBaseInfoVO 捐献完成
     * @return 捐献完成集合
     */
    public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO);

    public List<ServiceDonatecompletioninfo> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo);

    List<DonationCompletionVO> selectVOList(DonationCompletionVO donationCompletionVO);

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

@@ -22,10 +22,7 @@

import java.time.LocalDate;
import java.time.ZoneId;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * 捐献上报基础Service业务层处理
@@ -124,16 +121,20 @@
        //将report数据复制到serviceDonatebaseinfo中
        ServiceDonatebaseinfo serviceDonatebaseinfo1 = DtoConversionUtils.sourceToTarget(serviceDonatebaseinfoReport, ServiceDonatebaseinfo.class);
        serviceDonatebaseinfo1.setId(null);
        serviceDonatebaseinfo1.setReporterno(serviceDonatebaseinfoReport.getCoordinatorNo());
        serviceDonatebaseinfo1.setReportername(serviceDonatebaseinfoReport.getCoordinatorName());
        //先通过caseNo查询是否存在
        ServiceDonatebaseinfo serviceDonatebaseinfo = new ServiceDonatebaseinfo();
        serviceDonatebaseinfo.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
        List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo);
        if (CollectionUtils.isNotEmpty(serviceDonatebaseinfos) && serviceDonatebaseinfos.size() > 0) {
            serviceDonatebaseinfo1.setId(serviceDonatebaseinfos.get(0).getId());
            serviceDonatebaseinfo1.setUpdateTime(new Date());
            serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo1);
            return true;
        }
        //创建
        serviceDonatebaseinfo1.setDonatetime(new Date());
        return serviceDonatebaseinfoService.save(serviceDonatebaseinfo1);
    }


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

@@ -95,14 +95,14 @@
    @Override
    public List<ServiceDonatebaseinfo> queryList(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers = Wrappers.lambdaQuery();
        setWrappers( wrappers,serviceDonatebaseinfo);
        setWrappers(wrappers, serviceDonatebaseinfo);
        return this.list(wrappers);
    }

    @Override
    public Page<ServiceDonatebaseinfo> queryListPage(ServiceDonatebaseinfo serviceDonatebaseinfo) {
        LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers = Wrappers.lambdaQuery();
        setWrappers( wrappers,serviceDonatebaseinfo);
        setWrappers(wrappers, serviceDonatebaseinfo);

        // 创建分页对象，设置页码和每页大小
        int currentPage = (serviceDonatebaseinfo.getPageNum() == null || serviceDonatebaseinfo.getPageNum() < 1) ? 1 : serviceDonatebaseinfo.getPageNum();
@@ -110,7 +110,7 @@
        Page<ServiceDonatebaseinfo> page = new Page<>(currentPage, size);

        List<ServiceDonatebaseinfo> serviceDonatemaintenanceList = serviceDonatebaseinfoMapper.selectPage(page, wrappers).getRecords();
        return    page.setRecords(serviceDonatemaintenanceList);
        return page.setRecords(serviceDonatemaintenanceList);
    }

    @Override
@@ -220,32 +220,6 @@
            serviceDonatebaseinfo.setDeptid(user.getDeptId());
        }
        List<ServiceDonatebaseinfo> serviceDonatebaseinfos = serviceDonatebaseinfoMapper.selectServiceDonatebaseinfoList(serviceDonatebaseinfo);
        for (ServiceDonatebaseinfo serviceDonatebaseinfo1 : serviceDonatebaseinfos) {
            //先给个年龄默认值（因为age是数字类型，不能放横杠，所以就所横扛放到单位上）
            serviceDonatebaseinfo1.setAgeunit("-");
            serviceDonatebaseinfo1.setAge(null);
            serviceDonatebaseinfo1.setAge2(null);

            //获取死亡时间，如果获取见证里有死亡时间，则进行计算他的年龄
            ServiceDonationwitness sdw = new ServiceDonationwitness();
            sdw.setInfoid(serviceDonatebaseinfo1.getId());
            List<ServiceDonationwitness> serviceDonationwitnessList = serviceDonationwitnessMapper.selectServiceDonationwitnessList(sdw);
            if (!CollectionUtils.isEmpty(serviceDonationwitnessList) && serviceDonatebaseinfo1.getBirthday() != null) {
                Date deathtime = serviceDonationwitnessList.get(0).getDeathtime();
                if (ObjectUtils.isNotEmpty(deathtime)) {
                    Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfo1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), deathtime.toInstant().atZone(ZoneId.systemDefault()).toLocalDate());
                    if (Objects.isNull(map)) {
                        log.error("ServiceDonationwitness出生日期：{},ServiceDonationwitness死亡日期：{}", serviceDonatebaseinfo1.getBirthday(), deathtime);
                        continue;
                    }
                    serviceDonatebaseinfo1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
                    serviceDonatebaseinfo1.setAgeunit(map.get("ageUnit"));
                    serviceDonatebaseinfo1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
                    serviceDonatebaseinfo1.setAgeunit2(map.get("ageUnit2"));
                }
            }

        }

        return serviceDonatebaseinfos;
    }
@@ -269,6 +243,7 @@

    /**
     * 捐献进度基本信息
     *
     * @param donatebaseinfoProgressVO
     * @return
     */
@@ -539,7 +514,7 @@
    }


    private void setWrappers(LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers, ServiceDonatebaseinfo serviceDonatebaseinfo){
    private void setWrappers(LambdaQueryWrapper<ServiceDonatebaseinfo> wrappers, ServiceDonatebaseinfo serviceDonatebaseinfo) {
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getName())) {
            wrappers.like(ServiceDonatebaseinfo::getName, serviceDonatebaseinfo.getName());
        }

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

@@ -13,6 +13,8 @@
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.mapper.ServiceDonatecompletioninfoMapper;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
@@ -75,6 +77,22 @@
        return this.list(wrappers);
    }

    @Override
    public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO) {
        List<DonationCompletionBaseInfoDTO> donationCompletionBaseInfoDTOList = serviceDonatecompletioninfoMapper.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);

        if(CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
            for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
                ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());
                List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
                donationCompletionBaseInfoDTO.setServiceDonatecomporganList(serviceDonatecomporgans);
            }
        }

        return donationCompletionBaseInfoDTOList;
    }

    /**
     * 暂时先不用了
     *

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

@@ -58,10 +58,10 @@
        if (StringUtils.isNotNull(serviceMedicalevaluation.getInfoid())) {
            wrappers.eq(ServiceMedicalevaluation::getInfoid, serviceMedicalevaluation.getInfoid());
        }
        if (StringUtils.isNotNull(serviceMedicalevaluation.getFirstAssessState())) {
            wrappers.eq(ServiceMedicalevaluation::getFirstAssessState, serviceMedicalevaluation.getFirstAssessState());
        }  if (StringUtils.isNotNull(serviceMedicalevaluation.getSecondAssessState())) {
            wrappers.eq(ServiceMedicalevaluation::getSecondAssessState, serviceMedicalevaluation.getSecondAssessState());
        if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessState())) {
            wrappers.eq(ServiceMedicalevaluation::getAssessState, serviceMedicalevaluation.getAssessState());
        }  if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessTime())) {
            wrappers.eq(ServiceMedicalevaluation::getAssessTime, serviceMedicalevaluation.getAssessTime());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())) {
            wrappers.eq(ServiceMedicalevaluation::getDonorno, serviceMedicalevaluation.getDonorno());
@@ -103,7 +103,7 @@
                serviceMedicalevaluationorgan.setInfoid(medicalevaluationBaseInfoDTO.getInfoid());
                List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorgans = serviceMedicalevaluationorganMapper.selectServiceMedicalevaluationorganList(serviceMedicalevaluationorgan);
                if (CollectionUtils.isNotEmpty(serviceMedicalevaluationorgans))
                    medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgan(serviceMedicalevaluationorgans.get(0));
                    medicalevaluationBaseInfoDTO.setServiceMedicalevaluationorgans(serviceMedicalevaluationorgans);
            }
        }
        return medicalevaluationBaseInfoDTOS;

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

@@ -46,18 +46,6 @@
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrgannumber())){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrgannumber ,serviceMedicalevaluationorgan.getOrgannumber());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrganState())){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrganState ,serviceMedicalevaluationorgan.getOrganState());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getNotgetreason())){
            wrappers.eq(ServiceMedicalevaluationorgan::getNotgetreason ,serviceMedicalevaluationorgan.getNotgetreason());
        }
        if (serviceMedicalevaluationorgan.getOrganAssessTime() != null){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrganAssessTime ,serviceMedicalevaluationorgan.getOrganAssessTime());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrganAssessDoct())){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrganAssessDoct ,serviceMedicalevaluationorgan.getOrganAssessDoct());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getGainhospitalno())){
            wrappers.eq(ServiceMedicalevaluationorgan::getGainhospitalno ,serviceMedicalevaluationorgan.getGainhospitalno());
        }
@@ -81,6 +69,8 @@
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getIsdgf())){
            wrappers.eq(ServiceMedicalevaluationorgan::getIsdgf ,serviceMedicalevaluationorgan.getIsdgf());
        }   if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getAssesscontent())){
            wrappers.eq(ServiceMedicalevaluationorgan::getAssesscontent ,serviceMedicalevaluationorgan.getAssesscontent());
        }
        return this.list(wrappers);
    }

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

@@ -414,9 +414,11 @@
        SELECT sd.treatmenthospitalname AS treatmenthospitalname,
        sd.treatmenthospitalno AS treatmenthospitalno,
        sd.DonorNo AS donorno,
        sd.id AS id,
        sd.case_no AS caseNo,
        sd.NAME AS NAME,
        sd.RecordState AS recordstate,
        sd.workflow AS workflow,
        sd.Sex AS sex,
        sd.Age AS age,
        sd.BloodType AS bloodtype,
@@ -426,10 +428,8 @@
        sd.coordinator_name AS coordinatorName,
        sd.termination_case AS terminationCase,
        sd.diagnosisname AS diagnosisname,
        sm.assess_first_time AS assessFirstTime,-- 第一次评估时间
        sm.assess_second_time AS assessSecondTime,-- 第二次评估时间
        sm.first_assess_state AS firstAssessState,-- 第一次评估结论
        sm.second_assess_state AS secondAssessState,-- 第二次评估结论
        sm.assess_state AS assessState,-- 评估状态
        sm.assess_time AS assessTime,-- 评估时间
        sr.SignDate AS signDate,-- 亲属确认时间
        se.expert_conclusion AS expertConclusion,-- 伦理审查专家结论
        se.expert_time AS expertTime,-- 伦理审查专家结论时间
@@ -452,7 +452,8 @@
        <where>sd.del_flag = 0
            <if test="name != null ">AND sd.Name >= #{name}</if>
            <if test="idcardno != null  and idcardno != ''">and IDCardNo = #{idcardno}</if>
            <if test="recordstate != null and recordstate != ''">and RecordState = #{recordstate}</if>
            <if test="recordstate != null and recordstate != ''">and sd.RecordState = #{recordstate}</if>
            <if test="workflow != null">and sd.workflow = #{workflow}</if>
        </where>

        ORDER BY sd.ReportTime DESC

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

@@ -177,6 +177,47 @@
        where CompleteTime >= #{starttime} AND CompleteTime &lt;= #{endtime} AND del_flag=0
    </select>

    <select id="getDonationCompletionBaseInfo" resultType="com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO">
        SELECT
        sd.treatmenthospitalname AS treatmenthospitalname,
        sd.treatmenthospitalno AS treatmenthospitalno,
        sd.DonorNo AS donorno,
        sd.case_no AS caseNo,
        sd.NAME AS name,
        sd.RecordState AS recordstate,
        sd.Sex AS sex,
        sd.Age AS age,
        sd.BloodType AS bloodtype,
        sd.idcardno AS idcardno,
        sd.id AS infoid,
        sdc.ID AS id,
        sdc.DonorNo AS donorno,
        sdc.IsBodyDonation AS isbodydonation,
        sdc.ReceivingUnitName AS receivingunitname,
        sdc.ReceivingUnit AS receivingunit,
        sdc.CompleteTime AS completetime,
        sdc.ResponsibleUserID AS responsibleuserid,
        sdc.ResponsibleUserName AS responsibleusername,
        sdc.CoordinatedUserIDO AS coordinateduserido,
        sdc.CoordinatedUserNameO AS coordinatedusernameo,
        sdc.CoordinatedUserIDT AS coordinateduseridt,
        sdc.CoordinatedUserNameT AS coordinatedusernamet,
        sdc.AssessAnnex AS assessannex,
        sdc.DonateOrgan AS donateorgan
        FROM
        service_donatebaseinfo sd
        LEFT JOIN service_donatecompletioninfo sdc ON sd.ID = sdc.InfoID
        AND sd.del_flag = 0
        AND sdc.del_flag = 0
        <where>
            <if test="name != null  and name != ''">and sd.Name like concat('%', #{name}, '%')</if>
            <if test="inpatientno != null  and inpatientno != ''">and sd.inpatientno = #{inpatientno}</if>
            <if test="donorno != null  and donorno != ''">and sdc.DonorNo = #{donorno}</if>
            <if test="infoid != null">and sdc.InfoID = #{infoid}</if>
        </where>
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>


    <update id="delDuplicateDonateCompletioninfo">
        update service_donatecompletioninfo

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

@@ -68,7 +68,7 @@
        sd.BloodType AS bloodtype,
        sd.idcardno AS idcardno,
        sd.diagnosisname AS diagnosisname,
        sdb.infoID AS infoid,
        sd.id AS infoid,
        sdb.ID AS id,
        sdb.registration_name AS registrationName,
        sdb.registration_time AS registrationTime,

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

@@ -122,7 +122,7 @@
        sd.idcardno AS idcardno,
        sd.diagnosisname AS diagnosisname,
        st.coordinator_in_operating as coordinatorInOperating,
        st.InfoID as infoid,
        sd.id AS infoid,
        st.coordinator_out_operating as coordinatorOutOperating,
        st.coordinator_sign as coordinatorSign,
        st.coordinator_sign_time as coordinatorSignTime,

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

@@ -92,7 +92,7 @@
        sd.BloodType as bloodtype,
        sd.idcardno as idcardno,
        sd.diagnosisname as diagnosisname,
        se.infoID as infoid,
        sd.id AS infoid,
        se.ID as id,
        se.expert_conclusion as expertConclusion,
        se.expert_name as expertName,

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

@@ -49,8 +49,7 @@
        <result property="idcardno" column="idcardno"/>
        <result property="diagnosisname" column="diagnosisname"/>
        <result property="coordinatorName" column="coordinator_name"/>
        <result property="assessFirstTime" column="assess_first_time"/>
        <result property="assessSecondTime" column="assess_second_time"/>
        <result property="assessTime" column="assess_time"/>
        <result property="assessState" column="assess_state"/>
        <result property="assessannex" column="AssessAnnex"/>
    </resultMap>
@@ -59,10 +58,9 @@
        select ID,
               InfoID,
               case_no,
               assess_second_time,
               assess_first_time,
               DonorNo,
               assess_state,
               assess_time,
               IllnessOverview,
               DiagnosisName,
               HospitalAssessContent,
@@ -147,8 +145,6 @@
        `service_medicalevaluation`.`create_by` AS `createby`,
        `service_medicalevaluation`.`update_by` AS `updateby`,
        `service_medicalevaluation`.`assess_state` AS `assess_state`,
        `service_medicalevaluation`.`assess_second_time` AS `assess_second_time`,
        `service_medicalevaluation`.`assess_first_time` AS `assess_first_time`,
        `service_medicalevaluation`.`update_time` AS `updatetime`
        FROM
        `service_donatebaseinfo`
@@ -207,22 +203,20 @@
        sb.diagnosisname,
        sb.recordstate,
        sb.coordinator_name,
        sm.assess_first_time,
        sm.infoID,
        sb.id as infoID,
        sm.ID,
        sm.assessannex,
        sm.assess_second_time,
        sm.assess_state
        FROM service_donatebaseinfo sb
        LEFT JOIN service_medicalevaluation sm ON sb.ID = sm.InfoID and sm.del_flag = 0
        and sb.del_flag = 0
        <where>

            <if test="infoid != null">AND sm.InfoID = #{infoid}</if>
            <if test="caseNo != null and caseNo != ''">AND sm.case_no = #{caseNo}</if>
            <if test="donorno != null and donorno != ''">AND sm.DonorNo = #{donorno}</if>
            <if test="diagnosisname != null and diagnosisname != ''">AND sm.DiagnosisName = #{diagnosisname}</if>
            <if test="assessState != null and assessState != ''">AND sm.assess_state = #{assessState}</if>
            <if test="assessTime != null ">AND sm.assess_time = #{assessTime}</if>
            <if test="name != null and name != ''">AND sb.Name LIKE CONCAT('%', #{name}, '%')</if>
            <if test="sex != null and sex != ''">AND sb.Sex = #{sex}</if>
            <if test="idcardno != null and idcardno != ''">AND sb.IDCardNo = #{idcardno}</if>

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

@@ -11,10 +11,6 @@
        <result property="organno" column="OrganNo"/>
        <result property="organname" column="OrganName"/>
        <result property="organnumber" column="OrganNumber"/>
        <result property="organState" column="Organ_state"/>
        <result property="notgetreason" column="notgetreason"/>
        <result property="organAssessTime" column="Organ_assess_time"/>
        <result property="organAssessDoct" column="Organ_assess_doct"/>
        <result property="gainhospitalno" column="GainHospitalNo"/>
        <result property="gainhospitalname" column="GainHospitalName"/>
        <result property="isbiopsybefore" column="IsBiopsyBefore"/>
@@ -28,21 +24,17 @@
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="assesscontent" column="assesscontent"/>
    </resultMap>

    <sql id="selectServiceMedicalevaluationorganVo">
        select ID,
               InfoID,
               first_assess_state,
               second_assess_state,
               DonorNo,
               assesscontent,
               OrganNo,
               OrganName,
               OrganNumber,
               Organ_state,
               notgetreason,
               Organ_assess_time,
               Organ_assess_doct,
               GainHospitalNo,
               GainHospitalName,
               IsBiopsyBefore,
@@ -69,11 +61,6 @@
            <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
            <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
            <if test="organnumber != null  and organnumber != ''">and OrganNumber = #{organnumber}</if>
            <if test="organState != null  and organState != ''">and Organ_state = #{organState}</if>
            <if test="notgetreason != null  and notgetreason != ''">and notgetreason = #{notgetreason}</if>
            <if test="organAssessTime != null ">and Organ_assess_time = #{organAssessTime}</if>
            <if test="organAssessDoct != null  and organAssessDoct != ''">and Organ_assess_doct = #{organAssessDoct}
            </if>
            <if test="gainhospitalno != null  and gainhospitalno != ''">and GainHospitalNo = #{gainhospitalno}</if>
            <if test="gainhospitalname != null  and gainhospitalname != ''">and GainHospitalName like concat('%',
                #{gainhospitalname}, '%')