代码提交

liusheng

2023-12-25 2b7ad68415a5bced753fa76699fa16ee3142859b

代码提交

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

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

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.core.controller.BaseController;
@@ -9,11 +8,13 @@
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.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecompletioninfoService;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import com.ruoyi.project.service.IServiceDonateorganService;
import freemarker.template.Configuration;
import freemarker.template.Template;
@@ -46,6 +47,9 @@

    @Autowired
    private IServiceDonateorganService serviceDonateorganService;

    @Autowired
    private IServiceDonatecomporganService serviceDonatecomporganService;

    private static Configuration configuration = null;

@@ -117,6 +121,50 @@
        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
    }

//    /**
//     * æ–°å¢žæçŒ®å®Œæˆè¯¦æƒ…
//     */
//    @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);
//            }
//        }
//        return toAjax(serviceDonatecompletioninfoService.save(serviceDonatecompletioninfo));
//    }

    @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);
    }

    /**
     * ä¿®æ”¹æçŒ®å®Œæˆ
     */

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,129 @@
package com.ruoyi.web.controller.project;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
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.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

/**
 * æçŒ®å™¨å®˜ç§»æ¤Controller
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Slf4j
@Api("捐献器官移植")
@RestController
@RequestMapping("/project/donatecomporgan")
public class ServiceDonatecomporganController extends BaseController {
    @Autowired
    private IServiceDonatecomporganService serviceDonatecomporganService;

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜ç§»æ¤åˆ—表
     */
    @ApiOperation("查询捐献器官移植列表")
    @PreAuthorize("@ss.hasPermi('system:donatecomporgan:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonatecomporgan serviceDonatecomporgan) {
        startPage();
        List<ServiceDonatecomporgan> list = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæçŒ®å™¨å®˜ç§»æ¤åˆ—表
     */
    @ApiOperation("导出捐献器官移植列表")
    @PreAuthorize("@ss.hasPermi('system:donatecomporgan:export')")
    @Log(title = "捐献器官移植", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatecomporgan serviceDonatecomporgan) {
        List<ServiceDonatecomporgan> list = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
        ExcelUtil<ServiceDonatecomporgan> util = new ExcelUtil<ServiceDonatecomporgan>(ServiceDonatecomporgan.class);
        return util.exportExcel(list, "捐献器官移植数据");
    }

    /**
     * èŽ·å–捐献器官移植详细信息
     */
    @ApiOperation("获取捐献器官移植详细信息")
    @PreAuthorize("@ss.hasPermi('system:donatecomporgan:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonatecomporganService.getById(id));
    }

    /**
     * æ–°å¢žæçŒ®å™¨å®˜ç§»æ¤
     */
    @ApiOperation("新增捐献器官移植")
    @PreAuthorize("@ss.hasPermi('system:donatecomporgan:add')")
    @Log(title = "捐献器官移植", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatecomporgan serviceDonatecomporgan) {
        return toAjax(serviceDonatecomporganService.save(serviceDonatecomporgan));
    }

    /**
     * ä¿®æ”¹æçŒ®å™¨å®˜ç§»æ¤
     */
    @ApiOperation("修改捐献器官移植")
    @PreAuthorize("@ss.hasPermi('system:donatecomporgan:edit')")
    @Log(title = "捐献器官移植", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonatecomporgan serviceDonatecomporgan) {
        return toAjax(serviceDonatecomporganService.updateById(serviceDonatecomporgan));
    }

    /**
     * åˆ é™¤æçŒ®å™¨å®˜ç§»æ¤
     */
    @ApiOperation("删除捐献器官移植")
    @PreAuthorize("@ss.hasPermi('system:donatecomporgan:remove')")
    @Log(title = "捐献器官移植", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonatecomporganService.removeByIds(Arrays.asList(ids)));
    }


    @RepeatSubmit
    @ApiOperation("新增或修改捐献器官移植")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonatecomporgan")
    public AjaxResult saveOrUpdateDonatecomporgan(@RequestBody List<ServiceDonatecomporgan> serviceDonatecomporganList) {
        if (CollectionUtils.isNotEmpty(serviceDonatecomporganList)) {
            throw new BaseException("请检查需要新增或修改的参数是否完整");
        }
        Boolean i = null;
        for (ServiceDonatecomporgan serviceDonatecompletion : serviceDonatecomporganList) {
            log.info("捐献器官移植id是否为空 : {},基础表的id为 : {}", serviceDonatecompletion.getId(), serviceDonatecompletion.getInfoid());
            if (serviceDonatecompletion.getId() == null) {
                i = serviceDonatecomporganService.save(serviceDonatecompletion);
            } else {
                i = serviceDonatecomporganService.updateById(serviceDonatecompletion);
            }
        }
        return toAjax(i);
    }
}

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

@@ -7,8 +7,10 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.ServiceDonateorganVO;
import com.ruoyi.project.domain.ServiceOrganallocation;
@@ -18,6 +20,7 @@
import com.ruoyi.project.service.IServiceOrganallocationService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -31,6 +34,7 @@
 * @author ruoyi
 * @date 2021-11-10
 */
@Slf4j
@Api("捐献器官管理")
@RestController
@RequestMapping("/project/donateorgan")
@@ -280,5 +284,24 @@
        return AjaxResult.success(serviceDonateorganService.getOrganCount(timeVO));
    }

    @RepeatSubmit
    @ApiOperation("新增或修改捐献器官管理")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonateorgan")
    public AjaxResult saveOrUpdateDonateorgan(@RequestBody List<ServiceDonateorgan> serviceDonateorganList) {
        if (CollectionUtils.isEmpty(serviceDonateorganList)) {
            throw new BaseException("请检查需要新增或修改的捐献器官管理参数是否完整");
        }
        Boolean i = null;
        for (ServiceDonateorgan serviceDonateorgan : serviceDonateorganList) {
            log.info("捐献器官移植id是否为空 : {},基础表的id为 : {}", serviceDonateorgan.getId(), serviceDonateorgan.getInfoid());
            if (serviceDonateorgan.getId() == null) {
                i = serviceDonateorganService.save(serviceDonateorgan);
            } else {
                i = serviceDonateorganService.updateById(serviceDonateorgan);
            }
        }
        return toAjax(i);
    }

}

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

@@ -7,6 +7,7 @@
import com.ruoyi.common.annotation.NotRepeatCommit;
import com.ruoyi.common.config.RuoYiConfig;
import com.ruoyi.common.enums.OrganEnum;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationWitnessVO;
@@ -20,7 +21,9 @@
import freemarker.template.TemplateException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
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.PathVariable;
@@ -43,6 +46,7 @@
 * @author ruoyi
 * @date 2021-11-17
 */
