代码提交

liusheng

3 天以前 9ff5a9b1a3ce92b7bf4fcd3a8fdabbb1739cfe4b

代码提交

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

@@ -2,15 +2,18 @@

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDeathinfo;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
import com.ruoyi.project.domain.dto.DeathBaseInfoDTO;
import com.ruoyi.project.domain.vo.DeathBaseInfoVO;
import com.ruoyi.project.service.IServiceDeathinfoService;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -80,8 +83,12 @@
     * æ–°å¢žæ‚£è€…死亡信息
     */
    @ApiOperation("新增患者死亡信息")
    // @PreAuthorize("@ss.hasPermi('project:deathinfo:add')")
    @Log(title = "患者死亡信息", businessType = BusinessType.INSERT)
    @UniqueCheck(
            fields = {"infoid"},
            entityClass = ServiceDeathinfo.class,
            serviceClass = IServiceDeathinfoService.class,
            message = "新增患者死亡信息的infoid已存在,无法保存!"
    )
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDeathinfo serviceDeathinfo) {

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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
@@ -189,14 +190,6 @@
    public AjaxResult add(@RequestBody ServiceDonatebaseinfo serviceDonatebaseinfo) {
        log.info("新增潜在捐献信息：{}", serviceDonatebaseinfo);
        SysUser user = SecurityUtils.getLoginUser().getUser();

        String idcardno = serviceDonatebaseinfo.getIdcardno();
        ServiceDonatebaseinfo serviceDonatebaseinfo2 = new ServiceDonatebaseinfo();
        serviceDonatebaseinfo2.setIdcardno(idcardno);
        List<ServiceDonatebaseinfo> listrecord2 = serviceDonatebaseinfoService.queryList(serviceDonatebaseinfo2);
        if (listrecord2.size() > 0) {
            return AjaxResult.error("新增时身份证" + idcardno + "已存在,无法保存!");
        }

        //  serviceDonatebaseinfo.setDonorno(bh);
        serviceDonatebaseinfo.setDeptid(user.getDeptId());

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

@@ -2,24 +2,25 @@

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
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.ServiceDonateorganBase;
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.domain.vo.ServiceDonatecompletioninfoVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import com.ruoyi.project.service.IServiceDonateorganBaseService;
import com.ruoyi.project.service.IServiceDonateorganService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -80,7 +81,7 @@
        Integer totalCount = 0;
        List<DonationCompletionBaseInfoDTO> total = serviceDonatecompletioninfoService.getDonationCompletionBaseInfo(donationCompletionBaseInfoVO);
        if (!org.springframework.util.CollectionUtils.isEmpty(total)) totalCount = total.size();
        return getDataTable(donationCompletionBaseInfoDTOList,totalCount);
        return getDataTable(donationCompletionBaseInfoDTOList, totalCount);
    }


@@ -113,61 +114,39 @@
     * æ–°å¢žæçŒ®å®Œæˆ
     */
    @ApiOperation("新增捐献完成")
    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
    @Log(title = "捐献完成", businessType = BusinessType.INSERT)
    @UniqueCheck(fields = {"infoid"},
            entityClass = ServiceDonatecompletioninfoVO.class,
            serviceClass = IServiceDonatecompletioninfoService.class,
            message = "新增捐献完成的infoid已存在,无法保存!")
    @PostMapping("/add")
    @RepeatSubmit(interval = 5000)
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        log.info("新增捐献完成：{}", serviceDonatecompletioninfo);
        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
        boolean save = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
        log.info("新增捐献完成serviceDonatecompletioninfo的ID：{}", serviceDonatecompletioninfo.getId());
        return AjaxResult.success(serviceDonatecompletioninfo);
    public AjaxResult add(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        log.info("新增捐献完成：{}", serviceDonatecompletioninfoVO);
        boolean save = serviceDonatecompletioninfoService.add(serviceDonatecompletioninfoVO);
        return AjaxResult.success(save);
    }

//    /**
//     * æ–°å¢žæçŒ®å®Œæˆè¯¦æƒ…
//     */
//    @ApiOperation("新增捐献完成详情")
//    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:add')")
//    @Log(title = "新增捐献完成详情", businessType = BusinessType.INSERT)
//    @PostMapping
//    @RepeatSubmit(interval = 5000)
//    public AjaxResult addDetail(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
//        log.info("新增捐献完成：{}", serviceDonatecompletioninfo);
//        serviceDonatecompletioninfoService.delDuplicateDonateCompletioninfo(serviceDonatecompletioninfo.getInfoid(), serviceDonatecompletioninfo.getCreateBy());
//        //新增donatecomporgan数据
//        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfo.getServiceDonatecomporganList())) {
//            for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfo.getServiceDonatecomporganList()) {
//                if (serviceDonatecomporgan.getInfoid() == null) {
//                    throw new BaseException("请检查捐献器官移植信息，是否与捐献基础表进行关联");
//                }
//                serviceDonatecomporganService.save(serviceDonatecomporgan);
//
//    @RepeatSubmit
//    @ApiOperation("新增或修改捐献完成")
//    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
//    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
//    @PostMapping("/saveOrUpdateDonatecompletioninfo")
//    public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
//        if (CollectionUtils.isEmpty(serviceDonatecompletioninfoList)) {
//            throw new BaseException("请检查需要新增或修改的捐献完成参数是否完整");
//        }
//        Boolean i = null;
//        for (ServiceDonatecompletioninfo serviceDonatecompletioninfo : serviceDonatecompletioninfoList) {
//            log.info("捐献完成id是否为空 : {},基础表的id为 : {}", serviceDonatecompletioninfo.getId(), serviceDonatecompletioninfo.getInfoid());
//            if (serviceDonatecompletioninfo.getId() == null) {
//                i = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
//            } else {
//                i = serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo);
//            }
//        }
//        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
//        return toAjax(i);
//    }

    @RepeatSubmit
    @ApiOperation("新增或修改捐献完成")
    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonatecompletioninfo")
    public AjaxResult saveOrUpdateDonatecompletioninfo(@RequestBody List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList) {
        if (CollectionUtils.isEmpty(serviceDonatecompletioninfoList)) {
            throw new BaseException("请检查需要新增或修改的捐献完成参数是否完整");
        }
        Boolean i = null;
        for (ServiceDonatecompletioninfo serviceDonatecompletioninfo : serviceDonatecompletioninfoList) {
            log.info("捐献完成id是否为空 : {},基础表的id为 : {}", serviceDonatecompletioninfo.getId(), serviceDonatecompletioninfo.getInfoid());
            if (serviceDonatecompletioninfo.getId() == null) {
                i = serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo);
            } else {
                i = serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo);
            }
        }
        return toAjax(i);
    }

    /**
     * ä¿®æ”¹æçŒ®å®Œæˆ
@@ -177,15 +156,9 @@
    //// @PreAuthorize("@ss.hasPermi('project:donatecompletioninfo:edit')")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    public AjaxResult edit(@RequestBody ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo1 = new ServiceDonatecompletioninfo();
        serviceDonatecompletioninfo1.setInfoid(serviceDonatecompletioninfo.getInfoid());
        List<ServiceDonatecompletioninfo> list = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo1);
        if (CollectionUtils.isEmpty(list)) {
            return error("案例ID，对应的完成登记信息为空");
        }
        serviceDonatecompletioninfo.setId(list.get(0).getId());
        return toAjax(serviceDonatecompletioninfoService.updateById(serviceDonatecompletioninfo));
    public AjaxResult edit(@RequestBody ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        boolean edit = serviceDonatecompletioninfoService.edit(serviceDonatecompletioninfoVO);
        return toAjax(edit);
    }

    /**

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

@@ -2,12 +2,16 @@

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

import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonateFollowupVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -44,20 +48,17 @@
     */
    @ApiOperation("查询捐献随访列表")
    //// @PreAuthorize("@ss.hasPermi('project:donatefollowup:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatefollowup serviceDonatefollowup) {
        startPage();
        //List<ServiceDonatefollowup> list = serviceDonatefollowupService.queryList(serviceDonatefollowup);
    @PostMapping("/list")
    public Map<String, Object> list(@RequestBody ServiceDonatefollowup serviceDonatefollowup) {
        Integer offset = PageUtils.getOffset(serviceDonatefollowup.getPageNum(), serviceDonatefollowup.getPageSize());
        serviceDonatefollowup.setPageNum(offset);
        List<ServiceDonatefollowup> list = serviceDonatefollowupService.selectAll(serviceDonatefollowup);
        return getDataTable(list);
    }

    @GetMapping("/listnew")
    public TableDataInfo listnew(DonateFollowupVO donateFollowupVO) {
        startPage();
        List<DonateFollowupVO> list = serviceDonatefollowupService.selectVOList(donateFollowupVO);
        return getDataTable(list);

        //获取总数
        serviceDonatefollowup.setPageNum(null);
        serviceDonatefollowup.setPageSize(null);
        List<ServiceDonatefollowup> count = serviceDonatefollowupService.selectAll(serviceDonatefollowup);
        return getDataTable(list, CollectionUtils.isEmpty(count) ? 0 : count.size());
    }



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

@@ -3,12 +3,14 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonateorganBase;
import com.ruoyi.project.domain.vo.ServiceDonateorganBaseVO;
import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonateorganBaseInfoVO;
import com.ruoyi.project.service.IServiceDonateorganBaseService;
@@ -50,7 +52,7 @@
    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜åˆ†é…åŸºç¡€åˆ—表
     */
    @ApiOperation("查询捐献器官分配基础列表")
    @ApiOperation("查询器官分配基础列表")
    @PostMapping("/list")
    public Map<String, Object> list(@RequestBody ServiceDonateorganBase serviceDonateorganBase) {
        Page<ServiceDonateorganBase> list = serviceDonateorganBaseService.queryList(serviceDonateorganBase);
@@ -98,16 +100,21 @@
        return AjaxResult.success(serviceDonateorganBaseService.getById(id));
    }


    /**
     * æ–°å¢žæçŒ®å™¨å®˜åˆ†é…åŸºç¡€
     */
    @ApiOperation("新增捐献器官分配基础")
    // @PreAuthorize("@ss.hasPermi('project:base:add')")
    @Log(title = "捐献器官分配基础", businessType = BusinessType.INSERT)
    @UniqueCheck(
            fields = {"infoid"},
            entityClass = ServiceDonateorganBaseVO.class,
            serviceClass = IServiceDonateorganBaseService.class,
            message = "新增伦理审查的infoid已存在,无法保存!"
    )
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonateorganBase serviceDonateorganBase) {
        return toAjax(serviceDonateorganBaseService.save(serviceDonateorganBase));
    public AjaxResult add(@RequestBody ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
        return toAjax(serviceDonateorganBaseService.add(serviceDonateorganBaseVO));
    }

    /**
@@ -118,8 +125,8 @@
    @Log(title = "捐献器官分配基础", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonateorganBase serviceDonateorganBase) {
        return toAjax(serviceDonateorganBaseService.updateById(serviceDonateorganBase));
    public AjaxResult edit(@RequestBody ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
        return toAjax(serviceDonateorganBaseService.updateByParam(serviceDonateorganBaseVO));
    }

    /**

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

@@ -4,19 +4,18 @@
import java.text.SimpleDateFormat;
import java.util.*;

import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.vo.ServiceDonationwitnessVO;
import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.service.IBaseOnlyvalueService;
import com.ruoyi.project.service.IServiceDonatebaseinfoService;
import com.ruoyi.project.service.IServiceDonateorganService;
import com.ruoyi.project.service.*;
import com.ruoyi.web.controller.common.OnlyValueCommon;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -38,7 +37,6 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.common.utils.poi.ExcelUtil;

/**
@@ -48,7 +46,7 @@
 * @date 2021-11-17
 */
@Slf4j
@Api(description = "捐献见证管理（死亡判定）")
@Api(description = "捐献见证管理")
@RestController
@RequestMapping("/project/donationwitness")
public class ServiceDonationwitnessController extends BaseController {
@@ -75,39 +73,21 @@
        configuration.setDefaultEncoding("utf-8");
    }

//    /**
//     * æŸ¥è¯¢æçŒ®è§è¯åˆ—表
//     */
//    @ApiOperation("获取捐献见证列表")
//    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:list')")
//    @GetMapping("/list")
//    public TableDataInfo list(ServiceDonationwitness serviceDonationwitness) {
//        startPage();
//        List<ServiceDonationwitness> list = serviceDonationwitnessService.queryList(serviceDonationwitness);
//        return getDataTable(list);
//    }
//
//    @ApiOperation("获取捐献见证列表-新")
//    @GetMapping("/listnew")
//    public TableDataInfo listnew(DonationWitnessVO donationWitnessVO) {
//        startPage();
//        List<DonationWitnessVO> list = serviceDonationwitnessService.selectVOList(donationWitnessVO);
//        return getDataTable(list);
//    }
@ApiOperation("获取捐献见证基本信息(器官获取)")
@PostMapping("/getDonationwitnessBaseInfo")
public Map<String,Object> getDonationwitnessBaseInfo(@RequestBody DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
    Integer offset = PageUtils.getOffset(donationwitnessBaseInfoVO.getPageNum(), donationwitnessBaseInfoVO.getPageSize());
    donationwitnessBaseInfoVO.setPageNum(offset);
    List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfo = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);

    donationwitnessBaseInfoVO.setPageNum(null);
    donationwitnessBaseInfoVO.setPageSize(null);
    Integer totalCount = 0;
    List<DonationwitnessBaseInfoDTO> total = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
    if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
    return getDataTable(donationwitnessBaseInfo, totalCount);
}
    @ApiOperation("获取捐献见证基本信息(器官获取)")
    @PostMapping("/getDonationwitnessBaseInfo")
    public Map<String, Object> getDonationwitnessBaseInfo(@RequestBody DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
        Integer offset = PageUtils.getOffset(donationwitnessBaseInfoVO.getPageNum(), donationwitnessBaseInfoVO.getPageSize());
        donationwitnessBaseInfoVO.setPageNum(offset);
        List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfo = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);

        donationwitnessBaseInfoVO.setPageNum(null);
        donationwitnessBaseInfoVO.setPageSize(null);
        Integer totalCount = 0;
        List<DonationwitnessBaseInfoDTO> total = serviceDonationwitnessService.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);
        if (!CollectionUtils.isEmpty(total)) totalCount = total.size();
        return getDataTable(donationwitnessBaseInfo, totalCount);
    }


    /**
@@ -128,7 +108,7 @@
     */
    @ApiOperation("通过id获取见证信息")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:query')")
    @GetMapping(value = "/{id}")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonationwitnessService.getById(id));
    }