@Slf4j
@Api("捐献见证管理")
@RestController
@RequestMapping("/project/donationwitness")
@@ -518,5 +522,24 @@
        return AjaxResult.success(serviceDonationwitnessService.getStats(timeVO));
    }

    @RepeatSubmit
    @ApiOperation("新增或修改捐献见证管理")
    @Log(title = "捐献完成", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonationwitness")
    public AjaxResult saveOrUpdateDonationwitness(@RequestBody List<ServiceDonationwitness> serviceDonationwitnessList) {
        if (CollectionUtils.isEmpty(serviceDonationwitnessList)) {
            throw new BaseException("请检查需要新增或修改的捐献见证管理参数是否完整");
        }
        Boolean i = null;
        for (ServiceDonationwitness serviceDonationwitness : serviceDonationwitnessList) {
            log.info("捐献见证管理id是否为空 : {},基础表的id为 : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
            if (serviceDonationwitness.getId() == null) {
                i = serviceDonationwitnessService.save(serviceDonationwitness);
            } else {
                i = serviceDonationwitnessService.updateById(serviceDonationwitness);
            }
        }
        return toAjax(i);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,129 @@
package com.ruoyi.web.controller.project;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
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.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonationwitness;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.service.IServiceDonationwitnessorganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * æçŒ®å™¨å®˜èŽ·å–Controller
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Slf4j
@Api("捐献器官获取")
@RestController
@RequestMapping("/system/donationwitnessorgan")
public class ServiceDonationwitnessorganController extends BaseController {
    @Autowired
    private IServiceDonationwitnessorganService serviceDonationwitnessorganService;

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜èŽ·å–列表
     */
    @ApiOperation("查询捐献器官获取列表")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        startPage();
        List<ServiceDonationwitnessorgan> list = serviceDonationwitnessorganService.queryList(serviceDonationwitnessorgan);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæçŒ®å™¨å®˜èŽ·å–列表
     */
    @ApiOperation("导出捐献器官获取列表")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:export')")
    @Log(title = "捐献器官获取", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        List<ServiceDonationwitnessorgan> list = serviceDonationwitnessorganService.queryList(serviceDonationwitnessorgan);
        ExcelUtil<ServiceDonationwitnessorgan> util = new ExcelUtil<ServiceDonationwitnessorgan>(ServiceDonationwitnessorgan.class);
        return util.exportExcel(list, "捐献器官获取数据");
    }

    /**
     * èŽ·å–捐献器官获取详细信息
     */
    @ApiOperation("获取捐献器官获取详细信息")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonationwitnessorganService.getById(id));
    }

    /**
     * æ–°å¢žæçŒ®å™¨å®˜èŽ·å–
     */
    @ApiOperation("新增捐献器官获取")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:add')")
    @Log(title = "捐献器官获取", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        return toAjax(serviceDonationwitnessorganService.save(serviceDonationwitnessorgan));
    }

    /**
     * ä¿®æ”¹æçŒ®å™¨å®˜èŽ·å–
     */
    @ApiOperation("修改捐献器官获取")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:edit')")
    @Log(title = "捐献器官获取", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        return toAjax(serviceDonationwitnessorganService.updateById(serviceDonationwitnessorgan));
    }

    /**
     * åˆ é™¤æçŒ®å™¨å®˜èŽ·å–
     */
    @ApiOperation("删除捐献器官获取")
    @PreAuthorize("@ss.hasPermi('system:donationwitnessorgan:remove')")
    @Log(title = "捐献器官获取", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonationwitnessorganService.removeByIds(Arrays.asList(ids)));
    }


    @RepeatSubmit
    @ApiOperation("新增或修改捐献器官获取")
    @Log(title = "捐献器官获取", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonationwitnessorgan")
    public AjaxResult saveOrUpdateDonationwitnessorgan(@RequestBody List<ServiceDonationwitnessorgan> serviceDonationwitnessorganList) {
        if (CollectionUtils.isEmpty(serviceDonationwitnessorganList)) {
            throw new BaseException("请检查需要新增或修改的捐献器官获取参数是否完整");
        }
        Boolean i = null;
        for (ServiceDonationwitnessorgan serviceDonationwitnessorgan : serviceDonationwitnessorganList) {
            log.info("捐献器官获取id是否为空 : {},基础表的id为 : {}", serviceDonationwitnessorgan.getId(), serviceDonationwitnessorgan.getInfoid());
            if (serviceDonationwitnessorgan.getId() == null) {
                i = serviceDonationwitnessorganService.save(serviceDonationwitnessorgan);
            } else {
                i = serviceDonationwitnessorganService.updateById(serviceDonationwitnessorgan);
            }
        }
        return toAjax(i);
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,128 @@
package com.ruoyi.web.controller.project;

import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
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.exception.base.BaseException;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

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

/**
 * æçŒ®å™¨å®˜Controller
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Slf4j
@Api("捐献器官")
@RestController
@RequestMapping("/system/donorchargeorgan")
public class ServiceDonorchargeorganController extends BaseController {
    @Autowired
    private IServiceDonorchargeorganService serviceDonorchargeorganService;

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜åˆ—表
     */
    @ApiOperation("查询捐献器官列表")
    @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:list')")
    @GetMapping("/list")
    public TableDataInfo list(ServiceDonorchargeorgan serviceDonorchargeorgan) {
        startPage();
        List<ServiceDonorchargeorgan> list = serviceDonorchargeorganService.queryList(serviceDonorchargeorgan);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæçŒ®å™¨å®˜åˆ—表
     */
    @ApiOperation("导出捐献器官列表")
    @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:export')")
    @Log(title = "捐献器官", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonorchargeorgan serviceDonorchargeorgan) {
        List<ServiceDonorchargeorgan> list = serviceDonorchargeorganService.queryList(serviceDonorchargeorgan);
        ExcelUtil<ServiceDonorchargeorgan> util = new ExcelUtil<ServiceDonorchargeorgan>(ServiceDonorchargeorgan.class);
        return util.exportExcel(list, "捐献器官数据");
    }

    /**
     * èŽ·å–捐献器官详细信息
     */
    @ApiOperation("获取捐献器官详细信息")
    @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonorchargeorganService.getById(id));
    }

    /**
     * æ–°å¢žæçŒ®å™¨å®˜
     */
    @ApiOperation("新增捐献器官")
    @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:add')")
    @Log(title = "捐献器官", businessType = BusinessType.INSERT)
    @PostMapping
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
        return toAjax(serviceDonorchargeorganService.save(serviceDonorchargeorgan));
    }

    /**
     * ä¿®æ”¹æçŒ®å™¨å®˜
     */
    @ApiOperation("修改捐献器官")
    @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:edit')")
    @Log(title = "捐献器官", businessType = BusinessType.UPDATE)
    @PutMapping
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
        return toAjax(serviceDonorchargeorganService.updateById(serviceDonorchargeorgan));
    }

    /**
     * åˆ é™¤æçŒ®å™¨å®˜
     */
    @ApiOperation("删除捐献器官")
    @PreAuthorize("@ss.hasPermi('system:donorchargeorgan:remove')")
    @Log(title = "捐献器官", businessType = BusinessType.DELETE)
    @DeleteMapping("/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonorchargeorganService.removeByIds(Arrays.asList(ids)));
    }

    @RepeatSubmit
    @ApiOperation("新增或修改捐献器官")
    @Log(title = "捐献器官", businessType = BusinessType.UPDATE)
    @PostMapping("/saveOrUpdateDonorchargeorgan")
    public AjaxResult saveOrUpdateDonorchargeorgan(@RequestBody List<ServiceDonorchargeorgan> serviceDonorchargeorganList) {
        if (CollectionUtils.isEmpty(serviceDonorchargeorganList)) {
            throw new BaseException("请检查需要新增或修改的捐献器官参数是否完整");
        }
        Boolean i = null;
        for (ServiceDonorchargeorgan serviceDonorchargeorgan : serviceDonorchargeorganList) {
            log.info("捐献器官id是否为空 : {},基础表的id为 : {}", serviceDonorchargeorgan.getId(), serviceDonorchargeorgan.getInfoid());
            if (serviceDonorchargeorgan.getId() == null) {
                i = serviceDonorchargeorganService.save(serviceDonorchargeorgan);
            } else {
                i = serviceDonorchargeorganService.updateById(serviceDonorchargeorgan);
            }
        }
        return toAjax(i);
    }
}

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

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

import java.beans.Transient;
import java.util.Date;
import java.util.List;

import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,88 +16,121 @@

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

    /** $column.columnComment */
    /**
     * $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/ServiceDonatecomporgan.java

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

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

/**
 * æçŒ®å™¨å®˜ç§»æ¤å¯¹è±¡ service_donatecomporgan
 * 
 * @author ruoyi
 * @date 2023-12-25
 */