@@ -137,23 +117,18 @@
     * æ–°å¢žæçŒ®è§è¯
     */
    @ApiOperation("新增捐献见证")
    //// @PreAuthorize("@ss.hasPermi('project:donationwitness:add')")
    @Log(title = "捐献见证", businessType = BusinessType.INSERT)
    @UniqueCheck(
            fields = {"infoid"},
            entityClass = ServiceDonationwitnessVO.class,
            serviceClass = IServiceDonationwitnessService.class,
            message = "新增捐献见证的infoid已存在,无法保存!"
    )
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitness serviceDonationwitness) {
        boolean save = serviceDonationwitnessService.save(serviceDonationwitness);
        log.info("新增捐献见证是否成功：{},id为：{},infoId为：{}", save, serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
//        if (save) {
//            //生成“捐献者编号”
//            ServiceDonatebaseinfo serviceDonatebaseinfo = serviceDonatebaseinfoService.getById(serviceDonationwitness.getInfoid());
//            log.info("serviceDonatebaseinfo的信息为{}", serviceDonatebaseinfo);
//            String donorno = serviceDonatebaseinfoService.getDonateNumber(serviceDonatebaseinfo);
//            log.info("生成的捐献者编号为:{}", donorno);
//            serviceDonatebaseinfo.setDonorno(donorno);
//            serviceDonatebaseinfoService.updateById(serviceDonatebaseinfo);
//        }
        return AjaxResult.success(serviceDonationwitness);
    public AjaxResult add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) {
        boolean save = serviceDonationwitnessService.add(serviceDonationwitnessVO);
        log.info("新增捐献见证是否成功：{},id为：{},infoId为：{}", save, serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid());
        return AjaxResult.success(save);
    }

    /**
@@ -164,19 +139,10 @@
    @Log(title = "捐献见证", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonationwitness serviceDonationwitness) {
        log.info("新增捐献见证id为：{},infoId为：{}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());

        int last = -1;
        if (StringUtils.isNotEmpty(serviceDonationwitness.getDonorno())) {
            last = serviceDonationwitness.getDonorno().lastIndexOf("*");
        }
        //捐献者编号最后一位是 * ,才可以往唯一里表加数据
        if (last == serviceDonationwitness.getDonorno().length()) {
            onlyValueCommon.addOnlyValue("donationwitness");
        }

        return toAjax(serviceDonationwitnessService.updateById(serviceDonationwitness));
    public AjaxResult edit(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO) {
        log.info("新增捐献见证id为：{},infoId为：{}", serviceDonationwitnessVO.getId(), serviceDonationwitnessVO.getInfoid());
        Boolean edit = serviceDonationwitnessService.edit(serviceDonationwitnessVO);
        return toAjax(edit);
    }

    /**

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

@@ -2,13 +2,13 @@

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.dto.ReviewInitiateBaseInfoDTO;
import com.ruoyi.project.domain.dto.WitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.ReviewInitiateBaseInfoVO;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
@@ -92,8 +92,12 @@
     * æ–°å¢žä¼¦ç†å®¡æŸ¥å‘èµ·
     */
    @ApiOperation("新增伦理审查发起")
    // @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:add')")
    @Log(title = "伦理审查发起", businessType = BusinessType.INSERT)
    @UniqueCheck(
            fields = {"infoid"},
            entityClass = ServiceEthicalreviewinitiate.class,
            serviceClass = IServiceEthicalreviewinitiateService.class,
            message = "新增伦理审查的infoid已存在,无法保存!"
    )
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {

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

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

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
@@ -10,6 +11,7 @@
import com.ruoyi.project.domain.ServiceMedicalevaluation;
import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
import com.ruoyi.project.domain.vo.MedicalEvaluationWithBaseInfoVO;
import com.ruoyi.project.domain.vo.ServiceMedicalevaluationVO;
import com.ruoyi.project.service.IServiceDonationwitnessService;
import com.ruoyi.project.service.IServiceMedicalevaluationService;
import io.swagger.annotations.Api;
@@ -100,13 +102,18 @@
     * æ–°å¢žåŒ»å­¦è¯„ä¼°
     */
    @ApiOperation("新增医学评估")
    //// @PreAuthorize("@ss.hasPermi('project:medicalevaluation:add')")
    @Log(title = "医学评估", businessType = BusinessType.INSERT)
    @UniqueCheck(
            fields = {"infoid"},
            entityClass = ServiceMedicalevaluation.class,
            serviceClass = IServiceMedicalevaluationService.class,
            message = "新增医学评估的infoid已存在,无法保存!"
    )
    @PostMapping("/add")
//    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult add(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
        boolean save = serviceMedicalevaluationService.save(serviceMedicalevaluation);
        return AjaxResult.success(serviceMedicalevaluation);
    public AjaxResult add(@RequestBody ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
        log.info("新增医学评估的infoid为：{}",serviceMedicalevaluationVO.getInfoid());
        boolean save = serviceMedicalevaluationService.add(serviceMedicalevaluationVO);
        return AjaxResult.success(save);
    }

    /**
@@ -117,13 +124,10 @@
    @Log(title = "医学评估", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
//    @NotRepeatCommit(key = "param:arg[1]", value = 30000)
    public AjaxResult edit(@RequestBody ServiceMedicalevaluation serviceMedicalevaluation) {
        List<ServiceMedicalevaluation> list = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
        if (CollectionUtils.isEmpty(list)) {
            return error("医学评估数据不存在,请检查后再次修改");
        }
        serviceMedicalevaluation.setId(list.get(0).getId());
        return toAjax(serviceMedicalevaluationService.updateById(serviceMedicalevaluation));
    public AjaxResult edit(@RequestBody ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
        log.info("修改医学评估的主键为：{}",serviceMedicalevaluationVO.getId());
        Boolean edit = serviceMedicalevaluationService.edit(serviceMedicalevaluationVO);
        return toAjax(edit);
    }

    /**

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

@@ -2,6 +2,7 @@

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.annotation.UniqueCheck;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
@@ -13,12 +14,14 @@
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.PageUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceMedicalevaluation;
import com.ruoyi.project.domain.ServiceRelativesconfirmation;
import com.ruoyi.project.domain.dto.RelativeConfirmationBaseInfoDTO;
import com.ruoyi.project.domain.vo.RelativeConfirmationBaseInfoVO;
import com.ruoyi.project.domain.vo.RelativeConfirmationVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
import com.ruoyi.project.mapper.ServiceRelativesconfirmationMapper;
import com.ruoyi.project.service.IServiceMedicalevaluationService;
import com.ruoyi.project.service.IServiceRelativesconfirmationService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -125,8 +128,12 @@
     * æ–°å¢žæçŒ®äº²å±žç¡®è®¤
     */
    @ApiOperation("新增亲属确认")
    //// @PreAuthorize("@ss.hasPermi('project:relativesconfirmation:add')")
    @Log(title = "捐献亲属确认", businessType = BusinessType.INSERT)
    @UniqueCheck(
            fields = {"infoid"},
            entityClass = ServiceRelativesconfirmation.class,
            serviceClass = IServiceRelativesconfirmationService.class,
            message = "亲属确认新增的infoid已存在,无法保存!"
    )
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceRelativesconfirmation serviceRelativesconfirmation) {

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

@@ -128,9 +128,6 @@
    @Excel(name = "捐献器官")
    private String donateorgan;

    @TableField(exist = false)
    @ApiModelProperty("捐献器官移植表")
    private List<ServiceDonatecomporgan> serviceDonatecomporganList;

}


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

@@ -38,6 +38,13 @@
    private Long infoid;

    /**
     * å…³è”service_donatecompletioninfo表的ID
     */
    @ApiModelProperty("关联service_donatecompletioninfo表的ID")
    @Excel(name = "关联service_donatecompletioninfo表的ID")
    private Long donatecompletioninfoId;

    /**
     * å™¨å®˜ç±»åˆ« è¯¦è§å­—å…¸sys_Organ
     */
    @ApiModelProperty("器官类别 è¯¦è§å­—å…¸sys_Organ")

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

@@ -33,6 +33,11 @@
    @Excel(name = "关联service_donatebaseinfo表的ID")
    private Long infoid;

    /** å…³è”关联service_donatebaseinfo表的ID */
    @ApiModelProperty("关联关联service_donatebaseinfo表的ID")
    @Excel(name = "关联关联service_donatebaseinfo表的ID")
    private Long donationwitnessId;

    /** æçŒ®è€…编号 */
    @ApiModelProperty("捐献者编号")
    @Excel(name = "捐献者编号")

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

@@ -114,6 +114,7 @@
     */
    @ApiModelProperty("专家结论时间")
    @Excel(name = "专家结论时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date expertTime;

    /**

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

@@ -38,6 +38,13 @@
    private Long infoid;

    /**
     * å…³è”service_medicalevaluation表的ID
     */
    @ApiModelProperty("关联service_medicalevaluation表的ID")
    @Excel(name = "关联service_medicalevaluation表的ID")
    private Long medicalId;

    /**
     * æçŒ®è€…编号
     */
    @ApiModelProperty("捐献者编号")

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

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



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

@@ -190,5 +190,12 @@
    @Excel(name = "负责人姓名")
    private String responsibleusername;

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

}


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

@@ -220,7 +220,7 @@

    @ApiModelProperty("终止案例原因")
    @Excel(name = "终止案例")
    private Integer terminationResult;
    private String terminationResult;


    @ApiModelProperty("终止原因：1好转   2死亡   3不符合捐献标准  4家属放弃捐献  5其它")

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

@@ -29,12 +29,27 @@
    private Long infoid;

    /**
     * ä½é™¢å·
     */
    @ApiModelProperty("住院号")
    private String inpatientno;

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

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

    /** æçŒ®ç±»åˆ« æ ¹æ®å­—å…¸sys_DonationCategory */
    /**
     * æçŒ®ç±»åˆ« æ ¹æ®å­—å…¸sys_DonationCategory
     */
    @ApiModelProperty("捐献类别")
    @Excel(name = "捐献类别")
    private String donationcategory;

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

@@ -27,13 +27,22 @@
    private Long id;

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

    /**
     * è®°å½•çŠ¶æ€
     */
    @ApiModelProperty("记录状态")
    @Excel(name = "记录状态")
    private String recordstate;

    /** æçŒ®ç±»åˆ« æ ¹æ®å­—å…¸sys_DonationCategory */
    /**
     * æçŒ®ç±»åˆ« æ ¹æ®å­—å…¸sys_DonationCategory
     */
    @ApiModelProperty("捐献类别")
    @Excel(name = "捐献类别")
    private String donationcategory;

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

@@ -43,6 +43,20 @@
    private String name;

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

    /**
     * ä½é™¢å·
     */
    @ApiModelProperty("住院号")
    private String inpatientno;


    /**
     * è®°å½•çŠ¶æ€
     */
    @ApiModelProperty("记录状态")

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

@@ -27,6 +27,12 @@
    @Excel(name = "记录状态")
    private String recordstate;

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

    /**
     * æ¡ˆä¾‹ç¼–号
@@ -36,6 +42,34 @@
    private String caseNo;

    /**
     * æŠ¥å‘Šæ—¶é—´
     */
    @ApiModelProperty("报告时间")
    @Excel(name = "报告时间")
    private Date reportTime;

    /**
     * æ­»äº¡æ—¶é—´
     */
    @ApiModelProperty("死亡时间")
    @Excel(name = "死亡时间")
    private Date deathTime;

    /**
     * Rh阴性 0：否；1：是
     */
    @ApiModelProperty("Rh阴性 0：否；1：是")
    @Excel(name = "Rh阴性 0：否；1：是")
    private String rhYin;

    /**
     * ç—…情概况
     */
    @ApiModelProperty("病情概况")
    @Excel(name = "病情概况")
    private String illnessOverview;

    /**
     * æçŒ®è€…编号
     */
    @ApiModelProperty("捐献者编号")

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

@@ -27,7 +27,9 @@
    @ApiModelProperty("医学评估的id")
    private Long id;

    /** æçŒ®ç±»åˆ« æ ¹æ®å­—å…¸sys_DonationCategory */
    /**
     * æçŒ®ç±»åˆ« æ ¹æ®å­—å…¸sys_DonationCategory
     */
    @ApiModelProperty("捐献类别")
    @Excel(name = "捐献类别")
    private String donationcategory;
@@ -38,6 +40,18 @@
    @ApiModelProperty("baseInfo的id")
    private Long infoid;

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

    /**
     * ä½é™¢å·
     */
    @ApiModelProperty("住院号")
    private String inpatientno;

    /**
     * è®°å½•çŠ¶æ€
@@ -75,6 +89,12 @@
    private String treatmenthospitalno;

    /**
     * æçŒ®è€…姓名
     */
    @ApiModelProperty("捐献者姓名")
    private String name;

    /**
     * æ€§åˆ«
     */
    @ApiModelProperty("性别")

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

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

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;


    /**
     * å™¨å®˜æçŒ®ç¡®è®¤çš„ID
@@ -29,6 +36,11 @@
    @ApiModelProperty("器官捐献确认的ID")
    private Long id;

    /**
     * ä½é™¢å·
     */
    @ApiModelProperty("住院号")
    private String inpatientno;

    /**
     * è®°å½•çŠ¶æ€
@@ -77,6 +89,77 @@
    @ApiModelProperty("姓名")
    @Excel(name = "姓名")
    private String name;

    /**
     * äº²å±žå§“名
     */
    @ApiModelProperty("亲属姓名")
    @Excel(name = "亲属姓名")
    private String relativesName;

    /**
     * ä¸Žæèµ è€…关系 æ ¹æ®å­—å…¸sys_FamilyRelation
     */
    @ApiModelProperty("与捐赠者关系 æ ¹æ®å­—å…¸sys_FamilyRelation")
    @Excel(name = "与捐赠者关系 æ ¹æ®å­—å…¸sys_FamilyRelation")
    private String familyRelations;

    /**
     * äº²å±žè¯ä»¶ç±»åž‹ æ ¹æ®å­—å…¸sys_IDType
     */
    @ApiModelProperty("亲属证件类型 æ ¹æ®å­—å…¸sys_IDType")
    @Excel(name = "亲属证件类型 æ ¹æ®å­—å…¸sys_IDType")
    private int idCardType;

    /**
     * äº²å±žè¯ä»¶å·ç 
     */
    @ApiModelProperty("亲属证件号码")
    @Excel(name = "亲属证件号码")
    private int idCardNo;


    /**
     * äº²å±žè¯ä»¶å·ç 
     */
    @ApiModelProperty("亲属联系电话")
    @Excel(name = "亲属联系电话")
    private String phone;

    /**
     * å­å¥³æ•°é‡
     */
    @ApiModelProperty("子女数量")
    @Excel(name = "子女数量")
    private String kinshipChildrenNum;

    /**
     * äº²å±žå…³ç³»ç¡®è®¤ç­¾å­—
     */
    @ApiModelProperty("亲属关系确认签字")
    @Excel(name = "亲属关系确认签字")
    private String kinshipConfirmationSign;

    /**
     * ä¸Žæèµ è€…关系 æ ¹æ®å­—å…¸sys_FamilyRelation
     */
    @ApiModelProperty("签字人与捐赠者关系 æ ¹æ®å­—å…¸sys_FamilyRelation")
    @Excel(name = "签字人与捐赠者关系 æ ¹æ®å­—å…¸sys_FamilyRelation")
    private String signFamilyRelations;

    /**
     * æçŒ®å†³å®š è§å­—å…¸sys_OrganDecision
     */
    @ApiModelProperty("捐献决定 è§å­—å…¸sys_OrganDecision")
    @Excel(name = "捐献决定 è§å­—å…¸sys_OrganDecision")
    private String organDecision;

    /**
     * æçŒ®å†³å®š å…¶ä»–
     */
    @ApiModelProperty("捐献决定 å…¶ä»–")
    @Excel(name = "捐献决定 å…¶ä»–")
    private String organDecisionOther;

    /**
     * å¹´é¾„
@@ -174,10 +257,27 @@
    private String assessannex;

    /**
     * æ°‘族
     */
    @ApiModelProperty("民族")
    private String nation;

    /**
     * å­¦åŽ†
     */
    @ApiModelProperty("学历")
    private String education;

    /**
     * èŒä¸š
     */
    @ApiModelProperty("职业")
    private String occupation;


    /**
     * å®¶å±žæ„è§å¤‡æ³¨
     */
    @ApiModelProperty("家属意见备注")
    private String relativeRemark;


}

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