@Data
@ApiModel("捐献器官移植")
public class ServiceDonatecomporgan 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;

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

    /** å™¨å®˜ç±»åˆ«åç§° è¯¦è§å­—å…¸sys_Organ */
    @ApiModelProperty("器官类别名称 è¯¦è§å­—å…¸sys_Organ")
    @Excel(name = "器官类别名称 è¯¦è§å­—å…¸sys_Organ")
    private String organname;

    /** å™¨å®˜ç§»æ¤çŠ¶æ€ ï¼š0：未移植；1：已移植，2：弃用 */
    @ApiModelProperty("器官移植状态 ï¼š0：未移植；1：已移植，2：弃用")
    @Excel(name = "器官移植状态 ï¼š0：未移植；1：已移植，2：弃用")
    private Long transplantstate;

    /** æœªç§»æ¤åŽŸå›  */
    @ApiModelProperty("未移植原因")
    @Excel(name = "未移植原因")
    private String abandonreason;

    /** ç§»æ¤æ—¶é—´ */
    @ApiModelProperty("移植时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "移植时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date transplanttime;

    /** ç§»æ¤åŒ»ç”Ÿ */
    @ApiModelProperty("移植医生")
    @Excel(name = "移植医生")
    private String transplantdoct;

    /** å™¨å®˜ç§»æ¤æœºæž„编号 å¯¹åº”机构表 */
    @ApiModelProperty("器官移植机构编号 å¯¹åº”机构表")
    @Excel(name = "器官移植机构编号 å¯¹åº”机构表")
    private String transplanthospitalno;

    /** å™¨å®˜ç§»æ¤æœºæž„名称 å¯¹åº”机构表 */
    @ApiModelProperty("器官移植机构名称 å¯¹åº”机构表")
    @Excel(name = "器官移植机构名称 å¯¹åº”机构表")
    private String transplanthospitalname;

    /** ç§»æ¤äººå§“名 */
    @ApiModelProperty("移植人姓名")
    @Excel(name = "移植人姓名")
    private String name;

    /** ç§»æ¤äººæ€§åˆ« æ ¹æ®å­—å…¸sys_user_sex */
    @ApiModelProperty("移植人性别 æ ¹æ®å­—å…¸sys_user_sex")
    @Excel(name = "移植人性别 æ ¹æ®å­—å…¸sys_user_sex")
    private Long sex;

    /** ç§»æ¤äººè¯ä»¶ç±»åž‹ æ ¹æ®å­—å…¸sys_IDType */
    @ApiModelProperty("移植人证件类型 æ ¹æ®å­—å…¸sys_IDType")
    @Excel(name = "移植人证件类型 æ ¹æ®å­—å…¸sys_IDType")
    private Long idcardtype;

    /** ç§»æ¤äººè¯ä»¶å·ç  */
    @ApiModelProperty("移植人证件号码")
    @Excel(name = "移植人证件号码")
    private String idcardno;

    /** ç§»æ¤äººå¹´é¾„ */
    @ApiModelProperty("移植人年龄")
    @Excel(name = "移植人年龄")
    private Long age;

    /** ç§»æ¤äººå¹´é¾„单位 æ ¹æ®å­—å…¸sys_AgeUnit */
    @ApiModelProperty("移植人年龄单位 æ ¹æ®å­—å…¸sys_AgeUnit")
    @Excel(name = "移植人年龄单位 æ ¹æ®å­—å…¸sys_AgeUnit")
    private String ageunit;

    /** ç§»æ¤äººå‡ºç”Ÿæ—¥æœŸ */
    @ApiModelProperty("移植人出生日期")
    @Excel(name = "移植人出生日期")
    private String birthday;

    /** ç§»æ¤äººè”系电话 */
    @ApiModelProperty("移植人联系电话")
    @Excel(name = "移植人联系电话")
    private String phone;

    /** ç§»æ¤äººçŽ°ä½åœ°å€ */
    @ApiModelProperty("移植人现住地址")
    @Excel(name = "移植人现住地址")
    private String residenceaddress;

    /** ç§»æ¤äººçŽ°ä½åœ°å€çœä»£ç  */
    @ApiModelProperty("移植人现住地址省代码")
    @Excel(name = "移植人现住地址省代码")
    private String residenceprovince;

    /** ç§»æ¤äººçŽ°ä½åœ°å€çœåç§° */
    @ApiModelProperty("移植人现住地址省名称")
    @Excel(name = "移植人现住地址省名称")
    private String residenceprovincename;

    /** ç§»æ¤äººå¸‚编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表 */
    @ApiModelProperty("移植人市编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    @Excel(name = "移植人市编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    private String residencecity;

    /** ç§»æ¤äººå¸‚名称 */
    @ApiModelProperty("移植人市名称")
    @Excel(name = "移植人市名称")
    private String residencecityname;

    /** ç§»æ¤äººæ‰€å±žè¡—道（镇）根据行政区划表 */
    @ApiModelProperty("移植人所属街道（镇）根据行政区划表")
    @Excel(name = "移植人所属街道", readConverterExp = "镇=")
    private String residencetown;

    /** ç§»æ¤äººæ‰€å±žè¡—道（镇）名称 */
    @ApiModelProperty("移植人所属街道（镇）名称")
    @Excel(name = "移植人所属街道", readConverterExp = "镇=")
    private String residencetownname;

    /** ç§»æ¤äººç¤¾åŒºï¼ˆæ‘）编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表 */
    @ApiModelProperty("移植人社区（村）编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    @Excel(name = "移植人社区", readConverterExp = "村=")
    private String residencecommunity;

    /** ç§»æ¤äººç¤¾åŒºï¼ˆæ‘）名称 */
    @ApiModelProperty("移植人社区（村）名称")
    @Excel(name = "移植人社区", readConverterExp = "村=")
    private String residencecommunityname;

    /** ç§»æ¤äººæ‰€å±žåŒºåŸŸç¼–号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表 */
    @ApiModelProperty("移植人所属区域编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    @Excel(name = "移植人所属区域编号 æ ¹æ®è¡Œæ”¿åŒºåˆ’表")
    private String residencecountycode;

    /** ç§»æ¤äººæ‰€å±žåŒºåŸŸåç§° */
    @ApiModelProperty("移植人所属区域名称")
    @Excel(name = "移植人所属区域名称")
    private String residencecountyname;

}


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

@@ -84,6 +84,14 @@
    private Date organgettime;

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

    /**
     * åŒ»ç”Ÿå§“名
     */
    @ApiModelProperty("医生姓名")
@@ -301,8 +309,9 @@
    private Integer transplantstate;



    /** ç³»ç»Ÿç¼–号 */
    /**
     * ç³»ç»Ÿç¼–号
     */
    @ApiModelProperty("系统编号")
    @Excel(name = "系统编号")
    private String caseno;

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

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

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

/**
 * æçŒ®å™¨å®˜èŽ·å–对象 service_donationwitnessorgan
 * 
 * @author ruoyi
 * @date 2023-12-25
 */
@Data
@ApiModel("捐献器官获取")
public class ServiceDonationwitnessorgan 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;

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

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

    /** å™¨å®˜ç±»åˆ«åç§° è¯¦è§å­—å…¸sys_Organ */
    @ApiModelProperty("器官类别名称 è¯¦è§å­—å…¸sys_Organ")
    @Excel(name = "器官类别名称 è¯¦è§å­—å…¸sys_Organ")
    private String organname;

    /** å™¨å®˜ç¼–号  */
    @ApiModelProperty("器官编号 ")
    @Excel(name = "器官编号 ")
    private String organnumber;

    /** å™¨å®˜èŽ·å–状态 ï¼š0：未获取；1：已获取，2：弃用 */
    @ApiModelProperty("器官获取状态 ï¼š0：未获取；1：已获取，2：弃用")
    @Excel(name = "器官获取状态 ï¼š0：未获取；1：已获取，2：弃用")
    private String organstate;

    /** æœªèŽ·å–原因 */
    @ApiModelProperty("未获取原因")
    @Excel(name = "未获取原因")
    private String notgetreason;

    /** å™¨å®˜èŽ·å–时间 */
    @ApiModelProperty("器官获取时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "器官获取时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date organgettime;

    /** åŒ»ç”Ÿå§“名 */
    @ApiModelProperty("医生姓名")
    @Excel(name = "医生姓名")
    private String organgetdoct;

    /** å™¨å®˜èŽ·å–机构编号 å¯¹åº”机构表 */
    @ApiModelProperty("器官获取机构编号 å¯¹åº”机构表")
    @Excel(name = "器官获取机构编号 å¯¹åº”机构表")
    private String gainhospitalno;

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

    /** èŽ·å–前活检，参见sys_0_1 */
    @ApiModelProperty("获取前活检，参见sys_0_1")
    @Excel(name = "获取前活检，参见sys_0_1")
    private String isbiopsybefore;

    /** èŽ·å–后活检，参见sys_0_1 */
    @ApiModelProperty("获取后活检，参见sys_0_1")
    @Excel(name = "获取后活检，参见sys_0_1")
    private String isbiopsyafter;

    /** å±žäºŽè¾¹ç¼˜å™¨å®˜ï¼Œå‚见sys_0_1 */
    @ApiModelProperty("属于边缘器官，参见sys_0_1")
    @Excel(name = "属于边缘器官，参见sys_0_1")
    private String ismarginalorgan;

    /** ç—…原菌阳性，参见sys_0_1 */
    @ApiModelProperty("病原菌阳性，参见sys_0_1")
    @Excel(name = "病原菌阳性，参见sys_0_1")
    private String ispathogenpositive;

    /** åŽŸå‘性无功能，参见sys_0_1 */
    @ApiModelProperty("原发性无功能，参见sys_0_1")
    @Excel(name = "原发性无功能，参见sys_0_1")
    private String ispnf;

    /** åŠŸèƒ½å»¶è¿Ÿæ€§æ¢å¤ï¼Œå‚见sys_0_1 */
    @ApiModelProperty("功能延迟性恢复，参见sys_0_1")
    @Excel(name = "功能延迟性恢复，参见sys_0_1")
    private String isdgf;

}


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

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

import java.math.BigDecimal;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * æçŒ®å™¨å®˜å¯¹è±¡ service_donorchargeorgan
 * 
 * @author ruoyi
 * @date 2023-12-25
 */
@Data
@ApiModel("捐献器官")
public class ServiceDonorchargeorgan 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;

    /** æçŒ®äººåå­— */
    @ApiModelProperty("捐献人名字")
    @Excel(name = "捐献人名字")
    private String donorname;

    /** å™¨å®˜ç§»æ¤æœºæž„名称 å¯¹åº”机构表 */
    @ApiModelProperty("器官移植机构名称 å¯¹åº”机构表")
    @Excel(name = "器官移植机构名称 å¯¹åº”机构表")
    private String hospitalname;

    /** å™¨å®˜ç§»æ¤æœºæž„编号 å¯¹åº”机构表 */
    @ApiModelProperty("器官移植机构编号 å¯¹åº”机构表")
    @Excel(name = "器官移植机构编号 å¯¹åº”机构表")
    private String hospitalno;

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

    /** å™¨å®˜ç±»åˆ«åç§° è¯¦è§å­—å…¸sys_Organ */
    @ApiModelProperty("器官类别名称 è¯¦è§å­—å…¸sys_Organ")
    @Excel(name = "器官类别名称 è¯¦è§å­—å…¸sys_Organ")
    private String organname;

    /** å™¨å®˜åº”收费用 */
    @ApiModelProperty("器官应收费用")
    @Excel(name = "器官应收费用")
    private BigDecimal organcharge;

    /** è´¹ç”¨å½•å…¥æ—¶é—´ */
    @ApiModelProperty("费用录入时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "费用录入时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date organtime;

    /** è´¹ç”¨å½•å…¥äºº */
    @ApiModelProperty("费用录入人")
    @Excel(name = "费用录入人")
    private String chargeoperator;

    /** å™¨å®˜å®žé™…收到费用 */
    @ApiModelProperty("器官实际收到费用")
    @Excel(name = "器官实际收到费用")
    private BigDecimal amount;

    /** å™¨å®˜å®žé™…收到费用时间 */
    @ApiModelProperty("器官实际收到费用时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "器官实际收到费用时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date amounttime;

    /** æ”¶è´¹å½•å…¥äºº */
    @ApiModelProperty("收费录入人")
    @Excel(name = "收费录入人")
    private String amountoperator;

    /** å™¨å®˜è´¹ç”¨æ”¶å–状态：0：未收取，1：已收取，2：放弃 */
    @ApiModelProperty("器官费用收取状态：0：未收取，1：已收取，2：放弃")
    @Excel(name = "器官费用收取状态：0：未收取，1：已收取，2：放弃")
    private Long chargestate;

    /** å™¨å®˜å®žé™…收到费用说明 */
    @ApiModelProperty("器官实际收到费用说明")
    @Excel(name = "器官实际收到费用说明")
    private String organchargedesc;

}


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

@@ -163,7 +163,9 @@
    @Excel(name = "中心签字")
    private String opochecker;

    /** è´¢åŠ¡å‰¯é™¢é•¿ç­¾å­— */
    /**
     * è´¢åŠ¡å‰¯é™¢é•¿ç­¾å­—
     */
    @ApiModelProperty("院长签字")
    @Excel(name = "院长签字")
    private String president;
@@ -270,7 +272,7 @@
    private Long flowlevel;

    /**
     *  100：上传医院  199：医院驳回
     * 100：上传医院  199：医院驳回
     */
    @ApiModelProperty("退回时的审核级别")
    private Long backflowlevel;
@@ -318,7 +320,9 @@
    private String riqi;


    /** ç¼–号(打印的时候，在文档上显示) */
    /**
     * ç¼–号(打印的时候，在文档上显示)
     */
    @ApiModelProperty("编号(打印的时候，在文档上显示)")
    @Excel(name = "编号")
    private String bh;

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

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


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * æçŒ®å™¨å®˜ç§»æ¤Mapper接口
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Mapper
public interface ServiceDonatecomporganMapper extends BaseMapper<ServiceDonatecomporgan> {
    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜ç§»æ¤åˆ—表
     *
     * @param serviceDonatecomporgan æçŒ®å™¨å®˜ç§»æ¤
     * @return æçŒ®å™¨å®˜ç§»æ¤é›†åˆ
     */
    public List<ServiceDonatecomporgan> selectServiceDonatecomporganList(ServiceDonatecomporgan serviceDonatecomporgan);
}

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

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


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * æçŒ®å™¨å®˜èŽ·å–Mapper接口
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Mapper
public interface ServiceDonationwitnessorganMapper extends BaseMapper<ServiceDonationwitnessorgan> {
    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜èŽ·å–列表
     *
     * @param serviceDonationwitnessorgan æçŒ®å™¨å®˜èŽ·å–
     * @return æçŒ®å™¨å®˜èŽ·å–集合
     */
    public List<ServiceDonationwitnessorgan> selectServiceDonationwitnessorganList(ServiceDonationwitnessorgan serviceDonationwitnessorgan);
}

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

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


import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * æçŒ®å™¨å®˜Mapper接口
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Mapper
public interface ServiceDonorchargeorganMapper extends BaseMapper<ServiceDonorchargeorgan> {
    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜åˆ—表
     *
     * @param serviceDonorchargeorgan æçŒ®å™¨å®˜
     * @return æçŒ®å™¨å®˜é›†åˆ
     */
    public List<ServiceDonorchargeorgan> selectServiceDonorchargeorganList(ServiceDonorchargeorgan serviceDonorchargeorgan);
}

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

@@ -1,29 +1,30 @@
package com.ruoyi.project.service;

import java.util.List;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.domain.vo.DonationWitnessVO;

import java.util.List;

/**
 * æçŒ®å®ŒæˆService接口
 * 
 *
 * @author ruoyi
 * @date 2021-11-19
 */
public interface IServiceDonatecompletioninfoService extends IService<ServiceDonatecompletioninfo>
{
public interface IServiceDonatecompletioninfoService extends IService<ServiceDonatecompletioninfo> {

    /**
     * æŸ¥è¯¢æçŒ®å®Œæˆåˆ—表
     * 
     *
     * @param serviceDonatecompletioninfo æçŒ®å®Œæˆ
     * @return æçŒ®å®Œæˆé›†åˆ
     */
    public List<ServiceDonatecompletioninfo> queryList(ServiceDonatecompletioninfo serviceDonatecompletioninfo);

    public List<ServiceDonatecompletioninfo> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo);

    List<DonationCompletionVO> selectVOList(DonationCompletionVO donationCompletionVO);

    void delDuplicateDonateCompletioninfo(long infoid,String createby);
    void delDuplicateDonateCompletioninfo(long infoid, String createby);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatecomporgan;

import java.util.List;

/**
 * æçŒ®å™¨å®˜ç§»æ¤Service接口
 *
 * @author ruoyi
 * @date 2023-12-25
 */
public interface IServiceDonatecomporganService extends IService<ServiceDonatecomporgan> {

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜ç§»æ¤åˆ—表
     *
     * @param serviceDonatecomporgan æçŒ®å™¨å®˜ç§»æ¤
     * @return æçŒ®å™¨å®˜ç§»æ¤é›†åˆ
     */
    public List<ServiceDonatecomporgan> queryList(ServiceDonatecomporgan serviceDonatecomporgan);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;

import java.util.List;

/**
 * æçŒ®å™¨å®˜èŽ·å–Service接口
 * 
 * @author ruoyi
 * @date 2023-12-25
 */
public interface IServiceDonationwitnessorganService extends IService<ServiceDonationwitnessorgan>
{

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜èŽ·å–列表
     * 
     * @param serviceDonationwitnessorgan æçŒ®å™¨å®˜èŽ·å–
     * @return æçŒ®å™¨å®˜èŽ·å–集合
     */
    public List<ServiceDonationwitnessorgan> queryList(ServiceDonationwitnessorgan serviceDonationwitnessorgan);
}

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

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

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;

import java.util.List;

/**
 * æçŒ®å™¨å®˜Service接口
 *
 * @author ruoyi
 * @date 2023-12-25
 */
public interface IServiceDonorchargeorganService extends IService<ServiceDonorchargeorgan> {

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜åˆ—表
     *
     * @param serviceDonorchargeorgan æçŒ®å™¨å®˜
     * @return æçŒ®å™¨å®˜é›†åˆ
     */
    public List<ServiceDonorchargeorgan> queryList(ServiceDonorchargeorgan serviceDonorchargeorgan);
}

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

@@ -6,15 +6,20 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.domain.ServiceDonateorgan;
import com.ruoyi.project.domain.vo.DonationCompletionVO;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
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.ServiceDonatecompletioninfoMapper;
import com.ruoyi.project.domain.ServiceDonatecompletioninfo;
@@ -22,56 +27,99 @@

/**
 * æçŒ®å®ŒæˆService业务层处理
 * 
 *
 * @author ruoyi
 * @date 2021-11-19
 */
@Service
public class ServiceDonatecompletioninfoServiceImpl extends ServiceImpl<ServiceDonatecompletioninfoMapper, ServiceDonatecompletioninfo> implements IServiceDonatecompletioninfoService 
{
public class ServiceDonatecompletioninfoServiceImpl extends ServiceImpl<ServiceDonatecompletioninfoMapper, ServiceDonatecompletioninfo> implements IServiceDonatecompletioninfoService {

    @Autowired
    ServiceDonatecompletioninfoMapper serviceDonatecompletioninfoMapper;

    @Autowired
    IServiceDonatecomporganService serviceDonatecomporganService;

    /**
     * æŸ¥è¯¢æçŒ®å®Œæˆåˆ—表
     * 
     *
     * @param serviceDonatecompletioninfo æçŒ®å®Œæˆ
     * @return æçŒ®å®Œæˆ
     */
    @Override
    public List<ServiceDonatecompletioninfo> queryList(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        LambdaQueryWrapper<ServiceDonatecompletioninfo> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getDonorno())){
            wrappers.eq(ServiceDonatecompletioninfo::getDonorno ,serviceDonatecompletioninfo.getDonorno());
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getDonorno())) {
            wrappers.eq(ServiceDonatecompletioninfo::getDonorno, serviceDonatecompletioninfo.getDonorno());
        }
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getIsbodydonation())){
            wrappers.eq(ServiceDonatecompletioninfo::getIsbodydonation ,serviceDonatecompletioninfo.getIsbodydonation());
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getIsbodydonation())) {
            wrappers.eq(ServiceDonatecompletioninfo::getIsbodydonation, serviceDonatecompletioninfo.getIsbodydonation());
        }
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getReceivingunit())){
            wrappers.eq(ServiceDonatecompletioninfo::getReceivingunit ,serviceDonatecompletioninfo.getReceivingunit());
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getReceivingunit())) {
            wrappers.eq(ServiceDonatecompletioninfo::getReceivingunit, serviceDonatecompletioninfo.getReceivingunit());
        }
        if (StringUtils.isNotNull(serviceDonatecompletioninfo.getId())){
            wrappers.eq(ServiceDonatecompletioninfo::getId ,serviceDonatecompletioninfo.getId());
        if (StringUtils.isNotNull(serviceDonatecompletioninfo.getId())) {
            wrappers.eq(ServiceDonatecompletioninfo::getId, serviceDonatecompletioninfo.getId());
        }
        if (StringUtils.isNotNull(serviceDonatecompletioninfo.getInfoid())){
            wrappers.eq(ServiceDonatecompletioninfo::getInfoid ,serviceDonatecompletioninfo.getInfoid());
        if (StringUtils.isNotNull(serviceDonatecompletioninfo.getInfoid())) {
            wrappers.eq(ServiceDonatecompletioninfo::getInfoid, serviceDonatecompletioninfo.getInfoid());
        }
        return this.list(wrappers);
    }

    /**
     * æš‚时先不用了
     *
     * @param serviceDonatecompletioninfo
     * @return
     */
    @Override
    public List<ServiceDonatecompletioninfo> queryListDetail(ServiceDonatecompletioninfo serviceDonatecompletioninfo) {
        LambdaQueryWrapper<ServiceDonatecompletioninfo> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getDonorno())) {
            wrappers.eq(ServiceDonatecompletioninfo::getDonorno, serviceDonatecompletioninfo.getDonorno());
        }
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getIsbodydonation())) {
            wrappers.eq(ServiceDonatecompletioninfo::getIsbodydonation, serviceDonatecompletioninfo.getIsbodydonation());
        }
        if (StringUtils.isNotBlank(serviceDonatecompletioninfo.getReceivingunit())) {
            wrappers.eq(ServiceDonatecompletioninfo::getReceivingunit, serviceDonatecompletioninfo.getReceivingunit());
        }
        if (StringUtils.isNotNull(serviceDonatecompletioninfo.getId())) {
            wrappers.eq(ServiceDonatecompletioninfo::getId, serviceDonatecompletioninfo.getId());
        }
        if (StringUtils.isNotNull(serviceDonatecompletioninfo.getInfoid())) {
            wrappers.eq(ServiceDonatecompletioninfo::getInfoid, serviceDonatecompletioninfo.getInfoid());
        }
        List<ServiceDonatecompletioninfo> serviceDonatecompletioninfoList = this.list(wrappers);
        if (CollectionUtils.isNotEmpty(serviceDonatecompletioninfoList)) {
            for (ServiceDonatecompletioninfo serviceDonatecompletioninfo1 : serviceDonatecompletioninfoList) {
                if (serviceDonatecompletioninfo1.getInfoid() != null) {
                    ServiceDonatecomporgan serviceDonatecomporgan = new ServiceDonatecomporgan();
                    serviceDonatecomporgan.setInfoid(serviceDonatecompletioninfo1.getInfoid());
                    List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(serviceDonatecomporgan);
                    serviceDonatecompletioninfo1.setServiceDonatecomporganList(serviceDonatecomporgans);
                }

            }
        }

        return this.list(wrappers);
    }


    @Override
    public List<DonationCompletionVO> selectVOList(DonationCompletionVO donationCompletionVO) {

        SysUser user = SecurityUtils.getLoginUser().getUser();
        List <SysRole> l = user.getRoles();
        List<SysRole> l = user.getRoles();
        Boolean b = false;
        for(SysRole r : l){
            if(r.getRoleId().longValue() == 3){
        for (SysRole r : l) {
            if (r.getRoleId().longValue() == 3) {
                b = true;
            }
        }
        if(b){
        if (b) {
            donationCompletionVO.setBasecreateby(user.getUserName());
        }

@@ -79,8 +127,8 @@
    }

    @Override
    public void delDuplicateDonateCompletioninfo(long infoid,String createby) {
        serviceDonatecompletioninfoMapper.delDuplicateDonateCompletioninfo(infoid,createby);
    public void delDuplicateDonateCompletioninfo(long infoid, String createby) {
        serviceDonatecompletioninfoMapper.delDuplicateDonateCompletioninfo(infoid, createby);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,121 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonatecomporgan;
import com.ruoyi.project.mapper.ServiceDonatecomporganMapper;
import com.ruoyi.project.service.IServiceDonatecomporganService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æçŒ®å™¨å®˜ç§»æ¤Service业务层处理
 * 
 * @author ruoyi
 * @date 2023-12-25
 */
@Service
public class ServiceDonatecomporganServiceImpl extends ServiceImpl<ServiceDonatecomporganMapper, ServiceDonatecomporgan> implements IServiceDonatecomporganService
{


    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜ç§»æ¤åˆ—表
     * 
     * @param serviceDonatecomporgan æçŒ®å™¨å®˜ç§»æ¤
     * @return æçŒ®å™¨å®˜ç§»æ¤
     */
    @Override
    public List<ServiceDonatecomporgan> queryList(ServiceDonatecomporgan serviceDonatecomporgan) {
        LambdaQueryWrapper<ServiceDonatecomporgan> wrappers = Wrappers.lambdaQuery();
        if (serviceDonatecomporgan.getInfoid() != null){
            wrappers.eq(ServiceDonatecomporgan::getInfoid ,serviceDonatecomporgan.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getOrganno())){
            wrappers.eq(ServiceDonatecomporgan::getOrganno ,serviceDonatecomporgan.getOrganno());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getOrganname())){
            wrappers.like(ServiceDonatecomporgan::getOrganname ,serviceDonatecomporgan.getOrganname());
        }
        if (serviceDonatecomporgan.getTransplantstate() != null){
            wrappers.eq(ServiceDonatecomporgan::getTransplantstate ,serviceDonatecomporgan.getTransplantstate());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getAbandonreason())){
            wrappers.eq(ServiceDonatecomporgan::getAbandonreason ,serviceDonatecomporgan.getAbandonreason());
        }
        if (serviceDonatecomporgan.getTransplanttime() != null){
            wrappers.eq(ServiceDonatecomporgan::getTransplanttime ,serviceDonatecomporgan.getTransplanttime());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getTransplantdoct())){
            wrappers.eq(ServiceDonatecomporgan::getTransplantdoct ,serviceDonatecomporgan.getTransplantdoct());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getTransplanthospitalno())){
            wrappers.eq(ServiceDonatecomporgan::getTransplanthospitalno ,serviceDonatecomporgan.getTransplanthospitalno());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getTransplanthospitalname())){
            wrappers.like(ServiceDonatecomporgan::getTransplanthospitalname ,serviceDonatecomporgan.getTransplanthospitalname());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getName())){
            wrappers.like(ServiceDonatecomporgan::getName ,serviceDonatecomporgan.getName());
        }
        if (serviceDonatecomporgan.getSex() != null){
            wrappers.eq(ServiceDonatecomporgan::getSex ,serviceDonatecomporgan.getSex());
        }
        if (serviceDonatecomporgan.getIdcardtype() != null){
            wrappers.eq(ServiceDonatecomporgan::getIdcardtype ,serviceDonatecomporgan.getIdcardtype());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getIdcardno())){
            wrappers.eq(ServiceDonatecomporgan::getIdcardno ,serviceDonatecomporgan.getIdcardno());
        }
        if (serviceDonatecomporgan.getAge() != null){
            wrappers.eq(ServiceDonatecomporgan::getAge ,serviceDonatecomporgan.getAge());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getAgeunit())){
            wrappers.eq(ServiceDonatecomporgan::getAgeunit ,serviceDonatecomporgan.getAgeunit());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getBirthday())){
            wrappers.eq(ServiceDonatecomporgan::getBirthday ,serviceDonatecomporgan.getBirthday());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getPhone())){
            wrappers.eq(ServiceDonatecomporgan::getPhone ,serviceDonatecomporgan.getPhone());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceaddress())){
            wrappers.eq(ServiceDonatecomporgan::getResidenceaddress ,serviceDonatecomporgan.getResidenceaddress());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceprovince())){
            wrappers.eq(ServiceDonatecomporgan::getResidenceprovince ,serviceDonatecomporgan.getResidenceprovince());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceprovincename())){
            wrappers.like(ServiceDonatecomporgan::getResidenceprovincename ,serviceDonatecomporgan.getResidenceprovincename());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecity())){
            wrappers.eq(ServiceDonatecomporgan::getResidencecity ,serviceDonatecomporgan.getResidencecity());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecityname())){
            wrappers.like(ServiceDonatecomporgan::getResidencecityname ,serviceDonatecomporgan.getResidencecityname());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencetown())){
            wrappers.eq(ServiceDonatecomporgan::getResidencetown ,serviceDonatecomporgan.getResidencetown());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencetownname())){
            wrappers.like(ServiceDonatecomporgan::getResidencetownname ,serviceDonatecomporgan.getResidencetownname());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecommunity())){
            wrappers.eq(ServiceDonatecomporgan::getResidencecommunity ,serviceDonatecomporgan.getResidencecommunity());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecommunityname())){
            wrappers.like(ServiceDonatecomporgan::getResidencecommunityname ,serviceDonatecomporgan.getResidencecommunityname());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecountycode())){
            wrappers.eq(ServiceDonatecomporgan::getResidencecountycode ,serviceDonatecomporgan.getResidencecountycode());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecountyname())){
            wrappers.like(ServiceDonatecomporgan::getResidencecountyname ,serviceDonatecomporgan.getResidencecountyname());
        }
        return this.list(wrappers);
    }

}

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