@@ -37,6 +37,13 @@


    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

    /**
     * è®°å½•çŠ¶æ€
     */
    @ApiModelProperty("记录状态")

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

@@ -35,6 +35,13 @@
    private Long id;

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

    /**
     * æ¡ˆä¾‹ç¼–号
     */
    @ApiModelProperty("案例编号")

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,136 @@
package com.ruoyi.project.domain.dto;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
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;

/**
 * æçŒ®å®Œæˆå¯¹è±¡ service_donatecompletioninfo
 *
 * @author ruoyi
 * @date 2021-11-19
 */
@Data
@ApiModel("捐献完成")
public class ServiceDonatecompletioninfoDTO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     *
     */
    @ApiModelProperty("")
    private Long infoid;

    /**
     * æçŒ®è€…编号
     */
    @ApiModelProperty("捐献者编号")
    @Excel(name = "捐献者编号")
    private String donorno;

    /**
     * æ˜¯å¦é—体捐献
     */
    @ApiModelProperty("是否遗体捐献")
    @Excel(name = "是否遗体捐献")
    private String isbodydonation;


    /**
     * æŽ¥æ”¶å•ä½åç§°
     */
    @ApiModelProperty("接收单位名称")
    @Excel(name = "接收单位名称")
    private String receivingunitname;

    /**
     * æŽ¥æ”¶å•ä½
     */
    @ApiModelProperty("接收单位")
    @Excel(name = "接收单位")
    private String receivingunit;

    /**
     * å®Œæˆæ—¶é—´
     */
    @ApiModelProperty("完成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date completetime;

    /**
     * è´Ÿè´£äººç¼–号
     */
    @ApiModelProperty("负责人编号")
    private String responsibleuserid;

    /**
     * è´Ÿè´£äººå§“名
     */
    @ApiModelProperty("负责人姓名")
    @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;


    @TableField(exist = false)
    @ApiModelProperty("捐献器官移植表")
    private List<ServiceDonatecomporgan> serviceDonatecomporganList;
}


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

ÎļþÒÑɾ³ý

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

@@ -52,6 +52,13 @@
    private String donorno;

    /**
     * æ‰©å±•å†…容
     */
    @ApiModelProperty("扩展内容")
    @Excel(name = "扩展内容")
    private String extracontent;

    /**
     * å™¨å®˜èŽ·å–机构编号
     */
    @ApiModelProperty("器官获取机构编号")

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

@@ -29,6 +29,12 @@
    @Excel(name = "记录状态")
    private String recordstate;

    /**
     * æŠ¥å‘Šæ—¶é—´
     */
    @ApiModelProperty("报告时间")
    @Excel(name = "报告时间")
    private Date reportTime;

    /**
     * æ¡ˆä¾‹ç¼–号

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

@@ -41,6 +41,13 @@
    private String caseNo;

    /**
     * ä½é™¢å·
     */
    @ApiModelProperty("住院号")
    private String inpatientno;


    /**
     * æçŒ®è€…编号
     */
    @ApiModelProperty("捐献者编号")

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,136 @@
package com.ruoyi.project.domain.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
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;

/**
 * æçŒ®å®Œæˆå¯¹è±¡ service_donatecompletioninfo
 *
 * @author ruoyi
 * @date 2021-11-19
 */
@Data
@ApiModel("捐献完成")
public class ServiceDonatecompletioninfoVO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     *
     */
    @ApiModelProperty("")
    private Long infoid;

    /**
     * æçŒ®è€…编号
     */
    @ApiModelProperty("捐献者编号")
    @Excel(name = "捐献者编号")
    private String donorno;

    /**
     * æ˜¯å¦é—体捐献
     */
    @ApiModelProperty("是否遗体捐献")
    @Excel(name = "是否遗体捐献")
    private String isbodydonation;


    /**
     * æŽ¥æ”¶å•ä½åç§°
     */
    @ApiModelProperty("接收单位名称")
    @Excel(name = "接收单位名称")
    private String receivingunitname;

    /**
     * æŽ¥æ”¶å•ä½
     */
    @ApiModelProperty("接收单位")
    @Excel(name = "接收单位")
    private String receivingunit;

    /**
     * å®Œæˆæ—¶é—´
     */
    @ApiModelProperty("完成时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "完成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date completetime;

    /**
     * è´Ÿè´£äººç¼–号
     */
    @ApiModelProperty("负责人编号")
    private String responsibleuserid;

    /**
     * è´Ÿè´£äººå§“名
     */
    @ApiModelProperty("负责人姓名")
    @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;

    @TableField(exist = false)
    @ApiModelProperty("捐献器官移植表")
    private List<ServiceDonatecomporgan> serviceDonatecomporganList;

}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,94 @@
package com.ruoyi.project.domain.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.project.domain.ServiceDonateorgan;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * æçŒ®å™¨å®˜åˆ†é…åŸºç¡€æ–°å¢žä¿®æ”¹è¯·æ±‚对象 service_donateorgan_base
 *
 * @author ls
 * @date 2026-01-17
 */
@Data
@ApiModel("捐献器官分配基础新增修改请求对象")
public class ServiceDonateorganBaseVO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * å…³è”service_donatebaseinfo表的ID
     */
    @ApiModelProperty("关联service_donatebaseinfo表的ID")
    @Excel(name = "关联service_donatebaseinfo表的ID")
    private Long infoid;

    /**
     * åˆ†é…çŠ¶æ€ï¼š0:未分配；1：已分配；2作废
     */
    @ApiModelProperty("分配状态：0:未分配；1：已分配；2作废")
    @Excel(name = "分配状态：0:未分配；1：已分配；2作废")
    private Long allocationStatus;

    /**
     * åˆ†é…æ—¶é—´
     */
    @ApiModelProperty("分配时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "分配时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date allocationTime;

    /**
     * ç™»è®°äººç¼–号
     */
    @ApiModelProperty("登记人编号")
    @Excel(name = "登记人编号")
    private String registrationCode;

    /**
     * ç™»è®°äººå§“名
     */
    @ApiModelProperty("登记人姓名")
    @Excel(name = "登记人姓名")
    private String registrationName;

    /**
     * ç™»è®°æ—¶é—´
     */
    @ApiModelProperty("登记时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "登记时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date registrationTime;

    /**
     * é¢„计时间
     */
    @ApiModelProperty("预计时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "预计时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date estimatedtime;

    /**
     * å•ä¸ªå™¨å®˜ç®¡ç†åˆ—表
     */
    @ApiModelProperty("单个器官管理列表")
    private List<ServiceDonateorgan> serviceDonateorganList;

}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,299 @@
package com.ruoyi.project.domain.vo;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

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

/**
 * æçŒ®è§è¯å¯¹è±¡ service_donationwitness
 *
 * @author ruoyi
 * @date 2021-11-17
 */
@Data
@ApiModel("捐献见证")
public class ServiceDonationwitnessVO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    //数据库自增改成@TableId(type = IdType.AUTO)
    @TableId(type = IdType.AUTO)
    private Long id;



    /**
     *
     */
    @ApiModelProperty("infoid")
    private Long infoid;

    /**
     * æçŒ®è€…编号
     */
    @ApiModelProperty("捐献者编号")
    @Excel(name = "捐献者编号")
    private String donorno;

    /**
     * å™¨å®˜èŽ·å–机构编号
     */
    @ApiModelProperty("器官获取机构编号")
    private String gainhospitalno;

    /**
     * å™¨å®˜èŽ·å–机构名称
     */
    @ApiModelProperty("器官获取机构名称")
    @Excel(name = "器官获取机构名称")
    private String gainhospitalname;

    /**
     * æ­»äº¡æ—¶é—´ï¼ˆåœç”¨ï¼‰
     */
    @ApiModelProperty("死亡时间（停用）")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "死亡时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date deathtime;

    /**
     * æ­»äº¡åŽŸå› ï¼ˆåœç”¨ï¼‰
     */
    @ApiModelProperty("死亡原因（停用）")
    @Excel(name = "死亡原因（停用）")
    private String deathreason;

    /**
     * æ­»äº¡åˆ¤å®šåŒ»ç”Ÿä¸€ï¼ˆåœç”¨ï¼‰
     */
    @ApiModelProperty("死亡判定医生一（停用）")
    @Excel(name = "死亡判定医生一（停用）")
    private String deathjudgedocto;

    /**
     * æ­»äº¡åˆ¤å®šåŒ»ç”ŸäºŒ
     */
    @ApiModelProperty("死亡判定医生二（停用）")
    @Excel(name = "死亡判定医生二（停用）")
    private String deathjudgedoctt;

    /**
     * æ­»äº¡è¯æ˜Žé™„件路径（停用）
     */
    @ApiModelProperty("死亡证明附件路径（停用）")
    private String deathjudgeannex;

    /**
     * æ‰‹æœ¯å¼€å§‹æ—¶é—´
     */
    @ApiModelProperty("手术开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "手术开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date operationbegtime;

    /**
     * æ‰‹æœ¯ç»“束时间
     */
    @ApiModelProperty("手术结束时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "手术结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date operationendtime;

    /**
     * æ‰‹æœ¯åŒ»ç”Ÿ
     */
    @ApiModelProperty("手术医生")
    @Excel(name = "手术医生")
    private String operationdoctor;

    /**
     * æ˜¯å¦é»˜å“€ç¼…怀仪式（停用）
     */
    @ApiModelProperty("是否默哀缅怀仪式（停用）")
    @Excel(name = "是否默哀缅怀仪式（停用）")
    private Integer isspendremember;

    /**
     * æ˜¯å¦æ¢å¤é—体仪容
     */
    @ApiModelProperty("是否恢复遗体仪容（停用）")
    @Excel(name = "是否恢复遗体仪容（停用）")
    private Integer isrestoreremains;

    /**
     * ç¼…怀仪式附件路径（停用）
     */
    @ApiModelProperty("缅怀仪式附件路径（停用）")
    private String rememberannex;

    /**
     * è´Ÿè´£äººç¼–号
     */
    @ApiModelProperty("负责人编号")
    private String responsibleuserid;

    /**
     * è´Ÿè´£äººå§“名
     */
    @ApiModelProperty("负责人姓名")
    @Excel(name = "负责人姓名")
    private String responsibleusername;

    /**
     * è”络人一编号
     */
    @ApiModelProperty("联络人一编号")
    private String coordinateduserido;

    /**
     * è”络人一姓名
     */
    @ApiModelProperty("联络人一姓名")
    private String coordinatedusernameo;

    /**
     * è”络人二编号
     */
    @ApiModelProperty("联络人二编号")
    private String coordinateduseridt;

    /**
     * è”络人二姓名
     */
    @ApiModelProperty("联络人二姓名")
    private String coordinatedusernamet;

    /**
     * è…¹ä¸»åŠ¨è„‰æ’管时间
     */
    @ApiModelProperty("腹主动脉插管时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "腹主动脉插管时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date abdominalaortacannulatime;

    /**
     * è…¹ä¸»åŠ¨è„‰çŒæ³¨æ—¶é—´
     */
    @ApiModelProperty("腹主动脉灌注时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "腹主动脉灌注时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date abdominalaortaperfusiontime;

    /**
     * é—¨é™è„‰æ’管时间
     */
    @ApiModelProperty("门静脉插管时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "门静脉插管时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date portalveincannulatime;

    /**
     * é—¨é™è„‰çŒæ³¨æ—¶é—´
     */
    @ApiModelProperty("门静脉灌注时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "门静脉灌注时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date portalveinperfusiontime;

    /**
     * è‚ºåŠ¨è„‰æ’管时间
     */
    @ApiModelProperty("肺动脉插管时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "肺动脉插管时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date pulmonaryarterycannulatime;

    /**
     * è‚ºåŠ¨è„‰çŒæ³¨æ—¶é—´
     */
    @ApiModelProperty("肺动脉灌注时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "肺动脉灌注时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date pulmonaryarteryperfusiontime;

    /**
     * ä¸»åŠ¨è„‰æ’管时间
     */
    @ApiModelProperty("主动脉插管时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "主动脉插管时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date aortacannulatime;

    /**
     * ä¸»åŠ¨è„‰çŒæ³¨æ—¶é—´
     */
    @ApiModelProperty("主动脉灌注时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    @Excel(name = "主动脉灌注时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date aortaperfusiontime;

    /**
     * æçŒ®å™¨å®˜
     */
    @ApiModelProperty("捐献器官")
    @Excel(name = "捐献器官")
    private String organdonation;

    /**
     * æçŒ®å™¨å®˜ å…¶ä»–
     */
    @ApiModelProperty("捐献器官 å…¶ä»–")
    @Excel(name = "捐献器官 å…¶ä»–")
    private String organdonationOther;


    /**
     * æçŒ®ç±»åˆ«
     */
    @ApiModelProperty("捐献类别")
    @Excel(name = "捐献类别")
    private String donationcategory;

    /**
     * åè°ƒå‘˜è¿›æ‰‹æœ¯å®¤æ—¶é—´
     */
    @ApiModelProperty("协调员进手术室时间")
    @Excel(name = "协调员进手术室时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date coordinatorInOperating;

    /**
     * åè°ƒå‘˜å‡ºæ‰‹æœ¯å®¤æ—¶é—´
     */
    @ApiModelProperty("协调员出手术室时间")
    @Excel(name = "协调员出手术室时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date coordinatorOutOperating;

    /**
     * åè°ƒå‘˜ç­¾å­—
     */
    @ApiModelProperty("协调员签字")
    @Excel(name = "协调员签字")
    private String coordinatorSign;

    /**
     * åè°ƒå‘˜ç­¾å­—时间
     */
    @ApiModelProperty("协调员签字时间")
    @Excel(name = "协调员签字时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date coordinatorSignTime;

    @ApiModelProperty("捐献见证器官信息集合")
    private List<ServiceDonationwitnessorgan> serviceDonationwitnessorganList;

}


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

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

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

/**
 * åŒ»å­¦è¯„估对象 service_medicalevaluation
@@ -21,6 +23,13 @@
@ApiModel("医学评估")
public class ServiceMedicalevaluationVO extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /**
     * ä¸»é”®ID
     */
    @ApiModelProperty("主键ID")
    @TableId(type = IdType.AUTO)
    private Long id;

    /**
     * å…³è”service_donatebaseinfo表的ID
@@ -100,6 +109,12 @@
    @Excel(name = "报告时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date reporttime;

    /**
     * æçŒ®å™¨å®˜è¯„估列表
     */
    @ApiModelProperty("捐献器官评估列表")
    @Excel(name = "捐献器官评估列表", readConverterExp = "捐献器官评估列表")
    private List<ServiceMedicalevaluationorgan> serviceMedicalevaluationorganList;

}


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

@@ -3,8 +3,11 @@
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.dto.ServiceDonatecompletioninfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.ServiceDonatecompletioninfoVO;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;

@@ -24,6 +27,10 @@
     */
    public List<ServiceDonatecompletioninfo> queryList(ServiceDonatecompletioninfo serviceDonatecompletioninfo);

    public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);

    public boolean edit(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO);

    /**
     * æŸ¥è¯¢æçŒ®å®Œæˆåˆ—表基本信息
     *
@@ -32,7 +39,7 @@
     */
    public List<DonationCompletionBaseInfoDTO> getDonationCompletionBaseInfo(DonationCompletionBaseInfoVO donationCompletionBaseInfoVO);

    public List<ServiceDonatecompletioninfo> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo);
    public List<ServiceDonatecompletioninfoDTO> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo);

    List<DonationCompletionVO> selectVOList(DonationCompletionVO donationCompletionVO);


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

@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonateorganBase;
import com.ruoyi.project.domain.vo.ServiceDonateorganBaseVO;
import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonateorganBaseInfoVO;
import org.springframework.web.bind.annotation.RequestBody;
@@ -27,6 +28,7 @@

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜åˆ†é…åŸºç¡€åˆ—表
     *
     * @param donateorganBaseInfoVO
     * @return
     */
@@ -39,4 +41,9 @@
     * @return æçŒ®å™¨å®˜åˆ†é…åŸºç¡€é›†åˆ
     */
    public List<ServiceDonateorganBase> exportQueryList(ServiceDonateorganBase serviceDonateorganBase);


    public Boolean add(ServiceDonateorganBaseVO serviceDonateorganBaseVO);

    public Boolean updateByParam(ServiceDonateorganBaseVO serviceDonateorganBaseVO);
}

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

@@ -3,12 +3,14 @@
import java.util.List;

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.vo.ServiceDonationwitnessVO;
import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
import com.ruoyi.project.domain.vo.TimeVO;
import com.ruoyi.project.domain.vo.WitnessStatsVO;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * æçŒ®è§è¯Service接口
@@ -28,12 +30,17 @@

    public List<ServiceDonationwitness> selectServiceDonationwitnessList(ServiceDonationwitness serviceDonationwitness);

    public Boolean add(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);

    public Boolean edit(@RequestBody ServiceDonationwitnessVO serviceDonationwitnessVO);

    /**
     * èŽ·å–捐献见证基本信息
     *
     * @param donationwitnessBaseInfoVO
     * @return
     */
    public List<DonationwitnessBaseInfoDTO>  getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO);
    public List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO);

    List<DonationWitnessVO> selectVOList(DonationWitnessVO donationWitnessVO);


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

@@ -5,6 +5,8 @@
import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
import com.ruoyi.project.domain.vo.MedicalEvaluationWithBaseInfoVO;
import com.ruoyi.project.domain.vo.ServiceMedicalevaluationVO;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;

@@ -25,6 +27,10 @@
     */
    public List<ServiceMedicalevaluation> queryList(ServiceMedicalevaluation serviceMedicalevaluation);

   public Boolean add(ServiceMedicalevaluationVO serviceMedicalevaluationVO);

   public Boolean edit(ServiceMedicalevaluationVO serviceMedicalevaluationVO);

    List<MedicalEvaluationVO> selectVOList(MedicalEvaluationVO medicalEvaluationVO);

    List<MedicalevaluationBaseInfoDTO> medevaluateBaseInfolist(MedicalEvaluationWithBaseInfoVO medicalEvaluationWithBaseInfoVO);

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

@@ -8,14 +8,17 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
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.dto.ServiceDonatecompletioninfoDTO;
import com.ruoyi.project.domain.vo.DonationCompletionBaseInfoVO;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.ServiceDonatecompletioninfoVO;
import com.ruoyi.project.mapper.ServiceDonatecompletioninfoMapper;
import com.ruoyi.project.mapper.ServiceDonationwitnessMapper;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
@@ -78,10 +81,43 @@
    }

    @Override
    public boolean add(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
        boolean b = false;
        if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
            b = this.save(serviceDonatecompletioninfo);
            if (b == true && CollectionUtils.isNotEmpty(serviceDonatecompletioninfoVO.getServiceDonatecomporganList())) {
                for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
                    serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfo.getInfoid());
                    serviceDonatecomporgan.setDonatecompletioninfoId(serviceDonatecompletioninfo.getId());
                    serviceDonatecomporganService.save(serviceDonatecomporgan);
                }
            }
        }
        return b;
    }

    @Override
    public boolean edit(ServiceDonatecompletioninfoVO serviceDonatecompletioninfoVO) {
        ServiceDonatecompletioninfo serviceDonatecompletioninfo = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoVO, ServiceDonatecompletioninfo.class);
        boolean b = false;
        if (ObjectUtils.isNotEmpty(serviceDonatecompletioninfo)) {
            b = this.updateById(serviceDonatecompletioninfo);
        }
        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoVO.getServiceDonatecomporganList())) {
            for (ServiceDonatecomporgan serviceDonatecomporgan : serviceDonatecompletioninfoVO.getServiceDonatecomporganList()) {
                serviceDonatecomporganService.updateById(serviceDonatecomporgan);
            }
        }

        return b;
    }

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

        if(CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
        if (CollectionUtils.isNotEmpty(donationCompletionBaseInfoDTOList) && donationCompletionBaseInfoVO.getPageNum() == null) {
            for (DonationCompletionBaseInfoDTO donationCompletionBaseInfoDTO : donationCompletionBaseInfoDTOList) {
                ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                serviceDonatecomporgan.setInfoid(donationCompletionBaseInfoDTO.getInfoid());
@@ -100,7 +136,7 @@
     * @return
     */
    @Override
    public List<ServiceDonatecompletioninfo> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
    public List<ServiceDonatecompletioninfoDTO> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        LambdaQueryWrapper<ServiceDonatecompletioninfo> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getDonorno())) {
            wrappers.eq(ServiceDonatecompletioninfo::getDonorno, serviceDonatecompletioninfo.getDonorno());
@@ -118,19 +154,21 @@
            wrappers.eq(ServiceDonatecompletioninfo::getInfoid, serviceDonatecompletioninfo.getInfoid());
        }
        List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList = this.list(wrappers);
        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoList)) {
            for (ServiceDonatecompletioninfo serviceDonatecompletioninfo1 : serviceDonatecompletioninfoList) {
                if (serviceDonatecompletioninfo1.getInfoid() != null) {

        List<ServiceDonatecompletioninfoDTO> serviceDonatecompletioninfoDTOList = DtoConversionUtils.sourceToTarget(serviceDonatecompletioninfoList, ServiceDonatecompletioninfoDTO.class);
        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoDTOList)) {
            for (ServiceDonatecompletioninfoDTO serviceDonatecompletioninfoDTO : serviceDonatecompletioninfoDTOList) {
                if (serviceDonatecompletioninfoDTO.getInfoid() != null) {
                    ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                    serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfo1.getInfoid());
                    serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfoDTO.getInfoid());
                    List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
                    serviceDonatecompletioninfo1.setServiceDonatecomporganList(serviceDonatecomporgans);
                    serviceDonatecompletioninfoDTO.setServiceDonatecomporganList(serviceDonatecomporgans);
                }

            }
        }

        return this.list(wrappers);
        return serviceDonatecompletioninfoDTOList;
    }



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