@@ -122,6 +122,9 @@
        if (serviceDonateorgan.getTransplanttime() != null) {
            wrappers.eq(ServiceDonateorgan::getTransplanttime, serviceDonateorgan.getTransplanttime());
        }
        if (serviceDonateorgan.getEstimatedtime() != null) {
            wrappers.eq(ServiceDonateorgan::getEstimatedtime, serviceDonateorgan.getEstimatedtime());
        }
        return this.list(wrappers);
    }


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,87 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonationwitnessorgan;
import com.ruoyi.project.mapper.ServiceDonationwitnessorganMapper;
import com.ruoyi.project.service.IServiceDonationwitnessorganService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æçŒ®å™¨å®˜èŽ·å–Service业务层处理
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Service
public class ServiceDonationwitnessorganServiceImpl extends ServiceImpl<ServiceDonationwitnessorganMapper, ServiceDonationwitnessorgan> implements IServiceDonationwitnessorganService {


    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜èŽ·å–列表
     *
     * @param serviceDonationwitnessorgan æçŒ®å™¨å®˜èŽ·å–
     * @return æçŒ®å™¨å®˜èŽ·å–
     */
    @Override
    public List<ServiceDonationwitnessorgan> queryList(ServiceDonationwitnessorgan serviceDonationwitnessorgan) {
        LambdaQueryWrapper<ServiceDonationwitnessorgan> wrappers = Wrappers.lambdaQuery();
        if (serviceDonationwitnessorgan.getInfoid() != null) {
            wrappers.eq(ServiceDonationwitnessorgan::getInfoid, serviceDonationwitnessorgan.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getDonorno())) {
            wrappers.eq(ServiceDonationwitnessorgan::getDonorno, serviceDonationwitnessorgan.getDonorno());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getOrganno())) {
            wrappers.eq(ServiceDonationwitnessorgan::getOrganno, serviceDonationwitnessorgan.getOrganno());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getOrganname())) {
            wrappers.like(ServiceDonationwitnessorgan::getOrganname, serviceDonationwitnessorgan.getOrganname());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getOrgannumber())) {
            wrappers.eq(ServiceDonationwitnessorgan::getOrgannumber, serviceDonationwitnessorgan.getOrgannumber());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getOrganstate())) {
            wrappers.eq(ServiceDonationwitnessorgan::getOrganstate, serviceDonationwitnessorgan.getOrganstate());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getNotgetreason())) {
            wrappers.eq(ServiceDonationwitnessorgan::getNotgetreason, serviceDonationwitnessorgan.getNotgetreason());
        }
        if (serviceDonationwitnessorgan.getOrgangettime() != null) {
            wrappers.eq(ServiceDonationwitnessorgan::getOrgangettime, serviceDonationwitnessorgan.getOrgangettime());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getOrgangetdoct())) {
            wrappers.eq(ServiceDonationwitnessorgan::getOrgangetdoct, serviceDonationwitnessorgan.getOrgangetdoct());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getGainhospitalno())) {
            wrappers.eq(ServiceDonationwitnessorgan::getGainhospitalno, serviceDonationwitnessorgan.getGainhospitalno());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getGainhospitalname())) {
            wrappers.like(ServiceDonationwitnessorgan::getGainhospitalname, serviceDonationwitnessorgan.getGainhospitalname());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getIsbiopsybefore())) {
            wrappers.eq(ServiceDonationwitnessorgan::getIsbiopsybefore, serviceDonationwitnessorgan.getIsbiopsybefore());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getIsbiopsyafter())) {
            wrappers.eq(ServiceDonationwitnessorgan::getIsbiopsyafter, serviceDonationwitnessorgan.getIsbiopsyafter());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getIsmarginalorgan())) {
            wrappers.eq(ServiceDonationwitnessorgan::getIsmarginalorgan, serviceDonationwitnessorgan.getIsmarginalorgan());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getIspathogenpositive())) {
            wrappers.eq(ServiceDonationwitnessorgan::getIspathogenpositive, serviceDonationwitnessorgan.getIspathogenpositive());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getIspnf())) {
            wrappers.eq(ServiceDonationwitnessorgan::getIspnf, serviceDonationwitnessorgan.getIspnf());
        }
        if (StringUtils.isNotBlank(serviceDonationwitnessorgan.getIsdgf())) {
            wrappers.eq(ServiceDonationwitnessorgan::getIsdgf, serviceDonationwitnessorgan.getIsdgf());
        }
        return this.list(wrappers);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,78 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.mapper.ServiceDonorchargeorganMapper;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æçŒ®å™¨å®˜Service业务层处理
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Service
public class ServiceDonorchargeorganServiceImpl extends ServiceImpl<ServiceDonorchargeorganMapper, ServiceDonorchargeorgan> implements IServiceDonorchargeorganService {


    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜åˆ—表
     *
     * @param serviceDonorchargeorgan æçŒ®å™¨å®˜
     * @return æçŒ®å™¨å®˜
     */
    @Override
    public List<ServiceDonorchargeorgan> queryList(ServiceDonorchargeorgan serviceDonorchargeorgan) {
        LambdaQueryWrapper<ServiceDonorchargeorgan> wrappers = Wrappers.lambdaQuery();
        if (serviceDonorchargeorgan.getInfoid() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getInfoid, serviceDonorchargeorgan.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getDonorname())) {
            wrappers.like(ServiceDonorchargeorgan::getDonorname, serviceDonorchargeorgan.getDonorname());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getHospitalname())) {
            wrappers.like(ServiceDonorchargeorgan::getHospitalname, serviceDonorchargeorgan.getHospitalname());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getHospitalno())) {
            wrappers.eq(ServiceDonorchargeorgan::getHospitalno, serviceDonorchargeorgan.getHospitalno());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getOrganno())) {
            wrappers.eq(ServiceDonorchargeorgan::getOrganno, serviceDonorchargeorgan.getOrganno());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getOrganname())) {
            wrappers.like(ServiceDonorchargeorgan::getOrganname, serviceDonorchargeorgan.getOrganname());
        }
        if (serviceDonorchargeorgan.getOrgancharge() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getOrgancharge, serviceDonorchargeorgan.getOrgancharge());
        }
        if (serviceDonorchargeorgan.getOrgantime() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getOrgantime, serviceDonorchargeorgan.getOrgantime());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getChargeoperator())) {
            wrappers.eq(ServiceDonorchargeorgan::getChargeoperator, serviceDonorchargeorgan.getChargeoperator());
        }
        if (serviceDonorchargeorgan.getAmount() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getAmount, serviceDonorchargeorgan.getAmount());
        }
        if (serviceDonorchargeorgan.getAmounttime() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getAmounttime, serviceDonorchargeorgan.getAmounttime());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getAmountoperator())) {
            wrappers.eq(ServiceDonorchargeorgan::getAmountoperator, serviceDonorchargeorgan.getAmountoperator());
        }
        if (serviceDonorchargeorgan.getChargestate() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getChargestate, serviceDonorchargeorgan.getChargestate());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getOrganchargedesc())) {
            wrappers.eq(ServiceDonorchargeorgan::getOrganchargedesc, serviceDonorchargeorgan.getOrganchargedesc());
        }
        return this.list(wrappers);
    }

}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,138 @@
<?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">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonatecomporganMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceDonatecomporgan" id="ServiceDonatecomporganResult">
        <result property="id" column="ID"/>
        <result property="infoid" column="InfoID"/>
        <result property="organno" column="OrganNo"/>
        <result property="organname" column="OrganName"/>
        <result property="transplantstate" column="transplantstate"/>
        <result property="abandonreason" column="AbandonReason"/>
        <result property="transplanttime" column="TransplantTime"/>
        <result property="transplantdoct" column="TransplantDoct"/>
        <result property="transplanthospitalno" column="TransplantHospitalNo"/>
        <result property="transplanthospitalname" column="TransplantHospitalName"/>
        <result property="name" column="Name"/>
        <result property="sex" column="Sex"/>
        <result property="idcardtype" column="IDCardType"/>
        <result property="idcardno" column="IDCardNo"/>
        <result property="age" column="Age"/>
        <result property="ageunit" column="AgeUnit"/>
        <result property="birthday" column="Birthday"/>
        <result property="phone" column="Phone"/>
        <result property="residenceaddress" column="ResidenceAddress"/>
        <result property="residenceprovince" column="ResidenceProvince"/>
        <result property="residenceprovincename" column="ResidenceProvinceName"/>
        <result property="residencecity" column="ResidenceCity"/>
        <result property="residencecityname" column="ResidenceCityName"/>
        <result property="residencetown" column="ResidenceTown"/>
        <result property="residencetownname" column="ResidenceTownName"/>
        <result property="residencecommunity" column="ResidenceCommunity"/>
        <result property="residencecommunityname" column="ResidenceCommunityName"/>
        <result property="residencecountycode" column="ResidenceCountyCode"/>
        <result property="residencecountyname" column="ResidenceCountyName"/>
        <result property="delFlag" 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="selectServiceDonatecomporganVo">
        select ID,
               InfoID,
               OrganNo,
               OrganName,
               transplantstate,
               AbandonReason,
               TransplantTime,
               TransplantDoct,
               TransplantHospitalNo,
               TransplantHospitalName,
               Name,
               Sex,
               IDCardType,
               IDCardNo,
               Age,
               AgeUnit,
               Birthday,
               Phone,
               ResidenceAddress,
               ResidenceProvince,
               ResidenceProvinceName,
               ResidenceCity,
               ResidenceCityName,
               ResidenceTown,
               ResidenceTownName,
               ResidenceCommunity,
               ResidenceCommunityName,
               ResidenceCountyCode,
               ResidenceCountyName,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time
        from service_donatecomporgan
    </sql>

    <select id="selectServiceDonatecomporganList" parameterType="com.ruoyi.project.domain.ServiceDonatecomporgan"
            resultMap="ServiceDonatecomporganResult">
        <include refid="selectServiceDonatecomporganVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="organno != null  and organno != ''">and OrganNo = #{organno}</if>
            <if test="organname != null  and organname != ''">and OrganName like concat('%', #{organname}, '%')</if>
            <if test="transplantstate != null ">and transplantstate = #{transplantstate}</if>
            <if test="abandonreason != null  and abandonreason != ''">and AbandonReason = #{abandonreason}</if>
            <if test="transplanttime != null ">and TransplantTime = #{transplanttime}</if>
            <if test="transplantdoct != null  and transplantdoct != ''">and TransplantDoct = #{transplantdoct}</if>
            <if test="transplanthospitalno != null  and transplanthospitalno != ''">and TransplantHospitalNo =
                #{transplanthospitalno}
            </if>
            <if test="transplanthospitalname != null  and transplanthospitalname != ''">and TransplantHospitalName like
                concat('%', #{transplanthospitalname}, '%')
            </if>
            <if test="name != null  and name != ''">and Name like concat('%', #{name}, '%')</if>
            <if test="sex != null ">and Sex = #{sex}</if>
            <if test="idcardtype != null ">and IDCardType = #{idcardtype}</if>
            <if test="idcardno != null  and idcardno != ''">and IDCardNo = #{idcardno}</if>
            <if test="age != null ">and Age = #{age}</if>
            <if test="ageunit != null  and ageunit != ''">and AgeUnit = #{ageunit}</if>
            <if test="birthday != null  and birthday != ''">and Birthday = #{birthday}</if>
            <if test="phone != null  and phone != ''">and Phone = #{phone}</if>
            <if test="residenceaddress != null  and residenceaddress != ''">and ResidenceAddress = #{residenceaddress}
            </if>
            <if test="residenceprovince != null  and residenceprovince != ''">and ResidenceProvince =
                #{residenceprovince}
            </if>
            <if test="residenceprovincename != null  and residenceprovincename != ''">and ResidenceProvinceName like
                concat('%', #{residenceprovincename}, '%')
            </if>
            <if test="residencecity != null  and residencecity != ''">and ResidenceCity = #{residencecity}</if>
            <if test="residencecityname != null  and residencecityname != ''">and ResidenceCityName like concat('%',
                #{residencecityname}, '%')
            </if>
            <if test="residencetown != null  and residencetown != ''">and ResidenceTown = #{residencetown}</if>
            <if test="residencetownname != null  and residencetownname != ''">and ResidenceTownName like concat('%',
                #{residencetownname}, '%')
            </if>
            <if test="residencecommunity != null  and residencecommunity != ''">and ResidenceCommunity =
                #{residencecommunity}
            </if>
            <if test="residencecommunityname != null  and residencecommunityname != ''">and ResidenceCommunityName like
                concat('%', #{residencecommunityname}, '%')
            </if>
            <if test="residencecountycode != null  and residencecountycode != ''">and ResidenceCountyCode =
                #{residencecountycode}
            </if>
            <if test="residencecountyname != null  and residencecountyname != ''">and ResidenceCountyName like
                concat('%', #{residencecountyname}, '%')
            </if>
        </where>
    </select>

</mapper>

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

@@ -22,6 +22,7 @@
        <result property="reallocationreason" column="ReallocationReason"/>
        <result property="transplantdoct" column="TransplantDoct"/>
        <result property="transplanttime" column="TransplantTime"/>
        <result property="estimatedtime" column="EstimatedTime"/>
        <result property="isbiopsybefore" column="IsBiopsyBefore"/>
        <result property="isbiopsyafter" column="IsBiopsyAfter"/>
        <result property="ismarginalorgan" column="IsMarginalOrgan"/>
@@ -37,7 +38,7 @@
        <result property="applicantusername" column="ApplicantUserName"/>
        <result property="applicanttime" column="ApplicantTime"/>
        <result property="checkuserid" column="CheckUserID"/>
        <result property="caseno"    column="CaseNo"    />
        <result property="caseno" column="CaseNo"/>
        <result property="checkusername" column="CheckUserName"/>
        <result property="checktime" column="CheckTime"/>
        <result property="checksuggestion" column="CheckSuggestion"/>
@@ -112,6 +113,7 @@
               CheckTime,
               CheckSuggestion,
               AllocationStatus,
               EstimatedTime,
               Name,
               Sex,
               IDCardType,
@@ -153,6 +155,7 @@
            <if test="organstate != null ">and OrganState = #{organstate}</if>
            <if test="organnumber != null  and organnumber != ''">and OrganNumber = #{organnumber}</if>
            <if test="organgettime != null ">and OrganGetTime = #{organgettime}</if>
            <if test="estimatedtime != null ">and EstimatedTime = #{estimatedtime}</if>
            <if test="organgetdoct != null  and organgetdoct != ''">and OrganGetDoct = #{organgetdoct}</if>
            <if test="gainhospitalno != null  and gainhospitalno != ''">and GainHospitalNo = #{gainhospitalno}</if>
            <if test="gainhospitalname != null  and gainhospitalname != ''">and GainHospitalName like concat('%',

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
<?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">
<mapper namespace="com.ruoyi.project.mapper.ServiceDonationwitnessorganMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceDonationwitnessorgan" id="ServiceDonationwitnessorganResult">
        <result property="id" column="ID"/>
        <result property="infoid" column="InfoID"/>
        <result property="donorno" column="DonorNo"/>
        <result property="organno" column="OrganNo"/>
        <result property="organname" column="OrganName"/>
        <result property="organnumber" column="OrganNumber"/>
        <result property="organstate" column="OrganState"/>
        <result property="notgetreason" column="notgetreason"/>
        <result property="organgettime" column="OrganGetTime"/>
        <result property="organgetdoct" column="OrganGetDoct"/>
        <result property="gainhospitalno" column="GainHospitalNo"/>
        <result property="gainhospitalname" column="GainHospitalName"/>
        <result property="isbiopsybefore" column="IsBiopsyBefore"/>
        <result property="isbiopsyafter" column="IsBiopsyAfter"/>
        <result property="ismarginalorgan" column="IsMarginalOrgan"/>
        <result property="ispathogenpositive" column="IsPathogenPositive"/>
        <result property="ispnf" column="IsPNF"/>
        <result property="isdgf" column="IsDGF"/>
        <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="selectServiceDonationwitnessorganVo">
        select ID,
               InfoID,
               DonorNo,
               OrganNo,
               OrganName,
               OrganNumber,
               OrganState,
               notgetreason,
               OrganGetTime,
               OrganGetDoct,
               GainHospitalNo,
               GainHospitalName,
               IsBiopsyBefore,
               IsBiopsyAfter,
               IsMarginalOrgan,
               IsPathogenPositive,
               IsPNF,
               IsDGF,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time
        from service_donationwitnessorgan
    </sql>

    <select id="selectServiceDonationwitnessorganList"
            parameterType="com.ruoyi.project.domain.ServiceDonationwitnessorgan"
            resultMap="ServiceDonationwitnessorganResult">
        <include refid="selectServiceDonationwitnessorganVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</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>
            <if test="organnumber != null  and organnumber != ''">and OrganNumber = #{organnumber}</if>
            <if test="organstate != null  and organstate != ''">and OrganState = #{organstate}</if>
            <if test="notgetreason != null  and notgetreason != ''">and notgetreason = #{notgetreason}</if>
            <if test="organgettime != null ">and OrganGetTime = #{organgettime}</if>
            <if test="organgetdoct != null  and organgetdoct != ''">and OrganGetDoct = #{organgetdoct}</if>
            <if test="gainhospitalno != null  and gainhospitalno != ''">and GainHospitalNo = #{gainhospitalno}</if>
            <if test="gainhospitalname != null  and gainhospitalname != ''">and GainHospitalName like concat('%',
                #{gainhospitalname}, '%')
            </if>
            <if test="isbiopsybefore != null  and isbiopsybefore != ''">and IsBiopsyBefore = #{isbiopsybefore}</if>
            <if test="isbiopsyafter != null  and isbiopsyafter != ''">and IsBiopsyAfter = #{isbiopsyafter}</if>
            <if test="ismarginalorgan != null  and ismarginalorgan != ''">and IsMarginalOrgan = #{ismarginalorgan}</if>
            <if test="ispathogenpositive != null  and ispathogenpositive != ''">and IsPathogenPositive =
                #{ispathogenpositive}
            </if>
            <if test="ispnf != null  and ispnf != ''">and IsPNF = #{ispnf}</if>
            <if test="isdgf != null  and isdgf != ''">and IsDGF = #{isdgf}</if>
        </where>
    </select>

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,54 @@
<?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">
<mapper namespace="com.ruoyi.system.mapper.ServiceDonorchargeorganMapper">
    
    <resultMap type="ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorname"    column="donorname"    />
        <result property="hospitalname"    column="HospitalName"    />
        <result property="hospitalno"    column="HospitalNo"    />
        <result property="organno"    column="OrganNo"    />
        <result property="organname"    column="OrganName"    />
        <result property="organcharge"    column="organcharge"    />
        <result property="organtime"    column="organtime"    />
        <result property="chargeoperator"    column="chargeoperator"    />
        <result property="amount"    column="amount"    />
        <result property="amounttime"    column="amounttime"    />
        <result property="amountoperator"    column="amountoperator"    />
        <result property="chargestate"    column="chargestate"    />
        <result property="organchargedesc"    column="organchargedesc"    />
        <result property="delFlag"    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="selectServiceDonorchargeorganVo">
        select ID, InfoID, donorname, HospitalName, HospitalNo, OrganNo, OrganName, organcharge, organtime, chargeoperator, amount, amounttime, amountoperator, chargestate, organchargedesc, del_flag, create_by, create_time, update_by, update_time from service_donorchargeorgan
    </sql>

    <select id="selectServiceDonorchargeorganList" parameterType="ServiceDonorchargeorgan" resultMap="ServiceDonorchargeorganResult">
        <include refid="selectServiceDonorchargeorganVo"/>
        <where>
            <if test="infoid != null "> and InfoID = #{infoid}</if>
            <if test="donorname != null  and donorname != ''"> and donorname like concat('%', #{donorname}, '%')</if>
            <if test="hospitalname != null  and hospitalname != ''"> and HospitalName like concat('%', #{hospitalname}, '%')</if>
            <if test="hospitalno != null  and hospitalno != ''"> and HospitalNo = #{hospitalno}</if>
            <if test="organno != null  and organno != ''"> and OrganNo = #{organno}</if>
            <if test="organname != null  and organname != ''"> and OrganName like concat('%', #{organname}, '%')</if>
            <if test="organcharge != null "> and organcharge = #{organcharge}</if>
            <if test="organtime != null "> and organtime = #{organtime}</if>
            <if test="chargeoperator != null  and chargeoperator != ''"> and chargeoperator = #{chargeoperator}</if>
            <if test="amount != null "> and amount = #{amount}</if>
            <if test="amounttime != null "> and amounttime = #{amounttime}</if>
            <if test="amountoperator != null  and amountoperator != ''"> and amountoperator = #{amountoperator}</if>
            <if test="chargestate != null "> and chargestate = #{chargestate}</if>
            <if test="organchargedesc != null  and organchargedesc != ''"> and organchargedesc = #{organchargedesc}</if>
        </where>
    </select>

</mapper>