@@ -2,9 +2,12 @@

import java.util.List;

import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.ServiceDonateorganBaseVO;
import com.ruoyi.project.domain.dto.DonateorganBaseInfoDTO;
import com.ruoyi.project.domain.vo.DonateorganBaseInfoVO;
import com.ruoyi.project.mapper.ServiceDonateorganMapper;
@@ -13,9 +16,6 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

import java.util.ArrayList;
import java.util.Map;

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.ServiceDonateorganBaseMapper;
@@ -127,4 +127,36 @@
        return this.list(wrappers);
    }

    @Override
    public Boolean add(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
        ServiceDonateorganBase serviceDonateorganBase = DtoConversionUtils.sourceToTarget(serviceDonateorganBaseVO, ServiceDonateorganBase.class);
        boolean save = false;
        if (ObjectUtils.isNotEmpty(serviceDonateorganBase)) {
            save = save(serviceDonateorganBase);
            if (save == true && CollectionUtils.isNotEmpty(serviceDonateorganBaseVO.getServiceDonateorganList())) {
                for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganBaseVO.getServiceDonateorganList()) {
                    serviceDonateorgan.setBaseId(serviceDonateorganBase.getId());
                    serviceDonateorganMapper.insert(serviceDonateorgan);
                }
            }
        }

        return save;
    }

    @Override
    public Boolean updateByParam(ServiceDonateorganBaseVO serviceDonateorganBaseVO) {
        ServiceDonateorganBase serviceDonateorganBase = DtoConversionUtils.sourceToTarget(serviceDonateorganBaseVO, ServiceDonateorganBase.class);
        boolean b = false;
        if (ObjectUtils.isNotEmpty(serviceDonateorganBase)) {
            b = updateById(serviceDonateorganBase);
            if (b == true && CollectionUtils.isNotEmpty(serviceDonateorganBaseVO.getServiceDonateorganList())) {
                for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganBaseVO.getServiceDonateorganList()) {
                    serviceDonateorganMapper.updateById(serviceDonateorgan);
                }
            }
        }
        return b;
    }

}

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

@@ -8,7 +8,9 @@
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.vo.ServiceDonationwitnessVO;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO;
import com.ruoyi.project.domain.ServiceDonatebaseinfo;
@@ -83,13 +85,47 @@
    }

    @Override
    public Boolean add(ServiceDonationwitnessVO serviceDonationwitnessVO) {
        ServiceDonationwitness serviceDonationwitness = DtoConversionUtils.sourceToTarget(serviceDonationwitnessVO, ServiceDonationwitness.class);
        boolean save = false;
        if (ObjectUtils.isNotEmpty(serviceDonationwitness)) {
            save = save(serviceDonationwitness);
            if (save == true && ObjectUtils.isNotEmpty(serviceDonationwitnessVO.getServiceDonationwitnessorganList())) {
                for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessVO.getServiceDonationwitnessorganList()) {
                    serviceDonationwitnessorgan.setDonationwitnessId(serviceDonationwitness.getId());
                    serviceDonationwitnessorgan.setInfoid(serviceDonationwitness.getInfoid());
                    serviceDonationwitnessorganMapper.insert(serviceDonationwitnessorgan);
                }
            }
        }
        return save;
    }

    @Override
    public Boolean edit(ServiceDonationwitnessVO serviceDonationwitnessVO) {
        ServiceDonationwitness serviceDonationwitness = DtoConversionUtils.sourceToTarget(serviceDonationwitnessVO, ServiceDonationwitness.class);
        boolean update = false;
        if (ObjectUtils.isNotEmpty(serviceDonationwitness)) {
            update = updateById(serviceDonationwitness);
        }

        if (ObjectUtils.isNotEmpty(serviceDonationwitnessVO.getServiceDonationwitnessorganList())) {
            for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessVO.getServiceDonationwitnessorganList()) {
                serviceDonationwitnessorganMapper.updateById(serviceDonationwitnessorgan);
            }
        }

        return update;
    }

    @Override
    public List<DonationwitnessBaseInfoDTO> getDonationwitnessBaseInfo(DonationwitnessBaseInfoVO donationwitnessBaseInfoVO) {
        List<DonationwitnessBaseInfoDTO> donationwitnessBaseInfos = serviceDonationwitnessMapper.getDonationwitnessBaseInfo(donationwitnessBaseInfoVO);

        //获取所有器官信息
        if (!CollectionUtils.isEmpty(donationwitnessBaseInfos)&&donationwitnessBaseInfoVO.getPageNum()!=null) {
            for (DonationwitnessBaseInfoDTO donationwitnessBaseInfoDTO:donationwitnessBaseInfos) {
                ServiceDonationwitnessorgan serviceDonationwitnessorgan=new ServiceDonationwitnessorgan();
        if (!CollectionUtils.isEmpty(donationwitnessBaseInfos) && donationwitnessBaseInfoVO.getPageNum() != null) {
            for (DonationwitnessBaseInfoDTO donationwitnessBaseInfoDTO : donationwitnessBaseInfos) {
                ServiceDonationwitnessorgan serviceDonationwitnessorgan = new ServiceDonationwitnessorgan();
                serviceDonationwitnessorgan.setInfoid(donationwitnessBaseInfoDTO.getInfoid());
                List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganMapper.selectServiceDonationwitnessorganList(serviceDonationwitnessorgan);
                donationwitnessBaseInfoDTO.setServiceDonationwitnessorgans(serviceDonationwitnessorgans);

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

@@ -33,6 +33,9 @@
        if (serviceDonationwitnessorgan.getInfoid() != null) {
            wrappers.eq(ServiceDonationwitnessorgan::getInfoid, serviceDonationwitnessorgan.getInfoid());
        }
        if (serviceDonationwitnessorgan.getDonationwitnessId() != null) {
            wrappers.eq(ServiceDonationwitnessorgan::getDonationwitnessId, serviceDonationwitnessorgan.getDonationwitnessId());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getDonorno())) {
            wrappers.eq(ServiceDonationwitnessorgan::getDonorno, serviceDonationwitnessorgan.getDonorno());
        }

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

@@ -8,11 +8,13 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.project.domain.ServiceMedicalevaluationorgan;
import com.ruoyi.project.domain.dto.MedicalevaluationBaseInfoDTO;
import com.ruoyi.project.domain.ServiceMedicalevaluation;
import com.ruoyi.project.domain.vo.MedicalEvaluationVO;
import com.ruoyi.project.domain.vo.MedicalEvaluationWithBaseInfoVO;
import com.ruoyi.project.domain.vo.ServiceMedicalevaluationVO;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoMapper;
import com.ruoyi.project.mapper.ServiceMedicalevaluationMapper;
import com.ruoyi.project.mapper.ServiceMedicalevaluationorganMapper;
@@ -73,6 +75,32 @@
    }

    @Override
    public Boolean add(ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
        ServiceMedicalevaluation serviceMedicalevaluation = DtoConversionUtils.sourceToTarget(serviceMedicalevaluationVO, ServiceMedicalevaluation.class);
        boolean save = save(serviceMedicalevaluation);
        if(save && CollectionUtils.isNotEmpty(serviceMedicalevaluationVO.getServiceMedicalevaluationorganList())){
            for (ServiceMedicalevaluationorgan serviceMedicalevaluationorgan:serviceMedicalevaluationVO.getServiceMedicalevaluationorganList()) {
                serviceMedicalevaluationorgan.setInfoid(serviceMedicalevaluation.getInfoid());
                serviceMedicalevaluationorgan.setMedicalId(serviceMedicalevaluation.getId());
                serviceMedicalevaluationorganMapper.insert(serviceMedicalevaluationorgan);
            }
        }
        return save;
    }

    @Override
    public Boolean edit(ServiceMedicalevaluationVO serviceMedicalevaluationVO) {
        ServiceMedicalevaluation serviceMedicalevaluation = DtoConversionUtils.sourceToTarget(serviceMedicalevaluationVO, ServiceMedicalevaluation.class);
        boolean update = updateById(serviceMedicalevaluation);
        if(update && CollectionUtils.isNotEmpty(serviceMedicalevaluationVO.getServiceMedicalevaluationorganList())){
            for (ServiceMedicalevaluationorgan serviceMedicalevaluationorgan:serviceMedicalevaluationVO.getServiceMedicalevaluationorganList()) {
                serviceMedicalevaluationorganMapper.updateById(serviceMedicalevaluationorgan);
            }
        }
        return update;
    }

    @Override
    public List<MedicalEvaluationVO> selectVOList(MedicalEvaluationVO medicalEvaluationVO) {

        SysUser user = SecurityUtils.getLoginUser().getUser();

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

@@ -85,6 +85,8 @@
        sd.treatmenthospitalno AS treatmenthospitalno,
        sd.DonorNo AS donorno,
        sd.case_no AS caseNo,
        sd.InpatientNo AS inpatientno,
        sd.extracontent AS extracontent,
        sd.Name AS NAME,
        sd.RecordState AS recordstate,
        sd.Sex AS sex,
@@ -92,7 +94,7 @@
        sd.BloodType AS bloodtype,
        sd.idcardno AS idcardno,
        sd.diagnosisname AS diagnosisname,
        sdi.infoID AS infoid,
        sd.ID AS infoid,
        sdi.ID AS id,
        sdi.GainHospitalNo as gainhospitalno,
        sdi.GainHospitalName as gainhospitalname,
@@ -114,7 +116,8 @@
        AND sdi.ID IS NOT NULL
        <where>
            sd.termination_case = 0
            <if test="infoid != null ">and se.InfoID = #{infoid}</if>
            <if test="infoid != null ">and sd.ID = #{infoid}</if>
            <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
            <if test="caseNo != null  and caseNo != ''">and sd.case_no = #{caseNo}</if>
            <if test="name != null  and name != ''">and sd.Name = #{name}</if>
            <if test="donorno != null  and donorno != ''">and sd.DonorNo = #{donorno}</if>

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

@@ -183,6 +183,7 @@
        sd.treatmenthospitalno AS treatmenthospitalno,
        sd.DonorNo AS donorno,
        sd.case_no AS caseNo,
        sd.extracontent AS extracontent,
        sd.DonationCategory as donationcategory,
        sd.NAME AS name,
        sd.RecordState AS recordstate,

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

@@ -1,57 +1,89 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonatefollowupMapper">
    

    <resultMap type="com.ruoyi.project.domain.ServiceDonatefollowup" id="ServiceDonatefollowupResult">
        <result property="id"    column="ID"    />
        <result property="seqno"    column="seqNo"    />
        <result property="infoid"    column="InfoID"    />
        <result property="organid"    column="OrganID"    />
        <result property="recipientname"    column="recipientName"    />
        <result property="recipientphone"    column="recipientPhone"    />
        <result property="recipientdescribe"    column="recipientDescribe"    />
        <result property="hospitalno"    column="hospitalNo"    />
        <result property="hospitalname"    column="hospitalName"    />
        <result property="hospitaldept"    column="hospitalDept"    />
        <result property="doctorname"    column="doctorName"    />
        <result property="doctorphone"    column="doctorPhone"    />
        <result property="doctordescribe"    column="doctorDescribe"    />
        <result property="donateresult"    column="donateResult"    />
        <result property="followupdescribe"    column="followupDescribe"    />
        <result property="followupno"    column="followupNo"    />
        <result property="followuptime"    column="followupTime"    />
        <result property="del_flag"    column="del_flag"    />
        <result property="createBy"    column="create_by"    />
        <result property="createTime"    column="create_time"    />
        <result property="updateBy"    column="update_by"    />
        <result property="updateTime"    column="update_time"    />
        <result property="id" column="ID"/>
        <result property="seqno" column="seqNo"/>
        <result property="infoid" column="InfoID"/>
        <result property="organid" column="OrganID"/>
        <result property="recipientname" column="recipientName"/>
        <result property="recipientphone" column="recipientPhone"/>
        <result property="recipientdescribe" column="recipientDescribe"/>
        <result property="hospitalno" column="hospitalNo"/>
        <result property="hospitalname" column="hospitalName"/>
        <result property="hospitaldept" column="hospitalDept"/>
        <result property="doctorname" column="doctorName"/>
        <result property="doctorphone" column="doctorPhone"/>
        <result property="doctordescribe" column="doctorDescribe"/>
        <result property="donateresult" column="donateResult"/>
        <result property="followupdescribe" column="followupDescribe"/>
        <result property="followupno" column="followupNo"/>
        <result property="followuptime" column="followupTime"/>
        <result property="del_flag" column="del_flag"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
    </resultMap>

    <sql id="selectServiceDonatefollowupVo">
        select ID, seqNo, InfoID, OrganID, recipientName, recipientPhone, recipientDescribe, hospitalNo, hospitalName, hospitalDept, doctorName, doctorPhone, doctorDescribe, donateResult, followupDescribe, followupNo, followupTime, del_flag, create_by, create_time, update_by, update_time from service_donatefollowup
        select ID,
               seqNo,
               InfoID,
               OrganID,
               recipientName,
               recipientPhone,
               recipientDescribe,
               hospitalNo,
               hospitalName,
               hospitalDept,
               doctorName,
               doctorPhone,
               doctorDescribe,
               donateResult,
               followupDescribe,
               followupNo,
               followupTime,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time
        from service_donatefollowup
    </sql>

    <select id="selectServiceDonatefollowupList" parameterType="com.ruoyi.project.domain.ServiceDonatefollowup" resultMap="ServiceDonatefollowupResult">
    <select id="selectServiceDonatefollowupList" parameterType="com.ruoyi.project.domain.ServiceDonatefollowup"
            resultMap="ServiceDonatefollowupResult">
        <include refid="selectServiceDonatefollowupVo"/>
        <where>
            <if test="seqno != null "> and seqNo = #{seqno}</if>
            <if test="recipientname != null  and recipientname != ''"> and recipientName like concat('%', #{recipientname}, '%')</if>
            <if test="hospitalname != null  and hospitalname != ''"> and hospitalName like concat('%', #{hospitalname}, '%')</if>
            <if test="donateresult != null  and donateresult != ''"> and donateResult = #{donateresult}</if>
            <if test="seqno != null ">and seqNo = #{seqno}</if>
            <if test="recipientname != null  and recipientname != ''">and recipientName like concat('%',
                #{recipientname}, '%')
            </if>
            <if test="hospitalname != null  and hospitalname != ''">and hospitalName like concat('%', #{hospitalname},
                '%')
            </if>
            <if test="donateresult != null  and donateresult != ''">and donateResult = #{donateresult}</if>
        </where>
    </select>
    <select id="selectAll" resultType="com.ruoyi.project.domain.ServiceDonatefollowup">
        <include refid="selectServiceDonatefollowupVo"/>
        <where>
            <if test="seqno != null "> and seqNo = #{seqno}</if>
            <if test="infoid != null "> and InfoID = #{infoid}</if>
            <if test="organid != null "> and OrganID = #{organid}</if>
            <if test="recipientname != null  and recipientname != ''"> and recipientName like concat('%', #{recipientname}, '%')</if>
            <if test="hospitalname != null  and hospitalname != ''"> and hospitalName like concat('%', #{hospitalname}, '%')</if>
            <if test="donateresult != null  and donateresult != ''"> and donateResult = #{donateresult}</if>
            <if test="seqno != null ">and seqNo = #{seqno}</if>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="organid != null ">and OrganID = #{organid}</if>
            <if test="recipientname != null  and recipientname != ''">and recipientName like concat('%',
                #{recipientname}, '%')
            </if>
            <if test="hospitalname != null  and hospitalname != ''">and hospitalName like concat('%', #{hospitalname},
                '%')
            </if>
            <if test="donateresult != null  and donateresult != ''">and donateResult = #{donateresult}</if>
        </where>
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>
    <select id="selectFollowUpById" resultType="com.ruoyi.project.domain.ServiceDonatefollowup">
        <include refid="selectServiceDonatefollowupVo"/>
@@ -124,14 +156,18 @@
        )))

        <where>
            <if test="donorno != null  and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
            <if test="name != null  and name != ''"> and `service_donatebaseinfo`.`Name` = #{name}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
            <if test="basecreateby != null  and basecreateby != ''"> and `service_donatebaseinfo`.`create_by` = #{basecreateby}</if>
            <if test="donorno != null  and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
            <if test="name != null  and name != ''">and `service_donatebaseinfo`.`Name` = #{name}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''">and
                `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
            </if>
            <if test="basecreateby != null  and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
                #{basecreateby}
            </if>
        </where>

        order by `service_donatefollowup`.`create_time` desc

    </select>

</mapper>
</mapper>

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

@@ -37,12 +37,14 @@
        from service_donatemaintenance
    </sql>

    <select id="selectServiceDonatemaintenanceList" parameterType="com.ruoyi.project.domain.ServiceDonatemaintenance"
            resultType="com.ruoyi.project.domain.dto.DonationCompletionBaseInfoDTO">
    <select id="selectServiceDonatemaintenanceList" parameterType="com.ruoyi.project.domain.vo.MaintenanceBaseInfoVO"
            resultType="com.ruoyi.project.domain.dto.MaintenanceBaseInfoDTO">
        select
        sd.treatmenthospitalname AS treatmenthospitalname,
        sd.treatmenthospitalno AS treatmenthospitalno,
        sd.DonorNo AS donorno,
        sd.extracontent AS extracontent,
        sd.inpatientno AS inpatientno,
        sd.DonationCategory as donationcategory,
        sd.case_no AS caseNo,
        sd.NAME AS name,
@@ -52,10 +54,15 @@
        sd.BloodType AS bloodtype,
        sd.idcardno AS idcardno,
        sd.diagnosisname AS diagnosisname,
        sdm.id AS infoid,
        sd.ReportTime AS reportTime,
        sd.RhYin AS rhYin,
        sd.IllnessOverview AS illnessOverview,
        sd.id AS infoid,
        sdm.id AS id,
        sdm.item_no as itemNo,
        sdm.item_name as itemName,
        sdm.item_time as itemTime,
        sdt.DeathTime as deathTime,
        sdm.item_desc as itemDesc
        FROM
        service_donatebaseinfo sd
@@ -63,10 +70,13 @@
        AND sd.del_flag = 0
        AND sdm.del_flag = 0
        and sdm.ID is not null
        left join service_deathinfo sdt on sd.ID = sdt.infoID and sdt.del_flag=0 and sdt.ID is not null
        <where>
            sd.termination_case = 0
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="infoid != null ">and sd.ID = #{infoid}</if>
            <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
            <if test="caseNo != null  and caseNo != ''">and case_no = #{caseNo}</if>
            <if test="reportTime != null ">and ReportTime = #{reportTime}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
            <if test="name != null  and name != ''">and name = #{name}</if>
            <if test="coordinatorName != null  and coordinatorName != ''">and coordinator_name = #{coordinatorName}</if>
@@ -75,6 +85,7 @@
            <if test="itemTime != null ">and item_time = #{itemTime}</if>
            <if test="itemDesc != null  and itemDesc != ''">and item_desc = #{itemDesc}</if>
        </where>
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>

</mapper>

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

@@ -63,6 +63,8 @@
        sd.DonorNo AS donorno,
        sd.DonationCategory as donationcategory,
        sd.case_no AS caseNo,
        sd.extracontent AS extracontent,
        sd.InpatientNo AS inpatientno,
        sd.Name AS NAME,
        sd.Sex AS sex,
        sd.Age AS age,
@@ -82,6 +84,8 @@
        <where>
            sd.termination_case = 0
            <if test="donorno != null  and donorno != ''">and sd.DonorNo = #{donorno}</if>
            <if test="infoid != null ">and sd.ID = #{infoid}</if>
            <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
            <if test="treatmenthospitalname != null  and treatmenthospitalname != ''">and sd.treatmenthospitalname like
                concat('%', #{treatmenthospitalname}, '%')
            </if>

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

@@ -108,7 +108,8 @@
        </where>
    </select>

    <select id="getDonationwitnessBaseInfo" parameterType="com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO" resultType="com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO">
    <select id="getDonationwitnessBaseInfo" parameterType="com.ruoyi.project.domain.vo.DonationwitnessBaseInfoVO"
            resultType="com.ruoyi.project.domain.dto.DonationwitnessBaseInfoDTO">
        select
        sd.treatmenthospitalname AS treatmenthospitalname,
        sd.treatmenthospitalno AS treatmenthospitalno,
@@ -116,6 +117,8 @@
        sd.DonorNo AS donorno,
        sd.case_no AS caseNo,
        sd.NAME AS name,
        sd.extracontent AS extracontent,
        sd.InpatientNo AS inpatientno,
        sd.RecordState AS recordstate,
        sd.Sex AS sex,
        sd.Age AS age,
@@ -124,6 +127,7 @@
        sd.diagnosisname AS diagnosisname,
        st.coordinator_in_operating as coordinatorInOperating,
        sd.id AS infoid,
        st.id as id,
        st.coordinator_out_operating as coordinatorOutOperating,
        st.coordinator_sign as coordinatorSign,
        st.coordinator_sign_time as coordinatorSignTime,
@@ -162,11 +166,12 @@
            <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 st.DonorNo = #{donorno}</if>
            <if test="gainhospitalname != null  and gainhospitalname != ''">and  st.GainHospitalName like concat('%',
            <if test="gainhospitalname != null  and gainhospitalname != ''">and st.GainHospitalName like concat('%',
                #{gainhospitalname}, '%')
            </if>
            <if test="operationdoctor != null  and operationdoctor != ''">and  st.OperationDoctor = #{operationdoctor}</if>
            <if test="infoid != null">and  st.InfoID = #{infoid}</if>
            <if test="operationdoctor != null  and operationdoctor != ''">and st.OperationDoctor = #{operationdoctor}
            </if>
            <if test="infoid != null">and sd.ID = #{infoid}</if>
        </where>
        <if test="pageNum != null and pageSize != null">limit #{pageNum},#{pageSize}</if>
    </select>

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

@@ -7,6 +7,7 @@
    <resultMap type="com.ruoyi.project.domain.ServiceDonationwitnessorgan" id="ServiceDonationwitnessorganResult">
        <result property="id" column="ID"/>
        <result property="infoid" column="InfoID"/>
        <result property="donationwitnessId" column="donationwitness_id"/>
        <result property="donorno" column="DonorNo"/>
        <result property="organno" column="OrganNo"/>
        <result property="organname" column="OrganName"/>
@@ -35,6 +36,7 @@
    <sql id="selectServiceDonationwitnessorganVo">
        select ID,
               InfoID,
               donationwitness_id,
               DonorNo,
               organ_start_time,
               OrganNo,

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

@@ -85,6 +85,8 @@
        sd.treatmenthospitalno as treatmenthospitalno,
        sd.DonationCategory as donationcategory,
        sd.DonorNo as donorno,
        sd.extracontent as extracontent,
        sd.InpatientNo as inpatientno,
        sd.case_no as caseNo,
        sd.Name as name,
        sd.RecordState as recordstate,
@@ -106,8 +108,8 @@
        AND se.del_flag = 0 and se.ID is not null
        <where>
            sd.termination_case = 0

            <if test="infoid != null ">and se.InfoID = #{infoid}</if>
            <if test="infoid != null ">and sd.id = #{infoid}</if>
            <if test="inpatientno != null ">and sd.InpatientNo = #{inpatientno}</if>
            <if test="caseNo != null  and caseNo != ''">and sd.case_no = #{caseNo}</if>
            <if test="expertConclusion != null ">and se.expert_conclusion = #{expertConclusion}</if>
            <if test="expertName != null ">and se.expert_name = #{expertName}</if>

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

@@ -21,7 +21,7 @@
        <result property="depositbank" column="DepositBank"/>
        <result property="branchbankname" column="BranchBankName"/>
        <result property="bankcardno" column="BankCardNo"/>
        <result property="del_flag" column="del_flag"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>

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

@@ -45,6 +45,7 @@
        <result property="treatmenthospitalno" column="TreatmentHospitalNo"/>
        <result property="sex" column="Sex"/>
        <result property="age" column="Age"/>
        <result property="name" column="Name"/>
        <result property="bloodtype" column="BloodType"/>
        <result property="idcardno" column="idcardno"/>
        <result property="diagnosisname" column="diagnosisname"/>
@@ -53,6 +54,8 @@
        <result property="assessState" column="assess_state"/>
        <result property="assessannex" column="AssessAnnex"/>
        <result property="donationcategory" column="donationcategory"/>
        <result property="extracontent" column="extracontent"/>
        <result property="inpatientno" column="InpatientNo"/>
    </resultMap>

    <sql id="selectServiceMedicalevaluationVo">
@@ -198,6 +201,7 @@
        sb.DonorNo,
        sb.case_no,
        sb.Name,
        sb.extracontent,
        sb.Sex,
        sb.Age,
        sb.BloodType,
@@ -206,7 +210,7 @@
        sb.recordstate,
        sb.coordinator_name,
        sb.id as infoID,
        sm.ID,
        sm.ID as id,
        sm.assessannex,
        sm.assess_time,
        sm.assess_state
@@ -215,7 +219,8 @@
        and sb.del_flag = 0 and sm.ID is not null
        <where>
            sb.termination_case = 0
            <if test="infoid != null">AND sm.InfoID = #{infoid}</if>
            <if test="infoid != null">AND sb.ID = #{infoid}</if>
            <if test="inpatientno != null">AND sb.InpatientNo = #{inpatientno}</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>

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

@@ -7,6 +7,7 @@
    <resultMap type="com.ruoyi.project.domain.ServiceMedicalevaluationorgan" id="ServiceMedicalevaluationorganResult">
        <result property="id" column="ID"/>
        <result property="infoid" column="InfoID"/>
        <result property="medicalId" column="medical_id"/>
        <result property="donorno" column="DonorNo"/>
        <result property="organno" column="OrganNo"/>
        <result property="organname" column="OrganName"/>
@@ -30,6 +31,7 @@
    <sql id="selectServiceMedicalevaluationorganVo">
        select ID,
               InfoID,
               medical_id,
               DonorNo,
               assesscontent,
               OrganNo,
@@ -57,6 +59,7 @@
        <include refid="selectServiceMedicalevaluationorganVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="medicalId != null ">and medical_id = #{medicalId}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
            <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
            <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>

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

@@ -271,33 +271,51 @@
        sd.DonorNo as donorno,
        sd.case_no as caseNo,
        sd.Name as name,
        sd.InpatientNo as inpatientno,
        sd.extracontent as extracontent,
        sd.RecordState as recordstate,
        sd.Sex as sex,
        sd.Age as age,
        sd.BloodType as bloodtype,
        sd.idcardno as idcardno,
        sd.diagnosisname as diagnosisname,
        sr.infoID as infoid,
        sd.ID as infoid,
        sr.ID as id,
        sr.Name as relativesName,
        sr.FamilyRelations as familyRelations,
        sr.IDCardType as idCardType,
        sr.IDCardNo as idCardNo,
        sr.Phone as phone,
        sr.Kinship_ChildrenNum as kinshipChildrenNum,
        sr.KinshipConfirmationSign as kinshipConfirmationSign,
        sr.RelativeConfirmationSign as relativeConfirmationSign,
        sr.OrganDecision as organDecision,
        sr.OrganDecision_Other as organDecisionOther,
        sr.SignFamilyRelations as signFamilyRelations,
        sr.SignDate as signdate,
        sr.ResponsibleUserName as responsibleusername,
        sr.ResponsibleUserID as responsibleuserid,
        sr.CoordinatedUserIDO as coordinateduserido,
        sr.CoordinatedUserNameO as coordinatedusernameo,
        sr.CoordinatedUserNameT as coordinateduseridt,
        sr.ResponsibleUserID as responsibleuserid
        sr.ResponsibleUserID as responsibleuserid,
        sr.nation as nation,
        sr.occupation as occupation,
        sr.relative_remark as relativeRemark,
        sr.assessannex as assessannex,
        sr.education as education
        FROM service_donatebaseinfo sd
        LEFT JOIN service_relativesconfirmation sr ON sd.ID = sr.InfoID and sd.del_flag = 0
        AND sr.del_flag = 0
        <where>
            <if test="infoid != null and infoid != ''">AND sr.InfoID = #{infoid}</if>
            <if test="infoid != null">AND sd.ID = #{infoid}</if>
            <if test="recordstate != null and recordstate != ''">AND sd.RecordState = #{recordstate}</if>
            <if test="caseNo != null and caseNo != ''">AND sd.case_no = #{caseNo}</if>
            <if test="treatmenthospitalname != null and treatmenthospitalname != ''">AND sd.TreatmentHospitalName =
                #{treatmenthospitalname}
            </if>
            <if test="name != null and name != ''">AND sd.Name = #{name}</if>
            <if test="inpatientno != null ">AND sd.InpatientNo = #{inpatientno}</if>
            <if test="responsibleusername != null and responsibleusername != ''">AND sd.ResponsibleUserName =
                #{responsibleusername}
            </if>