代码提交

liusheng

2025-12-26 2944ea778f0fc87c8e09ae47200d9de8069049e3

代码提交

 ruoyi-admin/pom.xml

@@ -8,8 +8,8 @@
        <version>3.7.0</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>
    <packaging>war</packaging>
    <!--    <packaging>jar</packaging>-->
    <!--    <packaging>war</packaging>-->
        <packaging>jar</packaging>
    <artifactId>smartor-opo</artifactId>

    <description>

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -72,7 +72,7 @@
     * é€šç”¨ä¸Šä¼ è¯·æ±‚,type ä¸º0 ä»£è¡¨æ˜¯å·®æ—…报销，为1代表费用申请,其它值不变
     */
    @PostMapping("/common/upload")
    public AjaxResult uploadFile(MultipartFile file) throws Exception {
    public AjaxResult uploadFile(MultipartFile file) {

        try {
            // ä¸Šä¼ æ–‡ä»¶è·¯å¾„
@@ -177,4 +177,4 @@
        }
        return 0;
    }
}
}

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

@@ -30,7 +30,7 @@
 * @date 2023-11-10
 */
@Slf4j
@Api("捐献附件")
@Api(description = "捐献附件")
@RestController
@RequestMapping("/project/annextype")
public class BaseAnnextypeController extends BaseController {

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

@@ -33,7 +33,7 @@
 * @date 2022-04-19
 */
@Slf4j
@Api("专家费用")
@Api(description = "专家费用")
@RestController
@RequestMapping("/project/expertfeetype")
public class BaseExpertfeetypeController extends BaseController {

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

@@ -25,7 +25,7 @@
 * @date 2022-01-11
 */
@Slf4j
@Api("收入费用科目")
@Api(description = "收入费用科目")
@RestController
@RequestMapping("/project/financesubject")
public class BaseFinancesubjectController extends BaseController {

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

@@ -33,7 +33,7 @@
 * @date 2022-05-11
 */
@Slf4j
@Api("收入费用科目")
@Api(description = "收入费用科目")
@RestController
@RequestMapping("/project/itemexpense")
public class BaseItemexpenseController extends BaseController {

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

@@ -27,7 +27,7 @@
 * @date 2022-05-11
 */
@Slf4j
@Api("收入费用科目")
@Api(description = "收入费用科目")
@RestController
@RequestMapping("/project/baseonlyvalue")
public class BaseOnlyValController extends BaseController {

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

@@ -26,7 +26,7 @@
 * @date 2023-10-08
 */
@Slf4j
@Api("人体器官获取费用")
@Api(description = "人体器官获取费用")
@RestController
@RequestMapping("/project/organcharge")
public class BaseOrganchargeController extends BaseController {

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

@@ -28,7 +28,7 @@
 * @date 2021-11-05
 */
@Slf4j
@Api("机构信息管理")
@Api(description = "机构信息管理")
@RestController
@RequestMapping("/project/organization")
public class BaseOrganizationController extends BaseController {

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

@@ -33,7 +33,7 @@
 * @date 2021-11-15
 */
@Slf4j
@Api("省市区管理")
@Api(description = "省市区管理")
@RestController
@RequestMapping("/project/dict")
public class BasePrcaddressDictController extends BaseController {

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

@@ -27,7 +27,7 @@
 * @date 2023-04-23
 */
@Slf4j
@Api("差旅城市和补贴标准")
@Api(description = "差旅城市和补贴标准")
@RestController
@RequestMapping("/project/travelcity")
public class BaseTravelcityController extends BaseController {

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

@@ -35,7 +35,7 @@
 * @date 2022-01-24
 */
@Slf4j
@Api("PDF合并")
@Api(description = "PDF合并")
@RestController
@RequestMapping("/project/pdfmerge")
public class PdfMergeController extends BaseController {

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

@@ -33,7 +33,7 @@
 * @date 2022-03-01
 */
@Slf4j
@Api("专家费用分发汇总明细")
@Api(description = "专家费用分发汇总明细")
@RestController
@RequestMapping("/project/distributedetail")
public class ServiceDistributedetailController extends BaseController {

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

@@ -33,7 +33,7 @@
 * @date 2022-03-01
 */
@Slf4j
@Api("专家费用分发汇总主")
@Api(description = "专家费用分发汇总主")
@RestController
@RequestMapping("/project/distributesummary")
public class ServiceDistributesummaryController extends BaseController {

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

@@ -33,7 +33,7 @@
 * @date 2022-04-08
 */
@Slf4j
@Api("捐献附件")
@Api(description = "捐献附件")
@RestController
@RequestMapping("/project/documentfiles")
public class ServiceDocumentfilesController extends BaseController {

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

@@ -36,7 +36,7 @@
 * @date 2021-11-11
 */
@Slf4j
@Api("附件管理")
@Api(description = "附件管理")
@RestController
@RequestMapping("/project/donateannex")
public class ServiceDonateannexController extends BaseController {

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

@@ -33,7 +33,7 @@
 * @date 2021-11-10
 */
@Slf4j
@Api("捐献要求附件管理")
@Api(description = "捐献要求附件管理")
@RestController
@RequestMapping("/project/donateannexrequirement")
public class ServiceDonateannexrequirementController extends BaseController {

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

@@ -46,7 +46,7 @@
 * @date 2021-11-10
 */
@Slf4j
@Api("潜在捐献信息管理")
@Api(description = "潜在捐献信息管理")
@RestController
@RequestMapping("/project/donatebaseinfo")
public class ServiceDonatebaseinfoController extends BaseController {
@@ -58,9 +58,6 @@

    @Autowired
    private IServiceExternalpersonService serviceExternalpersonService;

    @Autowired
    private ServerConfig serverConfig;

    @Autowired
    private SysDeptMapper sysDeptMapper;

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.common.IdGeneratorUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * æçŒ®ä¸ŠæŠ¥åŸºç¡€Controller
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "捐献上报基础")
@RestController
@RequestMapping("/system/donatebaseinforeport")
public class ServiceDonatebaseinfoReportController extends BaseController {
    @Autowired
    private IServiceDonatebaseinfoReportService serviceDonatebaseinfoReportService;
    @Autowired
    private IServiceDonatebaseinfoReportFileService serviceDonatebaseinfoReportFileService;
    @Autowired
    private ISysConfigService sysConfigService;

    /**
     * æŸ¥è¯¢æçŒ®ä¸ŠæŠ¥åŸºç¡€åˆ—表
     */
    @ApiOperation("查询捐献上报基础列表")
    @PostMapping("/list")
    public Map<String, Object> list(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        Page<ServiceDonatebaseinfoReport> serviceDonatebaseinfoReportPage = serviceDonatebaseinfoReportService.queryList(serviceDonatebaseinfoReport);
        return getDataTable(serviceDonatebaseinfoReportPage.getRecords(), (int) serviceDonatebaseinfoReportPage.getTotal());
    }

    /**
     * èŽ·å–总数
     */
    @ApiOperation("获取各类型的总数")
    @PostMapping("/getTotal")
    public Map<String, Object> getTotal(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        //去配置文件中，获取上报类型
        SysConfig config = new SysConfig();
        config.setConfigKey("sys.report.type");
        List<SysConfig> sysConfigs = sysConfigService.selectConfigList(config);
        String type = "";
        if (sysConfigs != null) {
            type = sysConfigs.get(0).getConfigValue();
        }
        Map<String, Object> map = serviceDonatebaseinfoReportService.getTotal(serviceDonatebaseinfoReport, type);
        return getDataTable(map, null);
    }


    /**
     * å¯¼å‡ºæçŒ®ä¸ŠæŠ¥åŸºç¡€åˆ—表
     */
    @ApiOperation("导出捐献上报基础列表")
    @Log(title = "捐献上报基础", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        List<ServiceDonatebaseinfoReport> list = serviceDonatebaseinfoReportService.queryList(serviceDonatebaseinfoReport).getRecords();
        ExcelUtil<ServiceDonatebaseinfoReport> util = new ExcelUtil<ServiceDonatebaseinfoReport>(ServiceDonatebaseinfoReport.class);
        return util.exportExcel(list, "捐献上报基础数据");
    }

    /**
     * èŽ·å–捐献上报基础详细信息
     */
    @ApiOperation("获取捐献上报基础详细信息")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        ServiceDonatebaseinfoReport serviceDonatebaseinfoReport = serviceDonatebaseinfoReportService.getById(id);
        //补充附件
        ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile = new ServiceDonatebaseinfoReportFile();
        serviceDonatebaseinfoReportFile.setDonatebaseinfoReportId(serviceDonatebaseinfoReport.getId());
        serviceDonatebaseinfoReportFile.setCaseNo(serviceDonatebaseinfoReport.getCaseNo());
        serviceDonatebaseinfoReportFile.setDelFlag(0);
        List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
        serviceDonatebaseinfoReport.setAnnexfilesList(serviceDonatebaseinfoReportFiles);
        return AjaxResult.success(serviceDonatebaseinfoReport);
    }

    /**
     * æ–°å¢žæçŒ®ä¸ŠæŠ¥åŸºç¡€
     */
    @ApiOperation("新增捐献上报基础")
    @Log(title = "捐献上报基础", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        //生成案例上报ID
        String caseNo = String.valueOf(IdGeneratorUtils.nextId());
        serviceDonatebaseinfoReport.setCaseNo(caseNo);
        boolean save = serviceDonatebaseinfoReportService.save(serviceDonatebaseinfoReport);
        //将生成的文件地址存储到数据库中
        if (save)
            serviceDonatebaseinfoReportFileService.addList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getCaseNo(), getNickName());
        return toAjax(save);
    }

    /**
     * ä¿®æ”¹æçŒ®ä¸ŠæŠ¥åŸºç¡€
     */
    @ApiOperation("修改捐献上报基础")
    @Log(title = "捐献上报基础", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        boolean b = serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport);
        if (b) {
            serviceDonatebaseinfoReportFileService.updateList(serviceDonatebaseinfoReport.getAnnexfilesList(), serviceDonatebaseinfoReport.getId(), serviceDonatebaseinfoReport.getCaseNo(), getNickName());
        }
        return toAjax(b);
    }

    /**
     * åˆ é™¤æçŒ®ä¸ŠæŠ¥åŸºç¡€
     */
    @ApiOperation("删除捐献上报基础")
    @GetMapping("/remove/{id}")
    public AjaxResult remove(@PathVariable Long id) {
        ServiceDonatebaseinfoReport serviceDonatebaseinfoReport = new ServiceDonatebaseinfoReport();
        serviceDonatebaseinfoReport.setId(id);
        serviceDonatebaseinfoReport.setDelFlag(1);
        return toAjax(serviceDonatebaseinfoReportService.updateById(serviceDonatebaseinfoReport));
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,102 @@
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.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * æ¡ˆä¾‹ä¸ŠæŠ¥é™„件Controller
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "案例上报附件")
@RestController
@RequestMapping("/system/Donatebaseinfofile")
public class ServiceDonatebaseinfoReportFileController extends BaseController {
    @Autowired
    private IServiceDonatebaseinfoReportFileService serviceDonatebaseinfoReportFileService;

    /**
     * æŸ¥è¯¢æ¡ˆä¾‹ä¸ŠæŠ¥é™„件列表
     */
    @ApiOperation("查询案例上报附件列表")
    // @PreAuthorize("@ss.hasPermi('system:file:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile) {
        startPage();
        List<ServiceDonatebaseinfoReportFile> list = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºæ¡ˆä¾‹ä¸ŠæŠ¥é™„件列表
     */
    @ApiOperation("导出案例上报附件列表")
    // @PreAuthorize("@ss.hasPermi('system:file:export')")
    @Log(title = "案例上报附件", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile) {
        List<ServiceDonatebaseinfoReportFile> list = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
        ExcelUtil<ServiceDonatebaseinfoReportFile> util = new ExcelUtil<ServiceDonatebaseinfoReportFile>(ServiceDonatebaseinfoReportFile.class);
        return util.exportExcel(list, "案例上报附件数据");
    }

    /**
     * èŽ·å–案例上报附件详细信息
     */
    @ApiOperation("获取案例上报附件详细信息")
    // @PreAuthorize("@ss.hasPermi('system:file:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceDonatebaseinfoReportFileService.getById(id));
    }

    /**
     * æ–°å¢žæ¡ˆä¾‹ä¸ŠæŠ¥é™„件
     */
    @ApiOperation("新增案例上报附件")
    // @PreAuthorize("@ss.hasPermi('system:file:add')")
    @Log(title = "案例上报附件", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile) {
        return toAjax(serviceDonatebaseinfoReportFileService.save(serviceDonatebaseinfoReportFile));
    }

    /**
     * ä¿®æ”¹æ¡ˆä¾‹ä¸ŠæŠ¥é™„件
     */
    @ApiOperation("修改案例上报附件")
    // @PreAuthorize("@ss.hasPermi('system:file:edit')")
    @Log(title = "案例上报附件", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile) {
        return toAjax(serviceDonatebaseinfoReportFileService.updateById(serviceDonatebaseinfoReportFile));
    }

    /**
     * åˆ é™¤æ¡ˆä¾‹ä¸ŠæŠ¥é™„件
     */
    @ApiOperation("删除案例上报附件")
    // @PreAuthorize("@ss.hasPermi('system:file:remove')")
    @Log(title = "案例上报附件", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceDonatebaseinfoReportFileService.removeByIds(Arrays.asList(ids)));
    }
}

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

@@ -39,7 +39,7 @@
 * @date 2021-11-19
 */
@Slf4j
@Api("捐献完成登记管理")
@Api( description = "捐献完成登记管理")
@RestController
@RequestMapping("/project/donatecompletioninfo")
public class ServiceDonatecompletioninfoController extends BaseController {

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

@@ -27,7 +27,7 @@
 * @date 2023-12-25
 */
@Slf4j
@Api("捐献器官移植")
@Api(description = "捐献器官移植")
@RestController
@RequestMapping("/project/donatecomporgan")
public class ServiceDonatecomporganController extends BaseController {
@@ -117,7 +117,7 @@
            ServiceDonatecomporgan sd = new ServiceDonatecomporgan();
            sd.setInfoid(serviceDonatecompletion.getInfoid());
            sd.setOrganno(serviceDonatecompletion.getOrganno());
            sd.setDel_flag(0);
            sd.setDelFlag(0);
            List<ServiceDonatecomporgan> serviceDonatecomporgans = serviceDonatecomporganService.queryList(sd);
            if (serviceDonatecompletion.getId() == null && CollectionUtils.isEmpty(serviceDonatecomporgans)) {
                i = serviceDonatecomporganService.save(serviceDonatecompletion);

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

@@ -31,7 +31,7 @@
 * @author ruoyi
 * @date 2022-01-18
 */
@Api("资金申请主表")
@Api(description = "资金申请主表")
@RestController
@RequestMapping("/project/donateconsolationfund")
public class ServiceDonateconsolationfundController extends BaseController {

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

@@ -32,7 +32,7 @@
 * @author ruoyi
 * @date 2021-11-15
 */
@Api("捐献流程管理")
@Api(description = "捐献流程管理")
@RestController
@RequestMapping("/project/donateflowchart")
public class ServiceDonateflowchartController extends BaseController {

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

@@ -32,7 +32,7 @@
 * @author ruoyi
 * @date 2021-12-10
 */
@Api("捐献随访")
@Api(description = "捐献随访")
@RestController
@RequestMapping("/project/donatefollowup")
public class ServiceDonatefollowupController extends BaseController {

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

@@ -35,7 +35,7 @@
 * @date 2021-11-10
 */
@Slf4j
@Api("捐献器官管理")
@Api(description = "捐献器官管理")
@RestController
@RequestMapping("/project/donateorgan")
public class ServiceDonateorganController extends BaseController {

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

@@ -24,7 +24,7 @@
 * @author ruoyi
 * @date 2023-12-27
 */
@Api("捐献案例器官列")
@Api(description = "捐献案例器官列")
@RestController
@RequestMapping("/project/donateorganstatics")
public class ServiceDonateorganstaticsController extends BaseController {

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

@@ -50,7 +50,7 @@
 * @date 2021-11-17
 */
@Slf4j
@Api("捐献见证管理")
@Api(description = "捐献见证管理")
@RestController
@RequestMapping("/project/donationwitness")
public class ServiceDonationwitnessController extends BaseController {
@@ -551,7 +551,7 @@
            log.info("捐献见证管理id是否为空 : {},基础表的id为 : {}", serviceDonationwitness.getId(), serviceDonationwitness.getInfoid());
            ServiceDonationwitness sd2 = new ServiceDonationwitness();
            sd2.setInfoid(serviceDonationwitness.getInfoid());
            sd2.setDel_flag(0);
            sd2.setDelFlag(0);
            List<ServiceDonationwitness> serviceDonationwitnesses = serviceDonationwitnessService.queryList(sd2);
            if (!CollectionUtils.isEmpty(serviceDonationwitnesses)) {
                serviceDonationwitness.setId(serviceDonationwitnesses.get(0).getId());

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

@@ -29,7 +29,7 @@
 * @date 2023-12-25
 */
@Slf4j
@Api("捐献器官获取")
@Api(description = "捐献器官获取")
@RestController
@RequestMapping("/project/donationwitnessorgan")
public class ServiceDonationwitnessorganController extends BaseController {
@@ -122,7 +122,7 @@
            ServiceDonationwitnessorgan serviceDonationwitnessorgan2 = new ServiceDonationwitnessorgan();
            serviceDonationwitnessorgan2.setInfoid(serviceDonationwitnessorgan.getInfoid());
            serviceDonationwitnessorgan2.setOrganno(serviceDonationwitnessorgan.getOrganno());
            serviceDonationwitnessorgan2.setDel_flag(0);
            serviceDonationwitnessorgan2.setDelFlag(0);
            List<ServiceDonationwitnessorgan> serviceDonationwitnessorgans = serviceDonationwitnessorganService.queryList(serviceDonationwitnessorgan2);
            log.info("serviceDonationwitnessorgans的数量为 : {},infoid为：{}，Organno为：{}", serviceDonationwitnessorgans.size(), serviceDonationwitnessorgan.getInfoid(), serviceDonationwitnessorgan.getOrganno());
            if (!CollectionUtils.isEmpty(serviceDonationwitnessorgans)) {

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

@@ -27,7 +27,7 @@
 * @author ruoyi
 * @date 2023-12-27
 */
@Api("捐献案例器官列")
@Api(description = "捐献案例器官列")
@RestController
@RequestMapping("/project/donorcharge")
public class ServiceDonorchargeController extends BaseController {

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

@@ -36,7 +36,7 @@
 * @date 2023-12-25
 */
@Slf4j
@Api("捐献器官")
@Api(description = "捐献器官")
@RestController
@RequestMapping("/project/donorchargeorgan")
public class ServiceDonorchargeorganController extends BaseController {
@@ -149,8 +149,8 @@
            log.info("捐献器官id是否为空 : {},基础表的id为 : {}", serviceDonorchargeorganVO.getId(), serviceDonorchargeorganVO.getInfoid());
            ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonorchargeorganVO, ServiceDonorchargeorgan.class);
            serviceDonorchargeorgan.setAnnexFiles(JSON.toJSONString(serviceDonorchargeorganVO.getAnnexFilesList()));
            if (serviceDonorchargeorgan.getDel_flag() == null) {
                serviceDonorchargeorgan.setDel_flag(0);
            if (serviceDonorchargeorgan.getDelFlag() == null) {
                serviceDonorchargeorgan.setDelFlag(0);
            }
            if (serviceDonorchargeorgan.getId() == null) {
                i = serviceDonorchargeorganService.save(serviceDonorchargeorgan);

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

@@ -28,7 +28,7 @@
 * @author ruoyi
 * @date 2024-02-27
 */
@Api("费用收款单")
@Api(description = "费用收款单")
@RestController
@RequestMapping("/project/donorpayment")
public class ServiceDonorpaymentController extends BaseController {

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,100 @@
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.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceEthicalreviewinitiate;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * ä¼¦ç†å®¡æŸ¥å‘èµ·Controller
 *
 * @author ls
 * @date 2025-12-20
 */
@Api(description = "伦理审查发起")
@RestController
@RequestMapping("/system/ethicalreviewinitiate")
public class ServiceEthicalreviewinitiateController extends BaseController {
    @Autowired
    private IServiceEthicalreviewinitiateService serviceEthicalreviewinitiateService;

    /**
     * æŸ¥è¯¢ä¼¦ç†å®¡æŸ¥å‘起列表
     */
    @ApiOperation("查询伦理审查发起列表")
    // @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        startPage();
        List<ServiceEthicalreviewinitiate> list = serviceEthicalreviewinitiateService.queryList(serviceEthicalreviewinitiate);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä¼¦ç†å®¡æŸ¥å‘起列表
     */
    @ApiOperation("导出伦理审查发起列表")
    @Log(title = "伦理审查发起", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        List<ServiceEthicalreviewinitiate> list = serviceEthicalreviewinitiateService.queryList(serviceEthicalreviewinitiate);
        ExcelUtil<ServiceEthicalreviewinitiate> util = new ExcelUtil<ServiceEthicalreviewinitiate>(ServiceEthicalreviewinitiate.class);
        return util.exportExcel(list, "伦理审查发起数据");
    }

    /**
     * èŽ·å–伦理审查发起详细信息
     */
    @ApiOperation("获取伦理审查发起详细信息")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceEthicalreviewinitiateService.getById(id));
    }

    /**
     * æ–°å¢žä¼¦ç†å®¡æŸ¥å‘èµ·
     */
    @ApiOperation("新增伦理审查发起")
    // @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:add')")
    @Log(title = "伦理审查发起", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        return toAjax(serviceEthicalreviewinitiateService.save(serviceEthicalreviewinitiate));
    }

    /**
     * ä¿®æ”¹ä¼¦ç†å®¡æŸ¥å‘èµ·
     */
    @ApiOperation("修改伦理审查发起")
    // @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:edit')")
    @Log(title = "伦理审查发起", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        return toAjax(serviceEthicalreviewinitiateService.updateById(serviceEthicalreviewinitiate));
    }

    /**
     * åˆ é™¤ä¼¦ç†å®¡æŸ¥å‘èµ·
     */
    @ApiOperation("删除伦理审查发起")
    // @PreAuthorize("@ss.hasPermi('system:ethicalreviewinitiate:remove')")
    @Log(title = "伦理审查发起", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceEthicalreviewinitiateService.removeByIds(Arrays.asList(ids)));
    }
}

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

@@ -32,7 +32,7 @@
 * @author ruoyi
 * @date 2022-03-01
 */
@Api("费用申请主")
@Api(description = "费用申请主")
@RestController
@RequestMapping("/system/expertexpense")
public class ServiceExpertexpenseController extends BaseController

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

@@ -24,7 +24,7 @@
 * @author ruoyi
 * @date 2023-09-26
 */
@Api("人员和分组组别关联")
@Api(description = "人员和分组组别关联")
@RestController
@RequestMapping("/externalperson/group")
public class ServiceExternalpersonGroupController extends BaseController {

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

@@ -51,7 +51,7 @@
 * @date 2022-01-24
 */
@Slf4j
@Api("费用申请主")
@Api(description = "费用申请主")
@RestController
@RequestMapping("/project/fund")
public class ServiceFundController extends BaseController {

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

@@ -24,7 +24,7 @@
 * @author ruoyi
 * @date 2023-03-27
 */
@Api("费用申请主")
@Api(description = "费用申请主")
@RestController
@RequestMapping("/system/shared")
public class ServiceFundSharedController extends BaseController {

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

@@ -34,7 +34,7 @@
 * @date 2022-01-25
 */
@Slf4j
@Api("费用申请明细")
@Api(description = "费用申请明细")
@RestController
@RequestMapping("/project/funddetail")
public class ServiceFunddetailController extends BaseController {

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

@@ -30,7 +30,7 @@
 * @author ruoyi
 * @date 2023-04-20
 */
@Api("费用申请明细")
@Api(description = "费用申请明细")
@RestController
@RequestMapping("/project/funddetailshared")
public class ServiceFunddetailSharedController extends BaseController

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

@@ -32,7 +32,7 @@
 * @author ruoyi
 * @date 2022-04-27
 */
@Api("资金审批流程")
@Api(description = "资金审批流程")
@RestController
@RequestMapping("/project/fundflow")
public class ServiceFundflowController extends BaseController {

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

@@ -31,7 +31,7 @@
 * @author ruoyi
 * @date 2022-04-27
 */
@Api("资金审批规则")
@Api(description = "资金审批规则")
@RestController
@RequestMapping("/project/fundflowrule")
public class ServiceFundflowruleController extends BaseController {

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

@@ -27,7 +27,7 @@
 * @author ruoyi
 * @date 2024-03-13
 */
@Api("专家费用算税申请主")
@Api(description = "专家费用算税申请主")
@RestController
@RequestMapping("/project/fundtax")
public class ServiceFundtaxController extends BaseController {

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

@@ -44,7 +44,7 @@
 * @date 2021-11-19
 */
@Slf4j
@Api("医疗评估管理")
@Api(description = "医疗评估管理")
@RestController
@RequestMapping("/project/medicalevaluation")
public class ServiceMedicalevaluationController extends BaseController {

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,109 @@
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.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceMedicalevaluationorgan;
import com.ruoyi.project.service.IServiceMedicalevaluationorganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * æçŒ®å™¨å®˜è¯„ä¼°Controller
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "捐献器官评估")
@RestController
@RequestMapping("/system/medicalevaluationorgan")
public class ServiceMedicalevaluationorganController extends BaseController
{
    @Autowired
    private IServiceMedicalevaluationorganService serviceMedicalevaluationorganService;

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜è¯„估列表
     */
    @ApiOperation("查询捐献器官评估列表")
    // @PreAuthorize("@ss.hasPermi('system:medicalevaluationorgan:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceMedicalevaluationorgan serviceMedicalevaluationorgan)
    {
        startPage();
        List<ServiceMedicalevaluationorgan> list = serviceMedicalevaluationorganService.queryList(serviceMedicalevaluationorgan);
        return getDataTable(list);
    }

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

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

    /**
     * æ–°å¢žæçŒ®å™¨å®˜è¯„ä¼°
     */
    @ApiOperation("新增捐献器官评估")
    // @PreAuthorize("@ss.hasPermi('system:medicalevaluationorgan:add')")
    @Log(title = "捐献器官评估", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceMedicalevaluationorgan serviceMedicalevaluationorgan)
    {
        return toAjax(serviceMedicalevaluationorganService.save(serviceMedicalevaluationorgan));
    }

    /**
     * ä¿®æ”¹æçŒ®å™¨å®˜è¯„ä¼°
     */
    @ApiOperation("修改捐献器官评估")
    // @PreAuthorize("@ss.hasPermi('system:medicalevaluationorgan:edit')")
    @Log(title = "捐献器官评估", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceMedicalevaluationorgan serviceMedicalevaluationorgan)
    {
        return toAjax(serviceMedicalevaluationorganService.updateById(serviceMedicalevaluationorgan));
    }

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

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

@@ -26,7 +26,7 @@
 * @author ruoyi
 * @date 2021-11-10
 */
@Api("器官分配管理")
@Api(description = "器官分配管理")
@RestController
@RequestMapping("/project/organallocation")
public class ServiceOrganallocationController extends BaseController {

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

@@ -51,7 +51,7 @@
 * @date 2022-01-24
 */
@Slf4j
@Api("报销申请")
@Api(description = "报销申请")
@RestController
@RequestMapping("/project/reimbursement")
public class ServiceReimbursementController extends BaseController {
@@ -271,7 +271,7 @@
        ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
        serviceFundflowrule.setApplytype("0");
        serviceFundflowrule.setMustAudite(1);
        serviceFundflowrule.setDel_flag(0);
        serviceFundflowrule.setDelFlag(0);
        List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
        log.info("reimbursement必审人的等级为：{}", serviceFundflowrules.get(0).getFlowlevel());


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

@@ -24,7 +24,7 @@
 * @author ruoyi
 * @date 2023-01-10
 */
@Api("报销申请")
@Api(description = "报销申请")
@RestController
@RequestMapping("/project/reimshared")
public class ServiceReimbursementSharedController extends BaseController

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

@@ -39,7 +39,7 @@
 * @author ruoyi
 * @date 2022-01-24
 */
@Api("报销申请明细")
@Api(description = "报销申请明细")
@RestController
@RequestMapping("/project/reimbursementdetail")
public class ServiceReimbursementdetailController extends BaseController {

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

@@ -30,7 +30,7 @@
 * @author ruoyi
 * @date 2023-04-20
 */
@Api("报销申请明细")
@Api(description = "报销申请明细")
@RestController
@RequestMapping("/project/reimbursementdetailshared")
public class ServiceReimbursementdetailSharedController extends BaseController

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

@@ -23,7 +23,7 @@
 * @author ruoyi
 * @date 2023-05-10
 */
@Api("差旅报销付款信息")
@Api(description = "差旅报销付款信息")
@RestController
@RequestMapping("/project/reimbursementpayee")
public class ServiceReimbursementpayeeController extends BaseController {

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

@@ -30,7 +30,7 @@
 * @author ruoyi
 * @date 2023-04-20
 */
@Api("差旅报销付款信息")
@Api(description = "差旅报销付款信息")
@RestController
@RequestMapping("/project/reimbursementpayeeshared")
public class ServiceReimbursementpayeeSharedController extends BaseController

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

@@ -48,7 +48,7 @@
 * @date 2021-11-15
 */
@Slf4j
@Api("亲属确认管理")
@Api(description = "亲属确认管理")
@RestController
@RequestMapping("/project/relativesconfirmation")
public class ServiceRelativesconfirmationController extends BaseController {

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

@@ -36,7 +36,7 @@
 * @date 2022-06-02
 */
@Slf4j
@Api("系统消息")
@Api(description = "系统消息")
@RestController
@RequestMapping("/project/systemmessage")
public class ServiceSystemmessageController extends BaseController {

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

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

import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.annotation.Log;
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.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.domain.ServiceTransportFile;
import com.ruoyi.project.service.IServiceTransportService;
import com.ruoyi.project.service.impl.ServiceTransportFileServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * ä¾›è€…转运登记Controller
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "供者转运登记")
@RestController
@RequestMapping("/system/transport")
public class ServiceTransportController extends BaseController {
    @Autowired
    private IServiceTransportService serviceTransportService;

    @Autowired
    private ServiceTransportFileServiceImpl serviceTransportFileService;

    /**
     * æŸ¥è¯¢ä¾›è€…转运登记列表
     */
    @ApiOperation("查询供者转运登记列表")
    // @PreAuthorize("@ss.hasPermi('system:transport:list')")
    @PostMapping("/list")
    public Map<String, Object> list(ServiceTransport serviceTransport) {
        Page<ServiceTransport> serviceTransportPage = serviceTransportService.queryList(serviceTransport);
        return getDataTable(serviceTransportPage.getRecords(), (int) serviceTransportPage.getTotal());
    }

    /**
     * å¯¼å‡ºä¾›è€…转运登记列表
     */
    @ApiOperation("导出供者转运登记列表")
    // @PreAuthorize("@ss.hasPermi('system:transport:export')")
    @Log(title = "供者转运登记", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceTransport serviceTransport) {
        List<ServiceTransport> list = serviceTransportService.queryList(serviceTransport).getRecords();
        ExcelUtil<ServiceTransport> util = new ExcelUtil<ServiceTransport>(ServiceTransport.class);
        return util.exportExcel(list, "供者转运登记数据");
    }

    /**
     * èŽ·å–供者转运登记详细信息
     */
    @ApiOperation("获取供者转运登记详细信息")
    // @PreAuthorize("@ss.hasPermi('system:transport:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        ServiceTransport transport = serviceTransportService.getById(id);
        if (ObjectUtils.isNotEmpty(transport)) {
            //补充 é™„件
            ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
            serviceTransportFile.setDelFlag(0);
            serviceTransportFile.setTransportId(transport.getId());
            serviceTransportFile.setCaseNo(transport.getCaseNo());
            List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);
            transport.setAnnexfilesList(serviceTransportFiles);
        }
        return AjaxResult.success(transport);
    }

    /**
     * æ–°å¢žä¾›è€…转运登记
     */
    @ApiOperation("新增供者转运登记")
    // @PreAuthorize("@ss.hasPermi('system:transport:add')")
    @Log(title = "供者转运登记", businessType = BusinessType.INSERT)
    @PostMapping("/add")
//    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceTransport serviceTransport) {
        boolean save = serviceTransportService.save(serviceTransport);
        if (save) {
            serviceTransportFileService.addList(serviceTransport.getAnnexfilesList(), serviceTransport.getId(), serviceTransport.getCaseNo(), getNickName());
        }
        return toAjax(save);
    }

    /**
     * ä¿®æ”¹ä¾›è€…转运登记
     */
    @ApiOperation("修改供者转运登记")
    // @PreAuthorize("@ss.hasPermi('system:transport:edit')")
    @Log(title = "供者转运登记", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
//    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceTransport serviceTransport) {
        boolean b = serviceTransportService.updateById(serviceTransport);
        if (b) {
            serviceTransportFileService.updateList(serviceTransport.getAnnexfilesList(), serviceTransport.getReportId(), serviceTransport.getCaseNo(), getNickName());
        }
        return toAjax(b);
    }

    /**
     * åˆ é™¤ä¾›è€…转运登记
     */
    @ApiOperation("删除供者转运登记")
    // @PreAuthorize("@ss.hasPermi('system:transport:remove')")
    @Log(title = "供者转运登记", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceTransportService.removeByIds(Arrays.asList(ids)));
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,107 @@
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.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceTransportFile;
import com.ruoyi.project.service.IServiceTransportFileService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

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

/**
 * ä¾›è€…转运登记附件Controller
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Api(description = "供者转运登记附件")
@RestController
@RequestMapping("/system/transportfile")
public class ServiceTransportFileController extends BaseController {
    @Autowired
    private IServiceTransportFileService serviceTransportFileService;

    /**
     * æŸ¥è¯¢ä¾›è€…转运登记附件列表
     */
    @ApiOperation("查询供者转运登记附件列表")
    // @PreAuthorize("@ss.hasPermi('system:file:list')")
    @PostMapping("/list")
    public TableDataInfo list(ServiceTransportFile serviceTransportFile) {
        startPage();
        List<ServiceTransportFile> list = serviceTransportFileService.queryList(serviceTransportFile);
        return getDataTable(list);
    }

    /**
     * å¯¼å‡ºä¾›è€…转运登记附件列表
     */
    @ApiOperation("导出供者转运登记附件列表")
    // @PreAuthorize("@ss.hasPermi('system:file:export')")
    @Log(title = "供者转运登记附件", businessType = BusinessType.EXPORT)
    @GetMapping("/export")
    public AjaxResult export(ServiceTransportFile serviceTransportFile) {
        List<ServiceTransportFile> list = serviceTransportFileService.queryList(serviceTransportFile);
        ExcelUtil<ServiceTransportFile> util = new ExcelUtil<ServiceTransportFile>(ServiceTransportFile.class);
        return util.exportExcel(list, "供者转运登记附件数据");
    }

    /**
     * èŽ·å–供者转运登记附件详细信息
     */
    @ApiOperation("获取供者转运登记附件详细信息")
    // @PreAuthorize("@ss.hasPermi('system:file:query')")
    @GetMapping(value = "/getInfo/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id) {
        return AjaxResult.success(serviceTransportFileService.getById(id));
    }

    /**
     * æ–°å¢žä¾›è€…转运登记附件
     */
    @ApiOperation("新增供者转运登记附件")
    // @PreAuthorize("@ss.hasPermi('system:file:add')")
    @Log(title = "供者转运登记附件", businessType = BusinessType.INSERT)
    @PostMapping("/add")
//    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceTransportFile serviceTransportFile) {
        serviceTransportFile.setCreateBy(getNickName());
        serviceTransportFile.setCreateTime(new Date());
        return toAjax(serviceTransportFileService.save(serviceTransportFile));
    }

    /**
     * ä¿®æ”¹ä¾›è€…转运登记附件
     */
    @ApiOperation("修改供者转运登记附件")
    // @PreAuthorize("@ss.hasPermi('system:file:edit')")
    @Log(title = "供者转运登记附件", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
//    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceTransportFile serviceTransportFile) {
        serviceTransportFile.setUpdateBy(getNickName());
        serviceTransportFile.setUpdateTime(new Date());
        return toAjax(serviceTransportFileService.updateById(serviceTransportFile));
    }

    /**
     * åˆ é™¤ä¾›è€…转运登记附件
     */
    @ApiOperation("删除供者转运登记附件")
    // @PreAuthorize("@ss.hasPermi('system:file:remove')")
    @Log(title = "供者转运登记附件", businessType = BusinessType.DELETE)
    @GetMapping("/remove/{ids}")
    public AjaxResult remove(@PathVariable Long[] ids) {
        return toAjax(serviceTransportFileService.removeByIds(Arrays.asList(ids)));
    }
}

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

@@ -33,7 +33,7 @@
 * @author ruoyi
 * @date 2022-04-26
 */
@Api("住宿费限额标准")
@Api(description = "住宿费限额标准")
@RestController
@RequestMapping("/system/travelexpensestandard")
public class ServiceTravelexpensestandardController extends BaseController

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

@@ -54,7 +54,7 @@
 * @date 2022-01-24
 */
@Slf4j
@Api("案例统计")
@Api(description = "案例统计")
@RestController
@RequestMapping("/project/spstatcase")
public class SpStatCaseController extends BaseController {

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

@@ -22,7 +22,7 @@
 * @date 2022-01-24
 */
@Slf4j
@Api("报销统计")
@Api(description = "报销统计")
@RestController
@RequestMapping("/project/spstatexpense")
public class SpStatExpenseController extends BaseController {

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

@@ -23,7 +23,7 @@
 * @author ruoyi
 * @date 2024-07-26
 */
@Api("VIEW")
@Api(description = "VIEW")
@RestController
@RequestMapping("/VDonationworkflow/donationworkflow")
public class VDonationworkflowController extends BaseController {

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

@@ -24,7 +24,7 @@
 * @author ruoyi
 * @date 2024-03-18
 */
@Api("VIEW")
@Api(description = "VIEW")
@RestController
@RequestMapping("/project/feeexpert")
public class VExpertfeeExpertController extends BaseController

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

@@ -24,7 +24,7 @@
 * @author ruoyi
 * @date 2024-03-18
 */
@Api("VIEW")
@Api(description = "VIEW")
@RestController
@RequestMapping("/project/feetotal")
public class VExpertfeeTotalController extends BaseController

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

@@ -31,7 +31,7 @@
 * @author shenjie
 * @date 2021-11-11
 */
@Api("器官登记管理")
@Api(description = "器官登记管理")
@RestController
@RequestMapping("/project/register")
public class VServiceDonateorganRegisterController extends BaseController

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

ÎļþÒÑɾ³ý

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java

@@ -36,7 +36,7 @@
 * @author ruoyi
 */
@Slf4j
@Api("用户登录")
@Api(description = "用户登录")
@RestController
public class SysLoginController {
    @Autowired

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/tool/TestController.java

@@ -27,7 +27,7 @@
 * 
 * @author ruoyi
 */
@Api("用户信息管理")
@Api(description = "用户信息管理")
@RestController
@RequestMapping("/test/user")
public class TestController extends BaseController

 ruoyi-admin/src/main/resources/application-druid.yml

@@ -7,10 +7,7 @@
      # ä¸»åº“数据源
      master:
        # å¼€å‘环境
        #        url: jdbc:mysql://116.62.18.175:6002/opo?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        #        username: opo
        #        password: Smartor.2023
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/opo?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        url: jdbc:mysql://haiershi.a1.luyouxia.net:23844/opo-qd?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
        username: smartor
        password: Smartor.2023


 ruoyi-admin/src/main/resources/application.yml

@@ -53,7 +53,7 @@
    # å›½é™…化资源文件路径
    basename: i18n/messages
  profiles:
    active: srm
    active: druid
  # æ–‡ä»¶ä¸Šä¼ 
  servlet:
    multipart:
@@ -102,15 +102,15 @@


# PageHelper分页插件
pagehelper:
  helperDialect: mysql
  supportMethodsArguments: true
  params: count=countSql
#pagehelper:
#  helperDialect: mysql
#  supportMethodsArguments: true
#  params: count=countSql

# Swagger配置
swagger:
  # æ˜¯å¦å¼€å¯swagger
  enabled: false
  enabled: true
  # è¯·æ±‚前缀
  pathMapping: /


 ruoyi-admin/src/main/resources/mybatis/mybatis-config.xml

@@ -12,9 +12,9 @@
        <!-- é…ç½®é»˜è®¤çš„执行器.SIMPLE就是普通执行器;REUSE执行器会重用预处理语句(prepared statements);BATCH执行器将重用语句并执行批量更新 -->
        <setting name="defaultExecutorType"      value="SIMPLE" />
        <!-- æŒ‡å®š MyBatis æ‰€ç”¨æ—¥å¿—的具体实现 -->
        <setting name="logImpl"                  value="SLF4J"  />
<!--        <setting name="logImpl"                  value="SLF4J"  />-->
        <!-- ä½¿ç”¨é©¼å³°å‘½åæ³•è½¬æ¢å­—段 -->
        <!-- <setting name="mapUnderscoreToCamelCase" value="true"/> -->
    </settings>
	

</configuration>

 ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java

@@ -2,7 +2,10 @@

import java.beans.PropertyEditorSupport;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.web.bind.WebDataBinder;
@@ -22,25 +25,21 @@

/**
 * web层通用数据处理
 * 
 *
 * @author ruoyi
 */
public class BaseController
{
public class BaseController {
    protected final Logger logger = LoggerFactory.getLogger(this.getClass());

    /**
     * å°†å‰å°ä¼ é€’过来的日期格式的字符串，自动转化为Date类型
     */
    @InitBinder
    public void initBinder(WebDataBinder binder)
    {
    public void initBinder(WebDataBinder binder) {
        // Date ç±»åž‹è½¬æ¢
        binder.registerCustomEditor(Date.class, new PropertyEditorSupport()
        {
        binder.registerCustomEditor(Date.class, new PropertyEditorSupport() {
            @Override
            public void setAsText(String text)
            {
            public void setAsText(String text) {
                setValue(DateUtils.parseDate(text));
            }
        });
@@ -49,13 +48,11 @@
    /**
     * è®¾ç½®è¯·æ±‚分页数据
     */
    protected void startPage()
    {
    protected void startPage() {
        PageDomain pageDomain = TableSupport.buildPageRequest();
        Integer pageNum = pageDomain.getPageNum();
        Integer pageSize = pageDomain.getPageSize();
        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize))
        {
        if (StringUtils.isNotNull(pageNum) && StringUtils.isNotNull(pageSize)) {
            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
            Boolean reasonable = pageDomain.getReasonable();
            PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable);
@@ -66,11 +63,9 @@
    /**
     * è®¾ç½®è¯·æ±‚排序数据
     */
    protected void startOrderBy()
    {
    protected void startOrderBy() {
        PageDomain pageDomain = TableSupport.buildPageRequest();
        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
        {
        if (StringUtils.isNotEmpty(pageDomain.getOrderBy())) {
            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
            PageHelper.orderBy(orderBy);
        }
@@ -79,9 +74,8 @@
    /**
     * å“åº”请求分页数据
     */
    @SuppressWarnings({ "rawtypes", "unchecked" })
    protected TableDataInfo getDataTable(List<?> list)
    {
    @SuppressWarnings({"rawtypes", "unchecked"})
    protected TableDataInfo getDataTable(List<?> list) {
        TableDataInfo rspData = new TableDataInfo();
        rspData.setCode(HttpStatus.SUCCESS);
        rspData.setMsg("查询成功");
@@ -90,12 +84,20 @@
        return rspData;
    }

    protected Map<String, Object> getDataTable(Object object,Integer total) {
        Map<String, Object> rspData = new HashMap<>();
        rspData.put("code", HttpStatus.SUCCESS);
        rspData.put("msg", "查询成功");
        rspData.put("data", object);
        rspData.put("total", total);
        return rspData;
    }

    /**
     * å“åº”请求分页数据
     */
    @SuppressWarnings({ "rawtypes", "unchecked" })
    protected TableDataInfo getDataTable2(List<?> list,List<?> list2)
    {
    @SuppressWarnings({"rawtypes", "unchecked"})
    protected TableDataInfo getDataTable2(List<?> list, List<?> list2) {
        TableDataInfo rspData = new TableDataInfo();
        rspData.setCode(HttpStatus.SUCCESS);
        rspData.setMsg("查询成功");
@@ -107,9 +109,8 @@
    /**
     * å“åº”批量保存数据
     */
    @SuppressWarnings({ "rawtypes", "unchecked" })
    protected TableDataInfo saveDataTable(List<?> list)
    {
    @SuppressWarnings({"rawtypes", "unchecked"})
    protected TableDataInfo saveDataTable(List<?> list) {
        TableDataInfo rspData = new TableDataInfo();
        rspData.setCode(HttpStatus.SUCCESS);
        rspData.setMsg("保存成功");
@@ -122,14 +123,13 @@
    /**
     * å“åº”请求分页数据
     */
    @SuppressWarnings({ "rawtypes", "unchecked" })
    protected TableDataInfo getCustomDataTable(List<?> list,Integer pageNum,Integer pageSize)
    {
        int size=list.size();
        int pageStart=pageNum==1?0:(pageNum-1)*pageSize;//截取的开始位置
        int pageEnd=size<pageNum*pageSize?size:pageNum*pageSize;//截取的结束位置
        if(size>pageStart){
            list =list.subList(pageStart, pageEnd);
    @SuppressWarnings({"rawtypes", "unchecked"})
    protected TableDataInfo getCustomDataTable(List<?> list, Integer pageNum, Integer pageSize) {
        int size = list.size();
        int pageStart = pageNum == 1 ? 0 : (pageNum - 1) * pageSize;//截取的开始位置
        int pageEnd = size < pageNum * pageSize ? size : pageNum * pageSize;//截取的结束位置
        if (size > pageStart) {
            list = list.subList(pageStart, pageEnd);
        }

        TableDataInfo rspData = new TableDataInfo();
@@ -143,94 +143,90 @@
    /**
     * è¿”回成功
     */
    public AjaxResult success()
    {
    public AjaxResult success() {
        return AjaxResult.success();
    }

    /**
     * è¿”回失败消息
     */
    public AjaxResult error()
    {
    public AjaxResult error() {
        return AjaxResult.error();
    }

    /**
     * è¿”回成功消息
     */
    public AjaxResult success(String message)
    {
    public AjaxResult success(String message) {
        return AjaxResult.success(message);
    }

    /**
     * è¿”回失败消息
     */
    public AjaxResult error(String message)
    {
    public AjaxResult error(String message) {
        return AjaxResult.error(message);
    }

    /**
     * å“åº”返回结果
     * 
     *
     * @param rows å½±å“è¡Œæ•°
     * @return æ“ä½œç»“æžœ
     */
    protected AjaxResult toAjax(int rows)
    {
    protected AjaxResult toAjax(int rows) {
        return rows > 0 ? AjaxResult.success() : AjaxResult.error();
    }

    /**
     * å“åº”返回结果
     * 
     *
     * @param result ç»“æžœ
     * @return æ“ä½œç»“æžœ
     */
    protected AjaxResult toAjax(boolean result)
    {
    protected AjaxResult toAjax(boolean result) {
        return result ? success() : error();
    }

    /**
     * é¡µé¢è·³è½¬
     */
    public String redirect(String url)
    {
    public String redirect(String url) {
        return StringUtils.format("redirect:{}", url);
    }

    /**
     * èŽ·å–用户缓存信息
     */
    public LoginUser getLoginUser()
    {
    public LoginUser getLoginUser() {
        return SecurityUtils.getLoginUser();
    }

    /**
     * èŽ·å–登录用户id
     */
    public Long getUserId()
    {
    public Long getUserId() {
        return getLoginUser().getUserId();
    }

    /**
     * èŽ·å–登录部门id
     */
    public Long getDeptId()
    {
    public Long getDeptId() {
        return getLoginUser().getDeptId();
    }

    /**
     * èŽ·å–登录用户名
     */
    public String getUsername()
    {
    public String getUsername() {
        return getLoginUser().getUsername();
    }

    /**
     * èŽ·å–当前登陆用户
     */
    public String getNickName() {
        return getLoginUser().getUser().getNickName();
    }
}

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/BaseEntity.java

@@ -9,12 +9,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableLogic;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * Entity基类
 * 
 *
 * @author ruoyi
 */
@Data
@@ -57,7 +58,24 @@
    /** çŠ¶æ€ï¼ˆ0正常 1删除） */
    @ApiModelProperty("状态（0正常 1删除）")
    @TableLogic
    private Integer del_flag;
    private Integer delFlag;

    /**
     * pageNum
     */
    @Excel(name = "pageNum")
    @ApiModelProperty(value = "pageNum")
    @TableField(exist = false)
    private Integer pageNum;

    /**
     * pageSize
     */
    @Excel(name = "pageSize")
    @ApiModelProperty(value = "pageSize")
    @TableField(exist = false)
    private Integer pageSize;


    /** è¯·æ±‚参数 */
    @ApiModelProperty("请求参数")

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -5,198 +5,183 @@
import javax.validation.constraints.Email;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.core.domain.BaseEntity;

/**
 * éƒ¨é—¨è¡¨ sys_dept
 * 
 *
 * @author ruoyi
 */
public class SysDept extends BaseEntity
{
public class SysDept extends BaseEntity {
    private static final long serialVersionUID = 1L;

    /** éƒ¨é—¨ID */
    /**
     * éƒ¨é—¨ID
     */
    private Long deptId;

    /** çˆ¶éƒ¨é—¨ID */
    /**
     * çˆ¶éƒ¨é—¨ID
     */
    private Long parentId;

    /** ç¥–级列表 */
    /**
     * ç¥–级列表
     */
    private String ancestors;

    /** éƒ¨é—¨åç§° */
    /**
     * éƒ¨é—¨åç§°
     */
    private String deptName;

    /** æ˜¾ç¤ºé¡ºåº */
    /**
     * æ˜¾ç¤ºé¡ºåº
     */
    private String orderNum;

    /** è´Ÿè´£äºº */
    /**
     * è´Ÿè´£äºº
     */
    private String leader;

    /** è”系电话 */
    /**
     * è”系电话
     */
    private String phone;

    /** é‚®ç®± */
    /**
     * é‚®ç®±
     */
    private String email;

    /** éƒ¨é—¨çŠ¶æ€:0正常,1停用 */
    /**
     * éƒ¨é—¨çŠ¶æ€:0正常,1停用
     */
    private String status;

    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;
    /**
     * åˆ é™¤æ ‡å¿—（0代表存在 2代表删除）
     */
    private Integer delFlag;

    /** çˆ¶éƒ¨é—¨åç§° */
    /**
     * çˆ¶éƒ¨é—¨åç§°
     */
    private String parentName;
    
    /** å­éƒ¨é—¨ */

    /**
     * å­éƒ¨é—¨
     */
    private List<SysDept> children = new ArrayList<SysDept>();

    public Long getDeptId()
    {
    public Long getDeptId() {
        return deptId;
    }

    public void setDeptId(Long deptId)
    {
    public void setDeptId(Long deptId) {
        this.deptId = deptId;
    }

    public Long getParentId()
    {
    public Long getParentId() {
        return parentId;
    }

    public void setParentId(Long parentId)
    {
    public void setParentId(Long parentId) {
        this.parentId = parentId;
    }

    public String getAncestors()
    {
    public String getAncestors() {
        return ancestors;
    }

    public void setAncestors(String ancestors)
    {
    public void setAncestors(String ancestors) {
        this.ancestors = ancestors;
    }

    @NotBlank(message = "部门名称不能为空")
    @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符")
    public String getDeptName()
    {
    public String getDeptName() {
        return deptName;
    }

    public void setDeptName(String deptName)
    {
    public void setDeptName(String deptName) {
        this.deptName = deptName;
    }

    @NotBlank(message = "显示顺序不能为空")
    public String getOrderNum()
    {
    public String getOrderNum() {
        return orderNum;
    }

    public void setOrderNum(String orderNum)
    {
    public void setOrderNum(String orderNum) {
        this.orderNum = orderNum;
    }

    public String getLeader()
    {
    public String getLeader() {
        return leader;
    }

    public void setLeader(String leader)
    {
    public void setLeader(String leader) {
        this.leader = leader;
    }

    @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符")
    public String getPhone()
    {
    public String getPhone() {
        return phone;
    }

    public void setPhone(String phone)
    {
    public void setPhone(String phone) {
        this.phone = phone;
    }

    @Email(message = "邮箱格式不正确")
    @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符")
    public String getEmail()
    {
    public String getEmail() {
        return email;
    }

    public void setEmail(String email)
    {
    public void setEmail(String email) {
        this.email = email;
    }

    public String getStatus()
    {
    public String getStatus() {
        return status;
    }

    public void setStatus(String status)
    {
    public void setStatus(String status) {
        this.status = status;
    }

    public String getDelFlag()
    {
    public Integer getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(String delFlag)
    {
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }

    public String getParentName()
    {
    public String getParentName() {
        return parentName;
    }

    public void setParentName(String parentName)
    {
    public void setParentName(String parentName) {
        this.parentName = parentName;
    }

    public List<SysDept> getChildren()
    {
    public List<SysDept> getChildren() {
        return children;
    }

    public void setChildren(List<SysDept> children)
    {
    public void setChildren(List<SysDept> children) {
        this.children = children;
    }

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
            .append("deptId", getDeptId())
            .append("parentId", getParentId())
            .append("ancestors", getAncestors())
            .append("deptName", getDeptName())
            .append("orderNum", getOrderNum())
            .append("leader", getLeader())
            .append("phone", getPhone())
            .append("email", getEmail())
            .append("status", getStatus())
            .append("delFlag", getDelFlag())
            .append("createBy", getCreateBy())
            .append("createTime", getCreateTime())
            .append("updateBy", getUpdateBy())
            .append("updateTime", getUpdateTime())
            .toString();
        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE).append("deptId", getDeptId()).append("parentId", getParentId()).append("ancestors", getAncestors()).append("deptName", getDeptName()).append("orderNum", getOrderNum()).append("leader", getLeader()).append("phone", getPhone()).append("email", getEmail()).append("status", getStatus()).append("delFlag", getDelFlag()).append("createBy", getCreateBy()).append("createTime", getCreateTime()).append("updateBy", getUpdateBy()).append("updateTime", getUpdateTime()).toString();
    }
}

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java

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

/**
 * è§’色表 sys_role
 * 
 *
 * @author ruoyi
 */
public class SysRole extends BaseEntity
@@ -48,7 +48,7 @@
    private String status;

    /** åˆ é™¤æ ‡å¿—（0代表存在 2代表删除） */
    private String delFlag;
    private Integer delFlag;

    /** ç”¨æˆ·æ˜¯å¦å­˜åœ¨æ­¤è§’色标识 é»˜è®¤ä¸å­˜åœ¨ */
    private boolean flag = false;
@@ -164,12 +164,12 @@
        this.status = status;
    }

    public String getDelFlag()
    public Integer getDelFlag()
    {
        return delFlag;
    }

    public void setDelFlag(String delFlag)
    public void setDelFlag(Integer delFlag)
    {
        this.delFlag = delFlag;
    }
@@ -203,7 +203,7 @@
    {
        this.deptIds = deptIds;
    }
    

    @Override
    public String toString() {
        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java

@@ -98,7 +98,7 @@
    /**
     * åˆ é™¤æ ‡å¿—（0代表存在 2代表删除）
     */
    private String delFlag;
    private Integer delFlag;

    /**
     * æœ€åŽç™»å½•IP
@@ -312,11 +312,11 @@
        this.status = status;
    }

    public String getDelFlag() {
    public Integer getDelFlag() {
        return delFlag;
    }

    public void setDelFlag(String delFlag) {
    public void setDelFlag(Integer delFlag) {
        this.delFlag = delFlag;
    }


 ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -25,8 +25,7 @@
 * @author ruoyi
 */
@EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
public class SecurityConfig extends WebSecurityConfigurerAdapter
{
public class SecurityConfig extends WebSecurityConfigurerAdapter {
    /**
     * è‡ªå®šä¹‰ç”¨æˆ·è®¤è¯é€»è¾‘
     */
@@ -60,6 +59,7 @@

    @Autowired
    private WxOpenIDAuthenticationSecurityConfig wxOpenIDAuthenticationSecurityConfig;

    /**
     * è§£å†³ æ— æ³•ç›´æŽ¥æ³¨å…¥ AuthenticationManager
     *
@@ -68,8 +68,7 @@
     */
    @Bean
    @Override
    public AuthenticationManager authenticationManagerBean() throws Exception
    {
    public AuthenticationManager authenticationManagerBean() throws Exception {
        return super.authenticationManagerBean();
    }

@@ -89,8 +88,7 @@
     * authenticated       |   ç”¨æˆ·ç™»å½•åŽå¯è®¿é—®
     */
    @Override
    protected void configure(HttpSecurity httpSecurity) throws Exception
    {
    protected void configure(HttpSecurity httpSecurity) throws Exception {
        httpSecurity
                //微信openid注入
                .apply(wxOpenIDAuthenticationSecurityConfig).and()
@@ -103,20 +101,20 @@
                // è¿‡æ»¤è¯·æ±‚
                .authorizeRequests()
                // å¯¹äºŽç™»å½•login æ³¨å†Œregister éªŒè¯ç captchaImage å…è®¸åŒ¿åè®¿é—®
                .antMatchers("/login","/openidlogin", "/register", "/captchaImage", "/getToken").anonymous()
                .antMatchers("/login", "/openidlogin", "/register", "/captchaImage", "/getToken").anonymous()
                .antMatchers(
                        HttpMethod.GET,
                        "/",
                        "/*.html",
                        "/**/*.html",
                        "/**/*.css",
                        "/**/*.js"
//                        "/profile/**"
                        "/**/*.js",
                        "/profile/**"
                ).permitAll()
//                .antMatchers("/swagger-ui.html").anonymous()
//                .antMatchers("/swagger-resources/**").anonymous()
//                .antMatchers("/webjars/**").anonymous()
//                .antMatchers("/*/api-docs").anonymous()
                .antMatchers("/swagger-ui.html").permitAll()
                .antMatchers("/swagger-resources/**").permitAll()
                .antMatchers("/webjars/**").permitAll()
                .antMatchers("/*/api-docs").permitAll()
//                .antMatchers("/druid/**").anonymous()
                // é™¤ä¸Šé¢å¤–的所有请求全部需要鉴权认证
                .anyRequest().authenticated()
@@ -134,8 +132,7 @@
     * å¼ºæ•£åˆ—哈希加密实现
     */
    @Bean
    public BCryptPasswordEncoder bCryptPasswordEncoder()
    {
    public BCryptPasswordEncoder bCryptPasswordEncoder() {
        return new BCryptPasswordEncoder();
    }

@@ -143,8 +140,7 @@
     * èº«ä»½è®¤è¯æŽ¥å£
     */
    @Override
    protected void configure(AuthenticationManagerBuilder auth) throws Exception
    {
    protected void configure(AuthenticationManagerBuilder auth) throws Exception {
        auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder());
    }
}

 ruoyi-generator/src/main/resources/vm/java/controller.java.vm

@@ -33,7 +33,7 @@
 * @author ${author}
 * @date ${datetime}
 */
@Api("${functionName}")
@Api(description = "${functionName}")
@RestController
@RequestMapping("/${moduleName}/${businessName}")
public class ${ClassName}Controller extends BaseController
@@ -46,7 +46,7 @@
     */
    @ApiOperation("查询${functionName}列表")
    // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:list')")
    @GetMapping("/list")
    @PostMapping("/list")
#if($table.crud || $table.sub)
    public TableDataInfo list(${ClassName} ${className})
    {
@@ -81,7 +81,7 @@
     */
    @ApiOperation("获取${functionName}详细信息")
    // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:query')")
    @GetMapping(value = "/{${pkColumn.javaField}}")
    @GetMapping(value = "/getInfo/{${pkColumn.javaField}}")
    public AjaxResult getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField})
    {
        return AjaxResult.success(${className}Service.getById(${pkColumn.javaField}));
@@ -93,7 +93,7 @@
    @ApiOperation("新增${functionName}")
    // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:add')")
    @Log(title = "${functionName}", businessType = BusinessType.INSERT)
    @PostMapping
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ${ClassName} ${className})
    {
@@ -106,7 +106,7 @@
    @ApiOperation("修改${functionName}")
    // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:edit')")
    @Log(title = "${functionName}", businessType = BusinessType.UPDATE)
    @PutMapping
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ${ClassName} ${className})
    {
@@ -119,7 +119,7 @@
    @ApiOperation("删除${functionName}")
    // @PreAuthorize("@ss.hasPermi('${permissionPrefix}:remove')")
    @Log(title = "${functionName}", businessType = BusinessType.DELETE)
    @DeleteMapping("/{${pkColumn.javaField}s}")
    @GetMapping("/remove/{${pkColumn.javaField}s}")
    public AjaxResult remove(@PathVariable ${pkColumn.javaType}[] ${pkColumn.javaField}s)
    {
        return toAjax(${className}Service.removeByIds(Arrays.asList(${pkColumn.javaField}s)));

 ruoyi-project/src/main/java/com/ruoyi/project/common/IdGeneratorUtils.java

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

public class IdGeneratorUtils {
    // æ—¶é—´æˆ³å·¦ç§»çš„位数（22位给计数器）
    private static final long TIMESTAMP_SHIFT = 22;
    private static final long COUNTER_BITS = 22L;
    private static final long MAX_COUNTER = (1L << COUNTER_BITS) - 1;

    private static long lastTimestamp = -1L;
    private static long counter = 0L;

    public synchronized static long nextId() {
        long timestamp = System.currentTimeMillis();

        if (timestamp < lastTimestamp) {
            throw new RuntimeException("Clock moved backwards");
        }

        if (timestamp == lastTimestamp) {
            counter = (counter + 1) & MAX_COUNTER;
            if (counter == 0) {
                // åŒä¸€æ¯«ç§’内计数器用完，等待下一毫秒
                timestamp = waitNextMillis(lastTimestamp);
            }
        } else {
            counter = 0L;
        }

        lastTimestamp = timestamp;

        return ((timestamp) << TIMESTAMP_SHIFT) | counter;
    }

    private static long waitNextMillis(long lastTimestamp) {
        long timestamp = System.currentTimeMillis();
        while (timestamp <= lastTimestamp) {
            timestamp = System.currentTimeMillis();
        }
        return timestamp;
    }

}

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

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

/**
 * æçŒ®é™„件对象 base_annextype
 * 
 *
 * @author ruoyi
 * @date 2023-11-10
 */
@@ -51,5 +51,11 @@
    @Excel(name = "序号")
    private Long seqno;

    /** æ¡ˆä¾‹ç¼–号 */
    @ApiModelProperty("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;


}


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

@@ -76,5 +76,9 @@
    @ApiModelProperty("附件类型")
    private Integer delFlag;

    /** æ¡ˆä¾‹ç¼–号 */
    @ApiModelProperty("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;
}


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

@@ -33,6 +33,14 @@
    private Long id;

    /**
     * æ¡ˆä¾‹ç¼–号
     */
    @ApiModelProperty("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;


    /**
     * å§“名
     */
    @ApiModelProperty("姓名")
@@ -52,6 +60,12 @@
    private Long idcardtype;

    /**
     * æ¡ˆä¾‹ä¸ŠæŠ¥ID
     */
    @ApiModelProperty("案例上报ID")
    private Long reportId;

    /**
     * è¯ä»¶å·ç 
     */
    @ApiModelProperty("证件号码")

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

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

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

import com.baomidou.mybatisplus.annotation.TableField;
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_donatebaseinfo_report
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Data
@ApiModel("捐献上报基础")
public class ServiceDonatebaseinfoReport 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("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;

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

    /**
     * æ€§åˆ« æ ¹æ®å­—å…¸sys_user_sex
     */
    @ApiModelProperty("性别 æ ¹æ®å­—å…¸sys_user_sex")
    @Excel(name = "性别 æ ¹æ®å­—å…¸sys_user_sex")
    private String 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("出生日期")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "出生日期", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date birthday;

    /**
     * è”系电话
     */
    @ApiModelProperty("联系电话")
    @Excel(name = "联系电话")
    private String phone;

    /**
     * å›½ç±
     */
    @ApiModelProperty("国籍")
    @Excel(name = "国籍")
    private String nationality;

    /**
     * ç±è´¯
     */
    @ApiModelProperty("籍贯")
    @Excel(name = "籍贯")
    private String nativeplace;

    /**
     * æ°‘族 æ ¹æ®å­—å…¸sys_nation
     */
    @ApiModelProperty("民族 æ ¹æ®å­—å…¸sys_nation")
    @Excel(name = "民族 æ ¹æ®å­—å…¸sys_nation")
    private String nation;

    /**
     * èŒä¸š æ ¹æ®å­—å…¸sys_occupation
     */
    @ApiModelProperty("职业 æ ¹æ®å­—å…¸sys_occupation")
    @Excel(name = "职业 æ ¹æ®å­—å…¸sys_occupation")
    private String occupation;

    /**
     * å­¦åŽ† æ ¹æ®å­—å…¸sys_education
     */
    @ApiModelProperty("学历 æ ¹æ®å­—å…¸sys_education")
    @Excel(name = "学历 æ ¹æ®å­—å…¸sys_education")
    private String education;

    /**
     * çŽ°ä½åœ°å€
     */
    @ApiModelProperty("现住地址")
    @Excel(name = "现住地址")
    private String residenceaddress;

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

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

    /**
     * æ‰€å±žè¡—道（镇）名称
     */
    @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;

    /**
     * æˆ·ç±åœ°å€
     */
    @ApiModelProperty("户籍地址")
    @Excel(name = "户籍地址")
    private String registeraddress;

    /**
     * æˆ·ç±åœ°å€çœç¼–号
     */
    @ApiModelProperty("户籍地址省编号")
    @Excel(name = "户籍地址省编号")
    private String registerprovince;

    /**
     * æˆ·ç±åœ°å€çœåç§°
     */
    @ApiModelProperty("户籍地址省名称")
    @Excel(name = "户籍地址省名称")
    private String registerprovincename;

    /**
     * å¸‚名称
     */
    @ApiModelProperty("市名称")
    @Excel(name = "市名称")
    private String registercityname;

    /**
     * æ‰€å±žè¡—道（镇）名称
     */
    @ApiModelProperty("所属街道（镇）名称")
    @Excel(name = "所属街道", readConverterExp = "镇=")
    private String registertownname;

    /**
     * ç¤¾åŒºï¼ˆæ‘）名称
     */
    @ApiModelProperty("社区（村）名称")
    @Excel(name = "社区", readConverterExp = "村=")
    private String registercommunityname;

    /**
     * æ²»ç–—医院名称
     */
    @ApiModelProperty("治疗医院名称")
    @Excel(name = "治疗医院名称")
    private String treatmenthospitalname;

    /**
     * æ²»ç–—科室名称
     */
    @ApiModelProperty("治疗科室名称")
    @Excel(name = "治疗科室名称")
    private String treatmentdeptname;

    /**
     * ç–¾ç—…诊断名称
     */
    @ApiModelProperty("疾病诊断名称")
    @Excel(name = "疾病诊断名称")
    private String diagnosisname;

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

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

    /**
     * ä¼ æŸ“病情况
     */
    @ApiModelProperty("传染病情况")
    @Excel(name = "传染病情况")
    private String infectious;

    /**
     * ä¼ æŸ“ç—… å…¶ä»–
     */
    @ApiModelProperty("传染病 å…¶ä»–")
    @Excel(name = "传染病 å…¶ä»–")
    private String infectiousOther;

    /**
     * ç—…人状况
     */
    @ApiModelProperty("病人状况")
    @Excel(name = "病人状况")
    private String patientstate;

    /**
     * æŠ¥å‘Šè€…编号
     */
    @ApiModelProperty("报告者编号")
    @Excel(name = "报告者编号")
    private String reporterno;

    /**
     * æŠ¥å‘Šè€…姓名
     */
    @ApiModelProperty("报告者姓名")
    @Excel(name = "报告者姓名")
    private String reportername;

    /**
     * æŠ¥å‘Šè€…联系电话
     */
    @ApiModelProperty("报告者联系电话")
    @Excel(name = "报告者联系电话")
    private String reporterphone;

    /**
     * æŠ¥å‘Šæ—¶é—´
     */
    @ApiModelProperty("报告时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "报告时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date reporttime;

    /**
     * æ˜¯å¦ ç»ˆæ­¢æ¡ˆä¾‹ï¼š0开启   1终止   é»˜è®¤ 0
     */
    @ApiModelProperty("是否 ç»ˆæ­¢æ¡ˆä¾‹ï¼š0开启   1终止   é»˜è®¤ 0")
    @Excel(name = "是否 ç»ˆæ­¢æ¡ˆä¾‹ï¼š0开启   1终止   é»˜è®¤ 0")
    private Integer terminationCase;

    /**
     * è”系人（协调员编号）
     */
    @ApiModelProperty("联系人（协调员）")
    @Excel(name = "联系人（协调员编号）", readConverterExp = "协=调员")
    private String userNo;

    /**
     * è”系人（协调员姓名）
     */
    @ApiModelProperty("联系人（协调员）")
    @Excel(name = "联系人（协调员姓名）", readConverterExp = "协=调员")
    private String userName;

    /**
     * è”系人（协调员姓名）
     */
    @ApiModelProperty("部门编号")
    @Excel(name = "部门编号", readConverterExp = "部门编号")
    private String deptNo;

    /**
     * éƒ¨é—¨åç§°
     */
    @ApiModelProperty("部门名称")
    @Excel(name = "部门名称", readConverterExp = "部门名称")
    private String deptName;

    /**
     * GSC评分
     */
    @ApiModelProperty("GSC评分")
    @Excel(name = "GSC评分", readConverterExp = "GSC评分")
    private String gscScore;

    /**
     * æ˜¯å¦éœ€è¦è½¬è¿ 1：不需要   2需要     é»˜è®¤1
     */
    @ApiModelProperty("是否需要转运 1：不需要   2需要     é»˜è®¤1")
    @Excel(name = "是否需要转运 1：不需要   2需要     é»˜è®¤1")
    private String isTransport;

    /**
     * ä¸ŠæŠ¥çŠ¶æ€ï¼š1已上报   2已阅读  3已同意   4  å·²é©³å›ž
     */
    @ApiModelProperty("上报状态：1已上报   2已阅读  3已同意   4  å·²é©³å›ž")
    @Excel(name = "上报状态：1已上报   2已阅读  3已同意   4  å·²é©³å›ž")
    private String reportStatus;

    /**
     * é™„件文件地址集合（用于接收前端传来的地址）
     * * [
     * * { name: "111", url: "http://localhost:8093/111/222" },
     * * { name: "222", url: "http://localhost:8093/111/222" },
     * * ];
     */
    @TableField(exist = false)
    @ApiModelProperty("附件文件地址集合")
    private List<ServiceDonatebaseinfoReportFile> annexfilesList;

    /**
     * è½¬è¿ä¿¡æ¯
     */
    @TableField(exist = false)
    @ApiModelProperty("转运信息")
    private List<ServiceTransport> serviceTransport;

}


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

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

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_donatebaseinfo_report_file
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Data
@ApiModel("案例上报附件")
public class ServiceDonatebaseinfoReportFile extends BaseEntity {
    private static final long serialVersionUID = 1L;

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

    /**
     * æ¡ˆä¾‹ä¸ŠæŠ¥id
     */
    @ApiModelProperty("案例上报id")
    @Excel(name = "案例上报id")
    private Long donatebaseinfoReportId;

    /**
     * æ¡ˆä¾‹ç¼–号
     */
    @ApiModelProperty("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;


    /** æ–‡ä»¶å */
    @ApiModelProperty("文件名")
    @Excel(name = "文件名")
    private String fileName;

    /**
     * ç±»åˆ«
     */
    @ApiModelProperty("类别")
    @Excel(name = "类别")
    private String type;

    /**
     * é™„件路径
     */
    @ApiModelProperty("附件路径")
    @Excel(name = "附件路径")
    private String path;

    /**
     * å¤‡æ³¨
     */
    @ApiModelProperty("备注")
    @Excel(name = "备注")
    private String remart;

}


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

@@ -229,11 +229,12 @@


    /**
     * ç§»æ¤äººæ‰€å±žåŒºåŸŸåç§°
     * æ¡ˆä¾‹ç¼–号
     */
    @ApiModelProperty("移植人所属区域名称")
    @Excel(name = "移植人所属区域名称")
    private String caseno;
    @ApiModelProperty("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;


    /**
     * ç§»æ¤äººæ‰€å±žåŒºåŸŸåç§°

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

@@ -1,7 +1,6 @@
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;
@@ -12,165 +11,124 @@
import lombok.Data;

/**
 * æçŒ®å™¨å®˜èŽ·å–对象 service_donationwitnessorgan
 * æ¡ˆä¾‹è¯„估器官对象 service_donationwitnessorgan
 *
 * @author ruoyi
 * @date 2023-12-25
 * @date 2025-12-15
 */
@Data
@ApiModel("捐献器官获取")
public class ServiceDonationwitnessorgan extends BaseEntity {
@ApiModel("案例评估器官")
public class ServiceDonationwitnessorgan 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;

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

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

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

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

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

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

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

    /**
     * ç¦»ä½“时间
     */
    @ApiModelProperty("离体时间")
    /** å™¨å®˜èŽ·å–时间 */
    @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 HH:mm:ss")
    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 organStartTime;

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

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

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

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

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

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

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

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

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

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

    /** å—体姓名 */
    @ApiModelProperty("受体姓名")
    @Excel(name = "受体姓名")
    private String name;

    /**
     * åŠŸèƒ½å»¶è¿Ÿæ€§æ¢å¤ï¼Œå‚见sys_0_1
     */
    @ApiModelProperty("功能延迟性恢复，参见sys_0_1")
    @Excel(name = "功能延迟性恢复，参见sys_0_1")
    private String caseno;
    /** å™¨å®˜èŽ·å–开始时间 */
    @ApiModelProperty("器官获取开始时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "器官获取开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date organStartTime;

}


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

@@ -180,12 +180,12 @@
    @ApiModelProperty("备注")
    @TableField(exist = false)
    private Boolean paymentidIsNotNull = true;

    /**
     * çŠ¶æ€ï¼ˆ0正常 1删除）
     */
    @ApiModelProperty("状态（0正常 1删除）")
    private Integer delFlag;
//
//    /**
//     * çŠ¶æ€ï¼ˆ0正常 1删除）
//     */
//    @ApiModelProperty("状态（0正常 1删除）")
//    private Integer delFlag;

}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,70 @@
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_ethicalreviewinitiate
 *
 * @author ruoyi
 * @date 2025-12-20
 */
@Data
@ApiModel("伦理审查发起")
public class ServiceEthicalreviewinitiate 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 caseNo;

    /** å‘起人 */
    @ApiModelProperty("发起人")
    @Excel(name = "发起人")
    private String initiatePerson;

    /** å‘起时间 */
    @ApiModelProperty("发起时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "发起时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date startTime;

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

    /** å‘起主题 */
    @ApiModelProperty("发起主题")
    @Excel(name = "发起主题")
    private String initiateTheme;

    /** æœ‰æ•ˆæˆªè‡³æ—¶é—´ */
    @ApiModelProperty("有效截至时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "有效截至时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date cutOffTime;

}


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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,62 +13,121 @@

/**
 * ä¼¦ç†å®¡æŸ¥ä¸“家意见对象 service_ethicalreviewopinions
 * 
 *
 * @author ruoyi
 * @date 2021-11-23
 */
@Data
@ApiModel("伦理审查专家意见")
public class ServiceEthicalreviewopinions extends BaseEntity
{
public class ServiceEthicalreviewopinions 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;

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

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

    /** ä¸“家意见 */
    /**
     * æ¡ˆä¾‹ç¼–号
     */
    @ApiModelProperty("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;

    /**
     * ä¸“家意见
     */
    @ApiModelProperty("专家意见")
    @Excel(name = "专家意见")
    private String expertopinion;

    /** ä¸“家结论  è§å­—å…¸ sys_0_1  */
    /**
     * ç§‘室编码
     */
    @ApiModelProperty("科室编码")
    @Excel(name = "科室编码")
    private String deptCode;

    /**
     * ç§‘室名称
     */
    @ApiModelProperty("科室名称")
    @Excel(name = "科室名称")
    private String deptName;

    /**
     * å™¨å®˜ç±»åž‹
     */
    @ApiModelProperty("器官类型")
    @Excel(name = "器官类型")
    private String organType;

    /**
     * ä¸“家结论  è§å­—å…¸ sys_0_1
     */
    @ApiModelProperty("专家结论  è§å­—å…¸ sys_0_1 ")
    @Excel(name = "专家结论  è§å­—å…¸ sys_0_1 ")
    private Long expertconclusion;

    /** ä¸“家名字 */
    /**
     * ä¸“家名字
     */
    @ApiModelProperty("专家名字")
    @Excel(name = "专家名字")
    private String expertname;

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

    /** ç»“论附件 å¯ç©º å¤šä¸ªç”¨;号隔开 */
    /**
     * ç»“论附件 å¯ç©º å¤šä¸ªç”¨;号隔开
     */
    @ApiModelProperty("结论附件 å¯ç©º å¤šä¸ªç”¨;号隔开")
    @Excel(name = "结论附件 å¯ç©º å¤šä¸ªç”¨;号隔开")
    private String conclusionannex;

    /** ç»“论顺序 */
    /**
     * ç»“论顺序
     */
    @ApiModelProperty("结论顺序")
    @Excel(name = "结论顺序")
    private Long conclusionorder;

    /**
     * å‘送方式
     */
    @ApiModelProperty("发送方式")
    @Excel(name = "发送方式")
    private String sendType;

    /**
     * æŽ¥æ”¶çŠ¶æ€
     */
    @ApiModelProperty("接收状态")
    @Excel(name = "接收状态")
    private String receiveStatus;

}


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

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

import java.util.Date;

import com.fasterxml.jackson.annotation.JsonFormat;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -12,107 +13,173 @@

/**
 * åŒ»å­¦è¯„估对象 service_medicalevaluation
 * 
 *
 * @author ruoyi
 * @date 2021-11-19
 */
@Data
@ApiModel("医学评估")
public class ServiceMedicalevaluation extends BaseEntity
{
public class ServiceMedicalevaluation 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 caseNo;

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

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

    /** ç–¾ç—…诊断名称 */
    /**
     * ç–¾ç—…诊断名称
     */
    @ApiModelProperty("疾病诊断名称")
    @Excel(name = "疾病诊断名称")
    private String diagnosisname;

    /** é™¢çº§è¯„估内容 */
    /**
     * é™¢çº§è¯„估内容
     */
    @ApiModelProperty("院级评估内容")
    @Excel(name = "院级评估内容")
    private String hospitalassesscontent;

    /** é™¢çº§è¯„估医生 */
    /**
     * é™¢çº§è¯„估医生
     */
    @ApiModelProperty("院级评估医生")
    @Excel(name = "院级评估医生")
    private String hospitalassessdoctor;

    /** é™¢çº§è¯„估时间 */
    @ApiModelProperty("院级评估时间")
    /**
     * é™¢çº§è¯„估时间
     */
    @ApiModelProperty("院级评估时间(不用了)")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "院级评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date hospitalassesstime;

    /** é™¢çº§è¯„估结论 */
    /**
     * é™¢çº§è¯„估结论
     */
    @ApiModelProperty("院级评估结论")
    @Excel(name = "院级评估结论")
    private String hospitalassessconclusion;

    /** çœçº§è¯„估内容 */
    /**
     * çœçº§è¯„估内容
     */
    @ApiModelProperty("省级评估内容")
    @Excel(name = "省级评估内容")
    private String provincialassesscontent;

    /** çœçº§è¯„估医生 */
    /**
     * çœçº§è¯„估医生
     */
    @ApiModelProperty("省级评估医生")
    @Excel(name = "省级评估医生")
    private String provincialassessdoctor;

    /** çœçº§è¯„估时间 */
    /**
     * çœçº§è¯„估时间
     */
    @ApiModelProperty("省级评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "省级评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date provincialassesstime;

    /** çœçº§è¯„估结论 */
    /**
     * çœçº§è¯„估结论
     */
    @ApiModelProperty("省级评估结论")
    @Excel(name = "省级评估结论")
    private String provincialassessconclusion;

    /** çœçº§è¯„估组核心成员评估内容 */
    /**
     * çœçº§è¯„估组核心成员评估内容
     */
    @ApiModelProperty("省级评估组核心成员评估内容")
    @Excel(name = "省级评估组核心成员评估内容")
    private String coreteamassesscontent;

    /** çœçº§è¯„估组核心成员评估医生 */
    /**
     * çœçº§è¯„估组核心成员评估医生
     */
    @ApiModelProperty("省级评估组核心成员评估医生")
    @Excel(name = "省级评估组核心成员评估医生")
    private String coreteamassessdoctor;

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

    /** çœçº§è¯„估组核心成员结论 */
    /**
     * çœçº§è¯„估组核心成员结论
     */
    @ApiModelProperty("省级评估组核心成员结论")
    @Excel(name = "省级评估组核心成员结论")
    private String coreteamassessconclusion;

    /** è¯„估附件 */
    /**
     * è¯„估附件
     */
    @ApiModelProperty("评估附件")
    private String assessannex;

    /**
     * è¯„估状态：   é¦–次：1.评估通过  2评估不通过         æœ€ç»ˆï¼š3.评估通过  4评估不通过
     */
    @ApiModelProperty("评估状态：   é¦–次：1.评估通过  2评估不通过         æœ€ç»ˆï¼š3.评估通过  4评估不通过")
    private String assessState;


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

    /**
     * äºŒæ¬¡è¯„估时间
     */
    @ApiModelProperty("二次评估时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "二次评估时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date assessSecondTime;


}


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,154 @@
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_medicalevaluationorgan
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Data
@ApiModel("捐献器官评估")
public class ServiceMedicalevaluationorgan 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;

    /**
     * å™¨å®˜è¯„估状态 ï¼š1：可用，2：不可用
     */
    @ApiModelProperty("器官评估状态 ï¼š1：可用，2：不可用")
    @Excel(name = "器官评估状态 ï¼š1：可用，2：不可用")
    private String organState;

    /**
     * ä¸å¯ç”¨åŽŸå› 
     */
    @ApiModelProperty("不可用原因")
    @Excel(name = "不可用原因")
    private String notgetreason;

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

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

    /**
     * å™¨å®˜èŽ·å–机构编号 å¯¹åº”机构表
     */
    @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/ServiceReimbursementShared.java

@@ -339,7 +339,7 @@
    private Long reimid;

    @ApiModelProperty("删除标识")
    private Long delFlag;
    private Integer delFlag;

    @ApiModelProperty("捐献家属银行")
    private String donorbank;

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

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

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

import com.baomidou.mybatisplus.annotation.TableField;
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_transport
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Data
@ApiModel("供者转运登记")
public class ServiceTransport 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("案例编号")
    @Excel(name = "案例编号")
    private Long reportId;

    /**
     * æ¡ˆä¾‹ç¼–号
     */
    @ApiModelProperty("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;

    /**
     * æ‚£è€…姓名
     */
    @ApiModelProperty("患者姓名")
    @Excel(name = "患者姓名")
    private String patName;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "患者姓名")
    private String sex;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("$column.columnComment")
    @Excel(name = "患者姓名")
    private Long age;

    /**
     * ç–¾ç—…诊断名称
     */
    @ApiModelProperty("疾病诊断名称")
    @Excel(name = "疾病诊断名称")
    private String diagnosisname;

    /**
     * æ²»ç–—医院名称
     */
    @ApiModelProperty("治疗医院名称")
    @Excel(name = "治疗医院名称")
    private String treatmentHospitalName;

    /**
     * æ²»ç–—科室名称
     */
    @ApiModelProperty("治疗科室名称")
    @Excel(name = "治疗科室名称")
    private String treatmentDeptName;

    /**
     * å‡ºå‘时间
     */
    @ApiModelProperty("出发时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "出发时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
    private Date transportStartTime;

    /**
     * å‡ºå‘地点
     */
    @ApiModelProperty("出发地点")
    @Excel(name = "出发地点")
    private String transportStartPlace;

    /**
     * è”系人（协调员）
     */
    @ApiModelProperty("联系人（协调员）")
    @Excel(name = "联系人", readConverterExp = "协调员")
    private String contactPerson;

    /**
     * æ€¥è¯Šç§‘医生
     */
    @ApiModelProperty("急诊科医生")
    @Excel(name = "急诊科医生")
    private String doctor;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("急诊科医生手机号")
    @Excel(name = "急诊科医生手机号")
    private String doctorPhone;

    /**
     * æŠ¤å£«
     */
    @ApiModelProperty("护士")
    @Excel(name = "护士")
    private String nurse;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("护士手机号")
    @Excel(name = "护士手机号")
    private String nursePhone;

    /**
     * é©¾é©¶å‘˜
     */
    @ApiModelProperty("驾驶员")
    @Excel(name = "驾驶员")
    private String driver;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("驾驶员手机号")
    @Excel(name = "驾驶员手机号")
    private String driverPhone;

    /**
     * ICU评估医生
     */
    @ApiModelProperty("ICU评估医生")
    @Excel(name = "ICU评估医生")
    private String icuDoctor;

    /**
     * $column.columnComment
     */
    @ApiModelProperty("ICU评估医生手机号")
    @Excel(name = "ICU评估医生手机号")
    private String icuDoctorPhone;

    /**
     * è½¬è¿çŠ¶æ€ï¼š1待转运   2转运中   3转运完成  4转运取消  5暂存
     */
    @ApiModelProperty("转运状态：1待转运   2转运中   3转运完成  4转运取消  5暂存 ")
    @Excel(name = "转运状态")
    private Long transitStatus;

    /**
     * å¤‡æ³¨
     */
    @ApiModelProperty("备注")
    @Excel(name = "备注")
    private String remark;

    /**
     * é™„件文件地址集合（用于接收前端传来的地址）
     * [
     * { name: "111", url: "http://localhost:8093/111/222" },
     * { name: "222", url: "http://localhost:8093/111/222" },
     * ];
     */
    @TableField(exist = false)
    @ApiModelProperty("附件文件地址集合")
    private List<ServiceTransportFile> annexfilesList;
}


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

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

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_transport_file
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Data
@ApiModel("供者转运登记附件")
public class ServiceTransportFile extends BaseEntity
{
    private static final long serialVersionUID = 1L;

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

    /** è½¬è¿ID */
    @ApiModelProperty("转运ID")
    @Excel(name = "转运ID")
    private Long transportId;

    /** ç±»åˆ« */
    @ApiModelProperty("类别")
    @Excel(name = "类别")
    private String type;

    /** æ–‡ä»¶å */
    @ApiModelProperty("文件名")
    @Excel(name = "文件名")
    private String fileName;

    /** é™„件路径 */
    @ApiModelProperty("附件路径")
    @Excel(name = "附件路径")
    private String path;

    /** å¤‡æ³¨ */
    @ApiModelProperty("备注")
    @Excel(name = "备注")
    private String remart;

    /** æ¡ˆä¾‹ç¼–号 */
    @ApiModelProperty("案例编号")
    @Excel(name = "案例编号")
    private String caseNo;

}


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

@@ -57,12 +57,6 @@
    /**
     * é™„件类型
     */
    @ApiModelProperty("器官医学支持成本")
    @Excel(name = "器官医学支持成本")
    private String delFlag;
    /**
     * é™„件类型
     */
    @ApiModelProperty("案例专家费金额（元）")
    @Excel(name = "案例专家费金额（元）")
    private String delFlag2;

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

@@ -549,7 +549,7 @@
    private Long fcid;

    @ApiModelProperty("delFlag")
    private Long delFlag;
    private Integer delFlag;

    /**
     * ä¸“家意见
@@ -603,4 +603,17 @@
    @TableField(exist = false)
    private String basecreateby;

    /**
     * å‘送方式
     */
    @ApiModelProperty("发送方式")
    @Excel(name = "发送方式")
    private String sendType;

    /**
     * æŽ¥æ”¶çŠ¶æ€
     */
    @ApiModelProperty("接收状态")
    @Excel(name = "接收状态")
    private String receiveStatus;
}

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

@@ -19,6 +19,7 @@
    private String city;

    private String reporterno;
    private String caseNo;
    //器官移植状态 ï¼š0：未移植；1：已移植，2：弃用
    private Integer transplantstate = null;


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

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


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

import java.util.List;

/**
 * æ¡ˆä¾‹ä¸ŠæŠ¥é™„件Mapper接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Mapper
public interface ServiceDonatebaseinfoReportFileMapper extends BaseMapper<ServiceDonatebaseinfoReportFile>
{
    /**
     * æŸ¥è¯¢æ¡ˆä¾‹ä¸ŠæŠ¥é™„件列表
     *
     * @param serviceDonatebaseinfoReportFile æ¡ˆä¾‹ä¸ŠæŠ¥é™„件
     * @return æ¡ˆä¾‹ä¸ŠæŠ¥é™„件集合
     */
    public List<ServiceDonatebaseinfoReportFile> selectServiceDonatebaseinfoReportFileList(ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile);
}

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

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


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

import java.util.List;

/**
 * æçŒ®ä¸ŠæŠ¥åŸºç¡€Mapper接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Mapper
public interface ServiceDonatebaseinfoReportMapper extends BaseMapper<ServiceDonatebaseinfoReport>
{
    /**
     * æŸ¥è¯¢æçŒ®ä¸ŠæŠ¥åŸºç¡€åˆ—表
     *
     * @param serviceDonatebaseinfoReport æçŒ®ä¸ŠæŠ¥åŸºç¡€
     * @return æçŒ®ä¸ŠæŠ¥åŸºç¡€é›†åˆ
     */
    public List<ServiceDonatebaseinfoReport> selectServiceDonatebaseinfoReportList(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport);
}

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

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


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

import java.util.List;

/**
 * ä¼¦ç†å®¡æŸ¥å‘èµ·Mapper接口
 *
 * @author ruoyi
 * @date 2025-12-20
 */
@Mapper
public interface ServiceEthicalreviewinitiateMapper extends BaseMapper<ServiceEthicalreviewinitiate> {
    /**
     * æŸ¥è¯¢ä¼¦ç†å®¡æŸ¥å‘起列表
     *
     * @param serviceEthicalreviewinitiate ä¼¦ç†å®¡æŸ¥å‘èµ·
     * @return ä¼¦ç†å®¡æŸ¥å‘起集合
     */
    public List<ServiceEthicalreviewinitiate> selectServiceEthicalreviewinitiateList(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate);
}

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

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


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

import java.util.List;

/**
 * æçŒ®å™¨å®˜è¯„ä¼°Mapper接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Mapper
public interface ServiceMedicalevaluationorganMapper extends BaseMapper<ServiceMedicalevaluationorgan>
{
    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜è¯„估列表
     *
     * @param serviceMedicalevaluationorgan æçŒ®å™¨å®˜è¯„ä¼°
     * @return æçŒ®å™¨å®˜è¯„估集合
     */
    public List<ServiceMedicalevaluationorgan> selectServiceMedicalevaluationorganList(ServiceMedicalevaluationorgan serviceMedicalevaluationorgan);
}

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

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


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

import java.util.List;

/**
 * ä¾›è€…转运登记附件Mapper接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Mapper
public interface ServiceTransportFileMapper extends BaseMapper<ServiceTransportFile>
{
    /**
     * æŸ¥è¯¢ä¾›è€…转运登记附件列表
     *
     * @param serviceTransportFile ä¾›è€…转运登记附件
     * @return ä¾›è€…转运登记附件集合
     */
    public List<ServiceTransportFile> selectServiceTransportFileList(ServiceTransportFile serviceTransportFile);
}

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

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


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

import java.util.List;

/**
 * ä¾›è€…转运登记Mapper接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Mapper
public interface ServiceTransportMapper extends BaseMapper<ServiceTransport>
{
    /**
     * æŸ¥è¯¢ä¾›è€…转运登记列表
     *
     * @param serviceTransport ä¾›è€…转运登记
     * @return ä¾›è€…转运登记集合
     */
    public List<ServiceTransport> selectServiceTransportList(ServiceTransport serviceTransport);
}

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

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

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

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

/**
 * æ¡ˆä¾‹ä¸ŠæŠ¥é™„件Service接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
public interface IServiceDonatebaseinfoReportFileService extends IService<ServiceDonatebaseinfoReportFile> {

    /**
     * æŸ¥è¯¢æ¡ˆä¾‹ä¸ŠæŠ¥é™„件列表
     *
     * @param serviceDonatebaseinfoReportFile æ¡ˆä¾‹ä¸ŠæŠ¥é™„件
     * @return æ¡ˆä¾‹ä¸ŠæŠ¥é™„件集合
     */
    public List<ServiceDonatebaseinfoReportFile> queryList(ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile);

    //批量上传
    public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String updateName);

    public Boolean updateList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles, Long reportId,String caseNo,String updateName);
}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;

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

/**
 * æçŒ®ä¸ŠæŠ¥åŸºç¡€Service接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
public interface IServiceDonatebaseinfoReportService extends IService<ServiceDonatebaseinfoReport> {

    /**
     * æŸ¥è¯¢æçŒ®ä¸ŠæŠ¥åŸºç¡€åˆ—表
     *
     * @param serviceDonatebaseinfoReport æçŒ®ä¸ŠæŠ¥åŸºç¡€
     * @return æçŒ®ä¸ŠæŠ¥åŸºç¡€é›†åˆ
     */
    public Page<ServiceDonatebaseinfoReport> queryList(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport);

    /**
     * èŽ·å–总数
     *
     * @param serviceDonatebaseinfoReport æçŒ®ä¸ŠæŠ¥åŸºç¡€
     * @return æçŒ®ä¸ŠæŠ¥åŸºç¡€é›†åˆ
     */
    public Map<String,Object> getTotal(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport, String type);
}

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

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

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

import java.util.List;

/**
 * ä¼¦ç†å®¡æŸ¥å‘èµ·Service接口
 *
 * @author ruoyi
 * @date 2025-12-20
 */
public interface IServiceEthicalreviewinitiateService extends IService<ServiceEthicalreviewinitiate>
{

    /**
     * æŸ¥è¯¢ä¼¦ç†å®¡æŸ¥å‘起列表
     *
     * @param serviceEthicalreviewinitiate ä¼¦ç†å®¡æŸ¥å‘èµ·
     * @return ä¼¦ç†å®¡æŸ¥å‘起集合
     */
    public List<ServiceEthicalreviewinitiate> queryList(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate);
}

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

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

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

import java.util.List;

/**
 * æçŒ®å™¨å®˜è¯„ä¼°Service接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
public interface IServiceMedicalevaluationorganService extends IService<ServiceMedicalevaluationorgan>
{

    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜è¯„估列表
     *
     * @param serviceMedicalevaluationorgan æçŒ®å™¨å®˜è¯„ä¼°
     * @return æçŒ®å™¨å®˜è¯„估集合
     */
    public List<ServiceMedicalevaluationorgan> queryList(ServiceMedicalevaluationorgan serviceMedicalevaluationorgan);
}

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

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

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

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

/**
 * ä¾›è€…转运登记附件Service接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
public interface IServiceTransportFileService extends IService<ServiceTransportFile>
{

    /**
     * æŸ¥è¯¢ä¾›è€…转运登记附件列表
     *
     * @param serviceTransportFile ä¾›è€…转运登记附件
     * @return ä¾›è€…转运登记附件集合
     */
    public List<ServiceTransportFile> queryList(ServiceTransportFile serviceTransportFile);

    public Boolean addList(List<ServiceTransportFile> annexfilesList, Long transportId,String caseNo,String updateName);

    public Boolean updateList(List<ServiceTransportFile> annexfilesList,Long reportId,String caseNo,String updateName);
}

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

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

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.project.domain.ServiceTransport;

import java.util.List;

/**
 * ä¾›è€…转运登记Service接口
 *
 * @author ruoyi
 * @date 2025-12-15
 */
public interface IServiceTransportService extends IService<ServiceTransport>
{

    /**
     * æŸ¥è¯¢ä¾›è€…转运登记列表
     *
     * @param serviceTransport ä¾›è€…转运登记
     * @return ä¾›è€…转运登记集合
     */
    public Page<ServiceTransport> queryList(ServiceTransport serviceTransport);

    /**
     * æŸ¥è¯¢ä¾›è€…转运登记列表
     *
     * @param serviceTransport ä¾›è€…转运登记
     * @return ä¾›è€…转运登记集合
     */
    public List<ServiceTransport> queryListData(ServiceTransport serviceTransport);
}

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

@@ -13,38 +13,40 @@

/**
 * æçŒ®é™„件Service业务层处理
 * 
 *
 * @author ruoyi
 * @date 2023-11-10
 */
@Service
public class BaseAnnextypeServiceImpl extends ServiceImpl<BaseAnnextypeMapper, BaseAnnextype> implements IBaseAnnextypeService
{
public class BaseAnnextypeServiceImpl extends ServiceImpl<BaseAnnextypeMapper, BaseAnnextype> implements IBaseAnnextypeService {


    /**
     * æŸ¥è¯¢æçŒ®é™„件列表
     * 
     *
     * @param baseAnnextype æçŒ®é™„件
     * @return æçŒ®é™„件
     */
    @Override
    public List<BaseAnnextype> queryList(BaseAnnextype baseAnnextype) {
        LambdaQueryWrapper<BaseAnnextype> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(baseAnnextype.getDonationcategory())){
            wrappers.eq(BaseAnnextype::getDonationcategory ,baseAnnextype.getDonationcategory());
        if (StringUtils.isNotBlank(baseAnnextype.getDonationcategory())) {
            wrappers.eq(BaseAnnextype::getDonationcategory, baseAnnextype.getDonationcategory());
        }
        if (StringUtils.isNotBlank(baseAnnextype.getAnnextype())){
            wrappers.eq(BaseAnnextype::getAnnextype ,baseAnnextype.getAnnextype());
        if (StringUtils.isNotBlank(baseAnnextype.getAnnextype())) {
            wrappers.eq(BaseAnnextype::getAnnextype, baseAnnextype.getAnnextype());
        }
        if (StringUtils.isNotBlank(baseAnnextype.getAnnexname())){
            wrappers.like(BaseAnnextype::getAnnexname ,baseAnnextype.getAnnexname());
        if (StringUtils.isNotBlank(baseAnnextype.getAnnexname())) {
            wrappers.like(BaseAnnextype::getAnnexname, baseAnnextype.getAnnexname());
        }
        if (baseAnnextype.getNeed() != null){
            wrappers.eq(BaseAnnextype::getNeed ,baseAnnextype.getNeed());
        if (baseAnnextype.getNeed() != null) {
            wrappers.eq(BaseAnnextype::getNeed, baseAnnextype.getNeed());
        }
        if (baseAnnextype.getSeqno() != null){
            wrappers.eq(BaseAnnextype::getSeqno ,baseAnnextype.getSeqno());
        if (baseAnnextype.getSeqno() != null) {
            wrappers.eq(BaseAnnextype::getSeqno, baseAnnextype.getSeqno());
        }
        if (StringUtils.isNotBlank(baseAnnextype.getCaseNo())) {
            wrappers.eq(BaseAnnextype::getCaseNo, baseAnnextype.getCaseNo());
        }
        return this.list(wrappers);
    }

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

@@ -53,6 +53,9 @@
        if (serviceDonateannex.getInfoid() != null) {
            wrappers.eq(ServiceDonateannex::getInfoid, serviceDonateannex.getInfoid());
        }
        if (serviceDonateannex.getCaseNo() != null) {
            wrappers.eq(ServiceDonateannex::getCaseNo, serviceDonateannex.getCaseNo());
        }
        if (StringUtils.isNotBlank(serviceDonateannex.getDonorno())) {
            wrappers.eq(ServiceDonateannex::getDonorno, serviceDonateannex.getDonorno());
        }

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoReportFileMapper;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * æ¡ˆä¾‹ä¸ŠæŠ¥é™„件Service业务层处理
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Service
public class ServiceDonatebaseinfoReportFileServiceImpl extends ServiceImpl<ServiceDonatebaseinfoReportFileMapper, ServiceDonatebaseinfoReportFile> implements IServiceDonatebaseinfoReportFileService {


    /**
     * æŸ¥è¯¢æ¡ˆä¾‹ä¸ŠæŠ¥é™„件列表
     *
     * @param serviceDonatebaseinfoReportFile æ¡ˆä¾‹ä¸ŠæŠ¥é™„件
     * @return æ¡ˆä¾‹ä¸ŠæŠ¥é™„件
     */
    @Override
    public List<ServiceDonatebaseinfoReportFile> queryList(ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile) {
        LambdaQueryWrapper<ServiceDonatebaseinfoReportFile> wrappers = Wrappers.lambdaQuery();
        if (serviceDonatebaseinfoReportFile.getDonatebaseinfoReportId() != null) {
            wrappers.eq(ServiceDonatebaseinfoReportFile::getDonatebaseinfoReportId, serviceDonatebaseinfoReportFile.getDonatebaseinfoReportId());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReportFile.getFileName())) {
            wrappers.eq(ServiceDonatebaseinfoReportFile::getFileName, serviceDonatebaseinfoReportFile.getFileName());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReportFile.getType())) {
            wrappers.eq(ServiceDonatebaseinfoReportFile::getType, serviceDonatebaseinfoReportFile.getType());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReportFile.getPath())) {
            wrappers.eq(ServiceDonatebaseinfoReportFile::getPath, serviceDonatebaseinfoReportFile.getPath());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReportFile.getRemart())) {
            wrappers.eq(ServiceDonatebaseinfoReportFile::getRemart, serviceDonatebaseinfoReportFile.getRemart());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReportFile.getCaseNo())) {
            wrappers.eq(ServiceDonatebaseinfoReportFile::getCaseNo, serviceDonatebaseinfoReportFile.getCaseNo());
        }
        return this.list(wrappers);
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean addList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles,String caseNo,String createName) {
        boolean save = false;
        if (CollectionUtils.isNotEmpty(serviceDonatebaseinfoReportFiles)) {
            for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
                serviceDonatebaseinfoReportFile.setCreateTime(new Date());
                serviceDonatebaseinfoReportFile.setCreateBy(createName);
                serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
                serviceDonatebaseinfoReportFile.setCreateTime(new Date());
                save = save(serviceDonatebaseinfoReportFile);
            }
        }
        return save;
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean updateList(List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles, Long reportId,String caseNo,String updateName) {
        // å…ˆå°†æ•°æ®æŸ¥å‡ºæ¥
        List<ServiceDonatebaseinfoReportFile> list = list(new LambdaQueryWrapper<ServiceDonatebaseinfoReportFile>().eq(ServiceDonatebaseinfoReportFile::getDonatebaseinfoReportId, reportId));

        // æå–现有记录的路径集合，用于高效比较
        Set<String> existingPaths = list.stream().map(file -> StringUtils.isNotEmpty(file.getFileName()) ? file.getFileName().trim() : "").filter(StringUtils::isNotEmpty).collect(Collectors.toSet());

        // æå–待处理路径集合
        Set<String> newPathSet = serviceDonatebaseinfoReportFiles.stream().map(serviceDonatebaseinfoReportFile -> StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) ? serviceDonatebaseinfoReportFile.getFileName().trim() : "").filter(StringUtils::isNotEmpty).collect(Collectors.toSet());

        boolean result = true;

        // æ ‡è®°éœ€è¦åˆ é™¤çš„记录（存在于数据库但不在新列表中）
        for (ServiceDonatebaseinfoReportFile file : list) {
            if (StringUtils.isNotEmpty(file.getPath()) && !newPathSet.contains(file.getPath().trim())) {
                file.setDelFlag(1);
                file.setUpdateTime(new Date());
                file.setUpdateBy(updateName);
                result &= updateById(file);
            }
        }

        // æ·»åŠ æ–°çš„记录
        for (ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile : serviceDonatebaseinfoReportFiles) {
            if (StringUtils.isNotEmpty(serviceDonatebaseinfoReportFile.getFileName()) && !existingPaths.contains(serviceDonatebaseinfoReportFile.getFileName().trim())) {
                serviceDonatebaseinfoReportFile.setUpdateBy(updateName);
                serviceDonatebaseinfoReportFile.setUpdateTime(new Date());
                serviceDonatebaseinfoReportFile.setCaseNo(caseNo);
                result &= save(serviceDonatebaseinfoReportFile);
            }
        }

        return result;
    }
}

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,255 @@
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.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.common.CalculateDateUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.mapper.ServiceDonatebaseinfoReportMapper;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportFileService;
import com.ruoyi.project.service.IServiceDonatebaseinfoReportService;
import com.ruoyi.project.service.IServiceTransportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

/**
 * æçŒ®ä¸ŠæŠ¥åŸºç¡€Service业务层处理
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Service
public class ServiceDonatebaseinfoReportServiceImpl extends ServiceImpl<ServiceDonatebaseinfoReportMapper, ServiceDonatebaseinfoReport> implements IServiceDonatebaseinfoReportService {
    @Autowired
    private IServiceDonatebaseinfoReportFileService serviceDonatebaseinfoReportFileService;
    @Autowired
    private IServiceTransportService serviceTransportService;

    @Autowired
    private ServiceDonatebaseinfoReportMapper serviceDonatebaseinfoReportMapper;

    /**
     * æŸ¥è¯¢æçŒ®ä¸ŠæŠ¥åŸºç¡€åˆ—表
     *
     * @param serviceDonatebaseinfoReport æçŒ®ä¸ŠæŠ¥åŸºç¡€
     * @return æçŒ®ä¸ŠæŠ¥åŸºç¡€
     */
    @Override
    public Page<ServiceDonatebaseinfoReport> queryList(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = getWrapper(serviceDonatebaseinfoReport);
        // åˆ›å»ºåˆ†é¡µå¯¹è±¡ï¼Œè®¾ç½®é¡µç å’Œæ¯é¡µå¤§å°
        int currentPage = (serviceDonatebaseinfoReport.getPageNum() == null || serviceDonatebaseinfoReport.getPageNum() < 1) ? 1 : serviceDonatebaseinfoReport.getPageNum();
        int size = (serviceDonatebaseinfoReport.getPageSize() == null || serviceDonatebaseinfoReport.getPageSize() < 1) ? 10 : serviceDonatebaseinfoReport.getPageSize();
        Page<ServiceDonatebaseinfoReport> page = new Page<>(currentPage, size);

        List<ServiceDonatebaseinfoReport> serviceDonatebaseinfoReportPage = serviceDonatebaseinfoReportMapper.selectPage(page, wrappers).getRecords();
        for (ServiceDonatebaseinfoReport serviceDonatebaseinfoReport1 : serviceDonatebaseinfoReportPage) {
            ServiceDonatebaseinfoReportFile serviceDonatebaseinfoReportFile = new ServiceDonatebaseinfoReportFile();
            serviceDonatebaseinfoReportFile.setDonatebaseinfoReportId(serviceDonatebaseinfoReport1.getId());
            serviceDonatebaseinfoReportFile.setCaseNo(serviceDonatebaseinfoReport1.getCaseNo());
            serviceDonatebaseinfoReportFile.setDelFlag(0);
            List<ServiceDonatebaseinfoReportFile> serviceDonatebaseinfoReportFiles = serviceDonatebaseinfoReportFileService.queryList(serviceDonatebaseinfoReportFile);
            serviceDonatebaseinfoReport1.setAnnexfilesList(serviceDonatebaseinfoReportFiles);

            //查询转运信息
            ServiceTransport serviceTransport = new ServiceTransport();
            serviceTransport.setCaseNo(serviceDonatebaseinfoReport1.getCaseNo());
            serviceTransport.setReportId(serviceDonatebaseinfoReport1.getId());
            serviceTransport.setDelFlag(0);
            List<ServiceTransport> serviceTransports = serviceTransportService.queryListData(serviceTransport);
            serviceDonatebaseinfoReport1.setServiceTransport(serviceTransports);

//            //计算年龄
//            if (serviceDonatebaseinfoReport1.getBirthday() != null) {
//                Map<String, String> map = CalculateDateUtils.calculateAge(serviceDonatebaseinfoReport1.getBirthday().toInstant().atZone(ZoneId.systemDefault()).toLocalDate(), LocalDate.now());
//                serviceDonatebaseinfoReport1.setAge(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age")) ? Long.valueOf(map.get("age")) : null);
//                serviceDonatebaseinfoReport1.setAgeunit(map.get("ageUnit"));
//                // serviceDonatebaseinfoReport1.setAge2(org.apache.commons.lang3.ObjectUtils.isNotEmpty(map.get("age2")) ? Long.valueOf(map.get("age2")) : null);
//                // serviceDonatebaseinfoReport1.setAgeunit2(map.get("ageUnit2"));
//            }
        }
        page.setRecords(serviceDonatebaseinfoReportPage);
        return page;
    }

    @Override
    public Map<String, Object> getTotal(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport, String type) {
        Map<String, Object> map = new HashMap<>();
        Integer all = 0;
        if (StringUtils.isNotEmpty(type)) {
            List<String> list = Arrays.asList(type.split(","));
            for (String status : list) {
                serviceDonatebaseinfoReport.setReportStatus(status);
                serviceDonatebaseinfoReport.setDelFlag(0);
                List<ServiceDonatebaseinfoReport> list1 = this.list(getWrapper(serviceDonatebaseinfoReport));
                //单个状态的总数
                map.put(status, list1.size());
                all += list1.size();
            }
        }
        //所有状态的总数
        map.put("all", all);
        return map;
    }

    private LambdaQueryWrapper<ServiceDonatebaseinfoReport> getWrapper(ServiceDonatebaseinfoReport serviceDonatebaseinfoReport) {
        LambdaQueryWrapper<ServiceDonatebaseinfoReport> wrappers = Wrappers.lambdaQuery();
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getCaseNo())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getCaseNo, serviceDonatebaseinfoReport.getCaseNo());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getName())) {
            wrappers.like(ServiceDonatebaseinfoReport::getName, serviceDonatebaseinfoReport.getName());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getSex())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getSex, serviceDonatebaseinfoReport.getSex());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getReportStatus())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getReportStatus, serviceDonatebaseinfoReport.getReportStatus());
        }
        if (serviceDonatebaseinfoReport.getIdcardtype() != null) {
            wrappers.eq(ServiceDonatebaseinfoReport::getIdcardtype, serviceDonatebaseinfoReport.getIdcardtype());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getIdcardno())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getIdcardno, serviceDonatebaseinfoReport.getIdcardno());
        }
        if (serviceDonatebaseinfoReport.getAge() != null) {
            wrappers.eq(ServiceDonatebaseinfoReport::getAge, serviceDonatebaseinfoReport.getAge());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getAgeunit())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getAgeunit, serviceDonatebaseinfoReport.getAgeunit());
        }
        if (serviceDonatebaseinfoReport.getBirthday() != null) {
            wrappers.eq(ServiceDonatebaseinfoReport::getBirthday, serviceDonatebaseinfoReport.getBirthday());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getPhone())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getPhone, serviceDonatebaseinfoReport.getPhone());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNationality())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getNationality, serviceDonatebaseinfoReport.getNationality());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNativeplace())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getNativeplace, serviceDonatebaseinfoReport.getNativeplace());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getNation())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getNation, serviceDonatebaseinfoReport.getNation());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getOccupation())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getOccupation, serviceDonatebaseinfoReport.getOccupation());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getEducation())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getEducation, serviceDonatebaseinfoReport.getEducation());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getResidenceaddress())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getResidenceaddress, serviceDonatebaseinfoReport.getResidenceaddress());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getResidenceprovince())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getResidenceprovince, serviceDonatebaseinfoReport.getResidenceprovince());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getResidenceprovincename())) {
            wrappers.like(ServiceDonatebaseinfoReport::getResidenceprovincename, serviceDonatebaseinfoReport.getResidenceprovincename());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getResidencetownname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getResidencetownname, serviceDonatebaseinfoReport.getResidencetownname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getResidencecommunity())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getResidencecommunity, serviceDonatebaseinfoReport.getResidencecommunity());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getResidencecommunityname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getResidencecommunityname, serviceDonatebaseinfoReport.getResidencecommunityname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getResidencecountycode())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getResidencecountycode, serviceDonatebaseinfoReport.getResidencecountycode());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getResidencecountyname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getResidencecountyname, serviceDonatebaseinfoReport.getResidencecountyname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getRegisteraddress())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getRegisteraddress, serviceDonatebaseinfoReport.getRegisteraddress());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getRegisterprovince())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getRegisterprovince, serviceDonatebaseinfoReport.getRegisterprovince());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getRegisterprovincename())) {
            wrappers.like(ServiceDonatebaseinfoReport::getRegisterprovincename, serviceDonatebaseinfoReport.getRegisterprovincename());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getRegistercityname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getRegistercityname, serviceDonatebaseinfoReport.getRegistercityname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getRegistertownname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getRegistertownname, serviceDonatebaseinfoReport.getRegistertownname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getRegistercommunityname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getRegistercommunityname, serviceDonatebaseinfoReport.getRegistercommunityname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getTreatmenthospitalname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getTreatmenthospitalname, serviceDonatebaseinfoReport.getTreatmenthospitalname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getTreatmentdeptname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getTreatmentdeptname, serviceDonatebaseinfoReport.getTreatmentdeptname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getDiagnosisname())) {
            wrappers.like(ServiceDonatebaseinfoReport::getDiagnosisname, serviceDonatebaseinfoReport.getDiagnosisname());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getInpatientno())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getInpatientno, serviceDonatebaseinfoReport.getInpatientno());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getIllnessoverview())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getIllnessoverview, serviceDonatebaseinfoReport.getIllnessoverview());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getInfectious())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getInfectious, serviceDonatebaseinfoReport.getInfectious());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getInfectiousOther())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getInfectiousOther, serviceDonatebaseinfoReport.getInfectiousOther());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getPatientstate())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getPatientstate, serviceDonatebaseinfoReport.getPatientstate());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getReporterno())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getReporterno, serviceDonatebaseinfoReport.getReporterno());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getReportername())) {
            wrappers.like(ServiceDonatebaseinfoReport::getReportername, serviceDonatebaseinfoReport.getReportername());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getReporterphone())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getReporterphone, serviceDonatebaseinfoReport.getReporterphone());
        }
        if (serviceDonatebaseinfoReport.getReporttime() != null) {
            wrappers.eq(ServiceDonatebaseinfoReport::getReporttime, serviceDonatebaseinfoReport.getReporttime());
        }
        if (serviceDonatebaseinfoReport.getTerminationCase() != null) {
            wrappers.eq(ServiceDonatebaseinfoReport::getTerminationCase, serviceDonatebaseinfoReport.getTerminationCase());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getUserNo())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getUserNo, serviceDonatebaseinfoReport.getUserNo());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getUserName())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getUserName, serviceDonatebaseinfoReport.getUserName());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getDeptNo())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getDeptNo, serviceDonatebaseinfoReport.getDeptNo());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getDeptName())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getDeptName, serviceDonatebaseinfoReport.getDeptName());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getIsTransport())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getIsTransport, serviceDonatebaseinfoReport.getIsTransport());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfoReport.getGscScore())) {
            wrappers.eq(ServiceDonatebaseinfoReport::getGscScore, serviceDonatebaseinfoReport.getGscScore());
        }
        return wrappers;
    }

}

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

@@ -113,6 +113,9 @@
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getReportername())) {
            wrappers.like(ServiceDonatebaseinfo::getReportername, serviceDonatebaseinfo.getReportername());
        }
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCaseNo())) {
            wrappers.like(ServiceDonatebaseinfo::getCaseNo, serviceDonatebaseinfo.getCaseNo());
        }
        Map<String, Object> params = serviceDonatebaseinfo.getParams();
        if (params.get("beginReporttime") != null && params.get("endReporttime") != null) {
            wrappers.between(ServiceDonatebaseinfo::getReporttime, params.get("beginReporttime"), params.get("endReporttime"));

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

@@ -13,107 +13,109 @@

/**
 * æçŒ®å™¨å®˜ç§»æ¤Service业务层处理
 * 
 *
 * @author ruoyi
 * @date 2023-12-25
 */
@Service
public class ServiceDonatecomporganServiceImpl extends ServiceImpl<ServiceDonatecomporganMapper, ServiceDonatecomporgan> implements IServiceDonatecomporganService
{
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 (serviceDonatecomporgan.getInfoid() != null) {
            wrappers.eq(ServiceDonatecomporgan::getInfoid, serviceDonatecomporgan.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getOrganno())){
            wrappers.eq(ServiceDonatecomporgan::getOrganno ,serviceDonatecomporgan.getOrganno());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getOrganno())) {
            wrappers.eq(ServiceDonatecomporgan::getOrganno, serviceDonatecomporgan.getOrganno());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getOrganname())){
            wrappers.like(ServiceDonatecomporgan::getOrganname ,serviceDonatecomporgan.getOrganname());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getOrganname())) {
            wrappers.like(ServiceDonatecomporgan::getOrganname, serviceDonatecomporgan.getOrganname());
        }
        if (serviceDonatecomporgan.getTransplantstate() != null){
            wrappers.eq(ServiceDonatecomporgan::getTransplantstate ,serviceDonatecomporgan.getTransplantstate());
        if (serviceDonatecomporgan.getTransplantstate() != null) {
            wrappers.eq(ServiceDonatecomporgan::getTransplantstate, serviceDonatecomporgan.getTransplantstate());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getAbandonreason())){
            wrappers.eq(ServiceDonatecomporgan::getAbandonreason ,serviceDonatecomporgan.getAbandonreason());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getAbandonreason())) {
            wrappers.eq(ServiceDonatecomporgan::getAbandonreason, serviceDonatecomporgan.getAbandonreason());
        }
        if (serviceDonatecomporgan.getTransplanttime() != null){
            wrappers.eq(ServiceDonatecomporgan::getTransplanttime ,serviceDonatecomporgan.getTransplanttime());
        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.getTransplantdoct())) {
            wrappers.eq(ServiceDonatecomporgan::getTransplantdoct, serviceDonatecomporgan.getTransplantdoct());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getHospitalno())){
            wrappers.eq(ServiceDonatecomporgan::getHospitalno ,serviceDonatecomporgan.getHospitalno());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getHospitalno())) {
            wrappers.eq(ServiceDonatecomporgan::getHospitalno, serviceDonatecomporgan.getHospitalno());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getHospitalname())){
            wrappers.like(ServiceDonatecomporgan::getHospitalname ,serviceDonatecomporgan.getHospitalname());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getHospitalname())) {
            wrappers.like(ServiceDonatecomporgan::getHospitalname, serviceDonatecomporgan.getHospitalname());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getName())){
            wrappers.like(ServiceDonatecomporgan::getName ,serviceDonatecomporgan.getName());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getName())) {
            wrappers.like(ServiceDonatecomporgan::getName, serviceDonatecomporgan.getName());
        }
        if (serviceDonatecomporgan.getSex() != null){
            wrappers.eq(ServiceDonatecomporgan::getSex ,serviceDonatecomporgan.getSex());
        if (serviceDonatecomporgan.getSex() != null) {
            wrappers.eq(ServiceDonatecomporgan::getSex, serviceDonatecomporgan.getSex());
        }
        if (serviceDonatecomporgan.getIdcardtype() != null){
            wrappers.eq(ServiceDonatecomporgan::getIdcardtype ,serviceDonatecomporgan.getIdcardtype());
        if (serviceDonatecomporgan.getIdcardtype() != null) {
            wrappers.eq(ServiceDonatecomporgan::getIdcardtype, serviceDonatecomporgan.getIdcardtype());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getIdcardno())){
            wrappers.eq(ServiceDonatecomporgan::getIdcardno ,serviceDonatecomporgan.getIdcardno());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getIdcardno())) {
            wrappers.eq(ServiceDonatecomporgan::getIdcardno, serviceDonatecomporgan.getIdcardno());
        }
        if (serviceDonatecomporgan.getAge() != null){
            wrappers.eq(ServiceDonatecomporgan::getAge ,serviceDonatecomporgan.getAge());
        if (serviceDonatecomporgan.getAge() != null) {
            wrappers.eq(ServiceDonatecomporgan::getAge, serviceDonatecomporgan.getAge());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getAgeunit())){
            wrappers.eq(ServiceDonatecomporgan::getAgeunit ,serviceDonatecomporgan.getAgeunit());
        if (serviceDonatecomporgan.getCaseNo() != null) {
            wrappers.eq(ServiceDonatecomporgan::getCaseNo, serviceDonatecomporgan.getCaseNo());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getBirthday())){
            wrappers.eq(ServiceDonatecomporgan::getBirthday ,serviceDonatecomporgan.getBirthday());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getAgeunit())) {
            wrappers.eq(ServiceDonatecomporgan::getAgeunit, serviceDonatecomporgan.getAgeunit());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getPhone())){
            wrappers.eq(ServiceDonatecomporgan::getPhone ,serviceDonatecomporgan.getPhone());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getBirthday())) {
            wrappers.eq(ServiceDonatecomporgan::getBirthday, serviceDonatecomporgan.getBirthday());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceaddress())){
            wrappers.eq(ServiceDonatecomporgan::getResidenceaddress ,serviceDonatecomporgan.getResidenceaddress());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getPhone())) {
            wrappers.eq(ServiceDonatecomporgan::getPhone, serviceDonatecomporgan.getPhone());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceprovince())){
            wrappers.eq(ServiceDonatecomporgan::getResidenceprovince ,serviceDonatecomporgan.getResidenceprovince());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceaddress())) {
            wrappers.eq(ServiceDonatecomporgan::getResidenceaddress, serviceDonatecomporgan.getResidenceaddress());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceprovincename())){
            wrappers.like(ServiceDonatecomporgan::getResidenceprovincename ,serviceDonatecomporgan.getResidenceprovincename());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceprovince())) {
            wrappers.eq(ServiceDonatecomporgan::getResidenceprovince, serviceDonatecomporgan.getResidenceprovince());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecity())){
            wrappers.eq(ServiceDonatecomporgan::getResidencecity ,serviceDonatecomporgan.getResidencecity());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidenceprovincename())) {
            wrappers.like(ServiceDonatecomporgan::getResidenceprovincename, serviceDonatecomporgan.getResidenceprovincename());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecityname())){
            wrappers.like(ServiceDonatecomporgan::getResidencecityname ,serviceDonatecomporgan.getResidencecityname());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecity())) {
            wrappers.eq(ServiceDonatecomporgan::getResidencecity, serviceDonatecomporgan.getResidencecity());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencetown())){
            wrappers.eq(ServiceDonatecomporgan::getResidencetown ,serviceDonatecomporgan.getResidencetown());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecityname())) {
            wrappers.like(ServiceDonatecomporgan::getResidencecityname, serviceDonatecomporgan.getResidencecityname());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencetownname())){
            wrappers.like(ServiceDonatecomporgan::getResidencetownname ,serviceDonatecomporgan.getResidencetownname());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencetown())) {
            wrappers.eq(ServiceDonatecomporgan::getResidencetown, serviceDonatecomporgan.getResidencetown());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecommunity())){
            wrappers.eq(ServiceDonatecomporgan::getResidencecommunity ,serviceDonatecomporgan.getResidencecommunity());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencetownname())) {
            wrappers.like(ServiceDonatecomporgan::getResidencetownname, serviceDonatecomporgan.getResidencetownname());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecommunityname())){
            wrappers.like(ServiceDonatecomporgan::getResidencecommunityname ,serviceDonatecomporgan.getResidencecommunityname());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecommunity())) {
            wrappers.eq(ServiceDonatecomporgan::getResidencecommunity, serviceDonatecomporgan.getResidencecommunity());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecountycode())){
            wrappers.eq(ServiceDonatecomporgan::getResidencecountycode ,serviceDonatecomporgan.getResidencecountycode());
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecommunityname())) {
            wrappers.like(ServiceDonatecomporgan::getResidencecommunityname, serviceDonatecomporgan.getResidencecommunityname());
        }
        if (StringUtils.isNotBlank(serviceDonatecomporgan.getResidencecountyname())){
            wrappers.like(ServiceDonatecomporgan::getResidencecountyname ,serviceDonatecomporgan.getResidencecountyname());
        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/ServiceEthicalreviewinitiateServiceImpl.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
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.ServiceEthicalreviewinitiate;
import com.ruoyi.project.mapper.ServiceEthicalreviewinitiateMapper;
import com.ruoyi.project.service.IServiceEthicalreviewinitiateService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * ä¼¦ç†å®¡æŸ¥å‘èµ·Service业务层处理
 *
 * @author ruoyi
 * @date 2025-12-20
 */
@Service
public class ServiceEthicalreviewinitiateServiceImpl extends ServiceImpl<ServiceEthicalreviewinitiateMapper, ServiceEthicalreviewinitiate> implements IServiceEthicalreviewinitiateService {


    /**
     * æŸ¥è¯¢ä¼¦ç†å®¡æŸ¥å‘起列表
     *
     * @param serviceEthicalreviewinitiate ä¼¦ç†å®¡æŸ¥å‘èµ·
     * @return ä¼¦ç†å®¡æŸ¥å‘èµ·
     */
    @Override
    public List<ServiceEthicalreviewinitiate> queryList(ServiceEthicalreviewinitiate serviceEthicalreviewinitiate) {
        LambdaQueryWrapper<ServiceEthicalreviewinitiate> wrappers = Wrappers.lambdaQuery();
        if (serviceEthicalreviewinitiate.getInfoid() != null) {
            wrappers.eq(ServiceEthicalreviewinitiate::getInfoid, serviceEthicalreviewinitiate.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceEthicalreviewinitiate.getCaseNo())) {
            wrappers.eq(ServiceEthicalreviewinitiate::getCaseNo, serviceEthicalreviewinitiate.getCaseNo());
        }
        if (StringUtils.isNotBlank(serviceEthicalreviewinitiate.getInitiatePerson())) {
            wrappers.eq(ServiceEthicalreviewinitiate::getInitiatePerson, serviceEthicalreviewinitiate.getInitiatePerson());
        }
        if (serviceEthicalreviewinitiate.getStartTime() != null) {
            wrappers.eq(ServiceEthicalreviewinitiate::getStartTime, serviceEthicalreviewinitiate.getStartTime());
        }
        if (serviceEthicalreviewinitiate.getEndTime() != null) {
            wrappers.eq(ServiceEthicalreviewinitiate::getEndTime, serviceEthicalreviewinitiate.getEndTime());
        }
        if (StringUtils.isNotBlank(serviceEthicalreviewinitiate.getInitiateTheme())) {
            wrappers.eq(ServiceEthicalreviewinitiate::getInitiateTheme, serviceEthicalreviewinitiate.getInitiateTheme());
        }
        if (serviceEthicalreviewinitiate.getCutOffTime() != null) {
            wrappers.eq(ServiceEthicalreviewinitiate::getCutOffTime, serviceEthicalreviewinitiate.getCutOffTime());
        }
        return this.list(wrappers);
    }

}

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

@@ -65,6 +65,9 @@
        if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getExpertopinion())) {
            wrappers.eq(ServiceEthicalreviewopinions::getExpertopinion, serviceEthicalreviewopinions.getExpertopinion());
        }
        if (StringUtils.isNotBlank(serviceEthicalreviewopinions.getCaseNo())) {
            wrappers.eq(ServiceEthicalreviewopinions::getCaseNo, serviceEthicalreviewopinions.getCaseNo());
        }
        if (serviceEthicalreviewopinions.getExpertconclusion() != null) {
            wrappers.eq(ServiceEthicalreviewopinions::getExpertconclusion, serviceEthicalreviewopinions.getExpertconclusion());
        }
@@ -80,6 +83,21 @@
        if (serviceEthicalreviewopinions.getConclusionorder() != null) {
            wrappers.eq(ServiceEthicalreviewopinions::getConclusionorder, serviceEthicalreviewopinions.getConclusionorder());
        }
        if (serviceEthicalreviewopinions.getSendType() != null) {
            wrappers.eq(ServiceEthicalreviewopinions::getSendType, serviceEthicalreviewopinions.getSendType());
        }
        if (serviceEthicalreviewopinions.getReceiveStatus() != null) {
            wrappers.eq(ServiceEthicalreviewopinions::getReceiveStatus, serviceEthicalreviewopinions.getReceiveStatus());
        }
        if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getDeptCode())) {
            wrappers.eq(ServiceEthicalreviewopinions::getDeptCode, serviceEthicalreviewopinions.getDeptCode());
        }
        if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getDeptName())) {
            wrappers.eq(ServiceEthicalreviewopinions::getDeptName, serviceEthicalreviewopinions.getDeptName());
        }
        if (StringUtils.isNotEmpty(serviceEthicalreviewopinions.getOrganType())) {
            wrappers.eq(ServiceEthicalreviewopinions::getOrganType, serviceEthicalreviewopinions.getOrganType());
        }
        return this.list(wrappers);
    }


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

@@ -169,7 +169,7 @@
            List<ServiceFund> serviceFunds = queryInfoById(serviceFund);
            ServiceFund serviceFund1 = serviceFunds.get(0);
            serviceFund1.setFlowlevel(100L);
            serviceFund1.setDel_flag(0);
            serviceFund1.setDelFlag(0);
            serviceFund1.setRecordstatus(-1);
            serviceFund1.setBackflowlevel(199);
            updateById(serviceFund1);
@@ -363,7 +363,7 @@
            wrappers.eq(ServiceFund::getId, serviceFund.getId());
        }

        wrappers.eq(ServiceFund::getDel_flag, "0");
        wrappers.eq(ServiceFund::getDelFlag, "0");
        return this.list(wrappers);
    }

@@ -622,10 +622,6 @@
        data.put("templateCode", "fybxd_rzhc_ceshi");
        //是否为待发：0:新建-发送；1:新建-保存待发
        data.put("draft", "0");
        //协同标题区附件，Long型List，值为附件的Id。Id是附件接口响应结果中fileUrl字段的值
//        data.put("attachments", null);
        //协同公文的id
//        data.put("relateDoc", "col|123,456;doc|321,654");
        //未设置取模板设置的标题
        data.put("subject", "null");
        ServiceFund serviceFund1 = serviceFundMapper.selectById(serviceFund.getId());

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

@@ -177,7 +177,7 @@
    @Override
    public List<ServiceFundShared> queryFundShareList() {
        LambdaQueryWrapper<ServiceFundShared> wrappers = Wrappers.lambdaQuery();
        wrappers.eq(ServiceFundShared::getDel_flag, 0);
        wrappers.eq(ServiceFundShared::getDelFlag, 0);
      //  wrappers.isNotNull(ServiceFundShared::getCxrjyj);

        return this.list(wrappers);

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

@@ -101,8 +101,8 @@
        if (StringUtils.isNotBlank(serviceFunddetail.getApplytype())) {
            wrappers.eq(ServiceFunddetail::getApplytype, serviceFunddetail.getApplytype());
        }
        if (serviceFunddetail.getDel_flag() != null) {
            wrappers.eq(ServiceFunddetail::getDel_flag, serviceFunddetail.getDel_flag());
        if (serviceFunddetail.getDelFlag() != null) {
            wrappers.eq(ServiceFunddetail::getDelFlag, serviceFunddetail.getDelFlag());
        }
        if (serviceFunddetail.getDeptId() != null) {
            wrappers.eq(ServiceFunddetail::getDeptId, serviceFunddetail.getDeptId());

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

@@ -197,7 +197,7 @@
        // 3. æŸ¥è¯¢æœ¬æ‰¹æ¬¡æ‰€æœ‰ServiceFund（按id升序）
        ServiceFund serviceFund = new ServiceFund();
        serviceFund.setFundTaxId(fundTaxVO.getFundTaxId());
        serviceFund.setDel_flag(0);
        serviceFund.setDelFlag(0);
        List<ServiceFund> serviceFunds = serviceFundService.selectServiceFundList(serviceFund);
        for (ServiceFund serviceFund1 : serviceFunds) {
            serviceFundMapper.updateFundIsTexById(serviceFund1.getId(), 0L);

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

@@ -51,9 +51,15 @@
        if (StringUtils.isNotNull(serviceMedicalevaluation.getInfoid())) {
            wrappers.eq(ServiceMedicalevaluation::getInfoid, serviceMedicalevaluation.getInfoid());
        }
        if (StringUtils.isNotNull(serviceMedicalevaluation.getAssessState())) {
            wrappers.eq(ServiceMedicalevaluation::getAssessState, serviceMedicalevaluation.getAssessState());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluation.getDonorno())) {
            wrappers.eq(ServiceMedicalevaluation::getDonorno, serviceMedicalevaluation.getDonorno());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluation.getCaseNo())) {
            wrappers.eq(ServiceMedicalevaluation::getCaseNo, serviceMedicalevaluation.getCaseNo());
        }
        return this.list(wrappers);
    }


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,88 @@
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.ServiceMedicalevaluationorgan;
import com.ruoyi.project.mapper.ServiceMedicalevaluationorganMapper;
import com.ruoyi.project.service.IServiceMedicalevaluationorganService;
import org.springframework.stereotype.Service;

import java.util.List;

/**
 * æçŒ®å™¨å®˜è¯„ä¼°Service业务层处理
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Service
public class ServiceMedicalevaluationorganServiceImpl extends ServiceImpl<ServiceMedicalevaluationorganMapper, ServiceMedicalevaluationorgan> implements IServiceMedicalevaluationorganService
{


    /**
     * æŸ¥è¯¢æçŒ®å™¨å®˜è¯„估列表
     *
     * @param serviceMedicalevaluationorgan æçŒ®å™¨å®˜è¯„ä¼°
     * @return æçŒ®å™¨å®˜è¯„ä¼°
     */
    @Override
    public List<ServiceMedicalevaluationorgan> queryList(ServiceMedicalevaluationorgan serviceMedicalevaluationorgan) {
        LambdaQueryWrapper<ServiceMedicalevaluationorgan> wrappers = Wrappers.lambdaQuery();
        if (serviceMedicalevaluationorgan.getInfoid() != null){
            wrappers.eq(ServiceMedicalevaluationorgan::getInfoid ,serviceMedicalevaluationorgan.getInfoid());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getDonorno())){
            wrappers.eq(ServiceMedicalevaluationorgan::getDonorno ,serviceMedicalevaluationorgan.getDonorno());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrganno())){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrganno ,serviceMedicalevaluationorgan.getOrganno());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrganname())){
            wrappers.like(ServiceMedicalevaluationorgan::getOrganname ,serviceMedicalevaluationorgan.getOrganname());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrgannumber())){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrgannumber ,serviceMedicalevaluationorgan.getOrgannumber());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrganState())){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrganState ,serviceMedicalevaluationorgan.getOrganState());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getNotgetreason())){
            wrappers.eq(ServiceMedicalevaluationorgan::getNotgetreason ,serviceMedicalevaluationorgan.getNotgetreason());
        }
        if (serviceMedicalevaluationorgan.getOrganAssessTime() != null){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrganAssessTime ,serviceMedicalevaluationorgan.getOrganAssessTime());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getOrganAssessDoct())){
            wrappers.eq(ServiceMedicalevaluationorgan::getOrganAssessDoct ,serviceMedicalevaluationorgan.getOrganAssessDoct());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getGainhospitalno())){
            wrappers.eq(ServiceMedicalevaluationorgan::getGainhospitalno ,serviceMedicalevaluationorgan.getGainhospitalno());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getGainhospitalname())){
            wrappers.like(ServiceMedicalevaluationorgan::getGainhospitalname ,serviceMedicalevaluationorgan.getGainhospitalname());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getIsbiopsybefore())){
            wrappers.eq(ServiceMedicalevaluationorgan::getIsbiopsybefore ,serviceMedicalevaluationorgan.getIsbiopsybefore());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getIsbiopsyafter())){
            wrappers.eq(ServiceMedicalevaluationorgan::getIsbiopsyafter ,serviceMedicalevaluationorgan.getIsbiopsyafter());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getIsmarginalorgan())){
            wrappers.eq(ServiceMedicalevaluationorgan::getIsmarginalorgan ,serviceMedicalevaluationorgan.getIsmarginalorgan());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getIspathogenpositive())){
            wrappers.eq(ServiceMedicalevaluationorgan::getIspathogenpositive ,serviceMedicalevaluationorgan.getIspathogenpositive());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getIspnf())){
            wrappers.eq(ServiceMedicalevaluationorgan::getIspnf ,serviceMedicalevaluationorgan.getIspnf());
        }
        if (StringUtils.isNotBlank(serviceMedicalevaluationorgan.getIsdgf())){
            wrappers.eq(ServiceMedicalevaluationorgan::getIsdgf ,serviceMedicalevaluationorgan.getIsdgf());
        }
        return this.list(wrappers);
    }

}

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

@@ -206,7 +206,7 @@
        //先判断一下share表是否已经插入
        ServiceReimbursementShared reimbursementShared1 = new ServiceReimbursementShared();
        reimbursementShared1.setReimid(id);
        reimbursementShared1.setDelFlag(0L);
        reimbursementShared1.setDelFlag(0);
        List<ServiceReimbursementShared> serviceReimbursementShareds = sharedService.queryList(reimbursementShared1);
        log.info("serviceReimbursementShareds的查询结果 :{}", serviceReimbursementShareds.size());
        if (!CollectionUtils.isEmpty(serviceReimbursementShareds)) {

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
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.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.domain.ServiceTransportFile;
import com.ruoyi.project.mapper.ServiceTransportFileMapper;
import com.ruoyi.project.service.IServiceTransportFileService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;

/**
 * ä¾›è€…转运登记附件Service业务层处理
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Service
public class ServiceTransportFileServiceImpl extends ServiceImpl<ServiceTransportFileMapper, ServiceTransportFile> implements IServiceTransportFileService {


    /**
     * æŸ¥è¯¢ä¾›è€…转运登记附件列表
     *
     * @param serviceTransportFile ä¾›è€…转运登记附件
     * @return ä¾›è€…转运登记附件
     */
    @Override
    public List<ServiceTransportFile> queryList(ServiceTransportFile serviceTransportFile) {
        LambdaQueryWrapper<ServiceTransportFile> wrappers = Wrappers.lambdaQuery();
        if (serviceTransportFile.getTransportId() != null) {
            wrappers.eq(ServiceTransportFile::getTransportId, serviceTransportFile.getTransportId());
        }
        if (StringUtils.isNotBlank(serviceTransportFile.getFileName())) {
            wrappers.eq(ServiceTransportFile::getFileName, serviceTransportFile.getFileName());
        }
        if (StringUtils.isNotBlank(serviceTransportFile.getType())) {
            wrappers.eq(ServiceTransportFile::getType, serviceTransportFile.getType());
        }
        if (StringUtils.isNotBlank(serviceTransportFile.getPath())) {
            wrappers.eq(ServiceTransportFile::getPath, serviceTransportFile.getPath());
        }
        if (StringUtils.isNotBlank(serviceTransportFile.getRemart())) {
            wrappers.eq(ServiceTransportFile::getRemart, serviceTransportFile.getRemart());
        }
        if (StringUtils.isNotBlank(serviceTransportFile.getCaseNo())) {
            wrappers.eq(ServiceTransportFile::getCaseNo, serviceTransportFile.getCaseNo());
        }
        return this.list(wrappers);
    }


    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean addList(List<ServiceTransportFile> annexfilesList, Long transportId,String caseNo,String createName) {
        boolean save = false;
        if (CollectionUtils.isNotEmpty(annexfilesList)) {
            for (ServiceTransportFile serviceTransportFile : annexfilesList) {
                serviceTransportFile.setTransportId(transportId);
                serviceTransportFile.setCreateTime(new Date());
                serviceTransportFile.setCreateBy(createName);
                serviceTransportFile.setCaseNo(caseNo);
                save = save(serviceTransportFile);
            }
        }
        return save;
    }

    @Transactional(rollbackFor = Exception.class)
    @Override
    public Boolean updateList(List<ServiceTransportFile> annexfilesList, Long reportId,String caseNo,String updateName) {
        // å…ˆå°†æ•°æ®æŸ¥å‡ºæ¥
        List<ServiceTransportFile> list = list(new LambdaQueryWrapper<ServiceTransportFile>().eq(ServiceTransportFile::getTransportId, reportId));

        // æå–现有记录的路径集合，用于高效比较
        Set<String> existingPaths = list.stream().map(file -> file.getFileName() != null ? file.getPath().trim() : "").filter(StringUtils::isNotEmpty).collect(Collectors.toSet());

        // æå–待处理路径集合
        Set<String> newPathSet = annexfilesList.stream().map(serviceTransportFile -> serviceTransportFile.getFileName() != null ? serviceTransportFile.getFileName().trim() : "").filter(StringUtils::isNotEmpty).collect(Collectors.toSet());

        boolean result = true;

        // æ ‡è®°éœ€è¦åˆ é™¤çš„记录（存在于数据库但不在新列表中）
        for (ServiceTransportFile file : list) {
            if (StringUtils.isNotEmpty(file.getFileName()) && !newPathSet.contains(file.getFileName().trim())) {
                file.setDelFlag(1);
                file.setUpdateTime(new Date());
                file.setUpdateBy(updateName);
                result &= updateById(file);
            }
        }

        // æ·»åŠ æ–°çš„记录（存在于新列表但不在数据库中）
        for (ServiceTransportFile serviceTransportFile : annexfilesList) {
            if (StringUtils.isNotEmpty(serviceTransportFile.getFileName()) && !existingPaths.contains(serviceTransportFile.getFileName().trim())) {
                serviceTransportFile.setTransportId(reportId);
                serviceTransportFile.setCreateBy(updateName);
                serviceTransportFile.setUpdateTime(new Date());
                result &= save(serviceTransportFile);
            }
        }

        return result;
    }


}

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

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

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReport;
import com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile;
import com.ruoyi.project.domain.ServiceTransport;
import com.ruoyi.project.domain.ServiceTransportFile;
import com.ruoyi.project.mapper.ServiceTransportMapper;
import com.ruoyi.project.service.IServiceTransportFileService;
import com.ruoyi.project.service.IServiceTransportService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
import java.util.stream.Collectors;

/**
 * ä¾›è€…转运登记Service业务层处理
 *
 * @author ruoyi
 * @date 2025-12-15
 */
@Service
public class ServiceTransportServiceImpl extends ServiceImpl<ServiceTransportMapper, ServiceTransport> implements IServiceTransportService {

    @Autowired
    private IServiceTransportFileService serviceTransportFileService;
    @Autowired
    private ServiceTransportMapper ServiceTransportMapper;

    /**
     * æŸ¥è¯¢ä¾›è€…转运登记列表
     *
     * @param serviceTransport ä¾›è€…转运登记
     * @return ä¾›è€…转运登记
     */
    @Override
    public Page<ServiceTransport> queryList(ServiceTransport serviceTransport) {
        LambdaQueryWrapper<ServiceTransport> wrappers = getWrappers(serviceTransport);
        // åˆ›å»ºåˆ†é¡µå¯¹è±¡ï¼Œè®¾ç½®é¡µç å’Œæ¯é¡µå¤§å°
        int currentPage = (serviceTransport.getPageNum() == null || serviceTransport.getPageNum() < 1) ? 1 : serviceTransport.getPageNum();
        int size = (serviceTransport.getPageSize() == null || serviceTransport.getPageSize() < 1) ? 10 : serviceTransport.getPageSize();
        Page<ServiceTransport> page = new Page<>(currentPage, size);

        //补充 é™„件
        List<ServiceTransport> list = ServiceTransportMapper.selectPage(page, wrappers).getRecords();
        if (CollectionUtils.isNotEmpty(list)) {
            for (ServiceTransport serviceTransport1 : list) {
                ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
                serviceTransportFile.setDelFlag(0);
                serviceTransportFile.setTransportId(serviceTransport1.getId());
                serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
                List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);

                serviceTransport1.setAnnexfilesList(serviceTransportFiles);
            }
        }
        page.setRecords(list);
        return page;
    }

    @Override
    public List<ServiceTransport> queryListData(ServiceTransport serviceTransport) {
        LambdaQueryWrapper<ServiceTransport> wrappers = getWrappers(serviceTransport);
        // åˆ›å»ºåˆ†é¡µå¯¹è±¡ï¼Œè®¾ç½®é¡µç å’Œæ¯é¡µå¤§å°
        List<ServiceTransport> list = list(wrappers);

        if (CollectionUtils.isNotEmpty(list)) {
            for (ServiceTransport serviceTransport1 : list) {
                ServiceTransportFile serviceTransportFile = new ServiceTransportFile();
                serviceTransportFile.setDelFlag(0);
                serviceTransportFile.setTransportId(serviceTransport1.getId());
                serviceTransportFile.setCaseNo(serviceTransport1.getCaseNo());
                List<ServiceTransportFile> serviceTransportFiles = serviceTransportFileService.queryList(serviceTransportFile);

                serviceTransport1.setAnnexfilesList(serviceTransportFiles);
            }
        }
        return list;
    }

    private LambdaQueryWrapper<ServiceTransport> getWrappers(ServiceTransport serviceTransport) {
        LambdaQueryWrapper<ServiceTransport> wrappers = Wrappers.lambdaQuery();
        if (serviceTransport.getReportId() != null) {
            wrappers.eq(ServiceTransport::getReportId, serviceTransport.getReportId());
        }
        if (StringUtils.isNotBlank(serviceTransport.getCaseNo())) {
            wrappers.eq(ServiceTransport::getCaseNo, serviceTransport.getCaseNo());
        }
        if (StringUtils.isNotBlank(serviceTransport.getPatName())) {
            wrappers.like(ServiceTransport::getPatName, serviceTransport.getPatName());
        }
        if (StringUtils.isNotBlank(serviceTransport.getSex())) {
            wrappers.eq(ServiceTransport::getSex, serviceTransport.getSex());
        }
        if (serviceTransport.getAge() != null) {
            wrappers.eq(ServiceTransport::getAge, serviceTransport.getAge());
        }
        if (serviceTransport.getTransitStatus() != null) {
            wrappers.eq(ServiceTransport::getTransitStatus, serviceTransport.getTransitStatus());
        }
        if (StringUtils.isNotBlank(serviceTransport.getRemark())) {
            wrappers.like(ServiceTransport::getRemark, serviceTransport.getRemark());
        }
        if (StringUtils.isNotBlank(serviceTransport.getDiagnosisname())) {
            wrappers.like(ServiceTransport::getDiagnosisname, serviceTransport.getDiagnosisname());
        }
        if (StringUtils.isNotBlank(serviceTransport.getTreatmentHospitalName())) {
            wrappers.like(ServiceTransport::getTreatmentHospitalName, serviceTransport.getTreatmentHospitalName());
        }
        if (StringUtils.isNotBlank(serviceTransport.getTreatmentDeptName())) {
            wrappers.like(ServiceTransport::getTreatmentDeptName, serviceTransport.getTreatmentDeptName());
        }
        if (serviceTransport.getTransportStartTime() != null) {
            wrappers.eq(ServiceTransport::getTransportStartTime, serviceTransport.getTransportStartTime());
        }
        if (StringUtils.isNotBlank(serviceTransport.getTransportStartPlace())) {
            wrappers.eq(ServiceTransport::getTransportStartPlace, serviceTransport.getTransportStartPlace());
        }
        if (StringUtils.isNotBlank(serviceTransport.getContactPerson())) {
            wrappers.eq(ServiceTransport::getContactPerson, serviceTransport.getContactPerson());
        }
        if (StringUtils.isNotBlank(serviceTransport.getDoctor())) {
            wrappers.eq(ServiceTransport::getDoctor, serviceTransport.getDoctor());
        }
        if (StringUtils.isNotBlank(serviceTransport.getDoctorPhone())) {
            wrappers.eq(ServiceTransport::getDoctorPhone, serviceTransport.getDoctorPhone());
        }
        if (StringUtils.isNotBlank(serviceTransport.getNurse())) {
            wrappers.eq(ServiceTransport::getNurse, serviceTransport.getNurse());
        }
        if (StringUtils.isNotBlank(serviceTransport.getNursePhone())) {
            wrappers.eq(ServiceTransport::getNursePhone, serviceTransport.getNursePhone());
        }
        if (StringUtils.isNotBlank(serviceTransport.getDriver())) {
            wrappers.eq(ServiceTransport::getDriver, serviceTransport.getDriver());
        }
        if (StringUtils.isNotBlank(serviceTransport.getDriverPhone())) {
            wrappers.eq(ServiceTransport::getDriverPhone, serviceTransport.getDriverPhone());
        }
        if (StringUtils.isNotBlank(serviceTransport.getIcuDoctor())) {
            wrappers.eq(ServiceTransport::getIcuDoctor, serviceTransport.getIcuDoctor());
        }
        if (StringUtils.isNotBlank(serviceTransport.getIcuDoctorPhone())) {
            wrappers.eq(ServiceTransport::getIcuDoctorPhone, serviceTransport.getIcuDoctorPhone());
        }
        return wrappers;
    }

}

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

@@ -3,12 +3,13 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.project.mapper.BaseAnnextypeMapper">
    

    <resultMap type="com.ruoyi.project.domain.BaseAnnextype" id="BaseAnnextypeResult">
        <result property="id"    column="ID"    />
        <result property="donationcategory"    column="donationcategory"    />
        <result property="annextype"    column="annextype"    />
        <result property="annexname"    column="annexname"    />
        <result property="caseNo"    column="case_no"    />
        <result property="need"    column="need"    />
        <result property="seqno"    column="seqno"    />
        <result property="remark"    column="remark"    />
@@ -20,7 +21,7 @@
    </resultMap>

    <sql id="selectBaseAnnextypeVo">
        select ID, donationcategory, annextype, annexname, need, seqno, remark, del_flag, create_by, create_time, update_by, update_time from base_annextype
        select ID, case_no,donationcategory, annextype, annexname, need, seqno, remark, del_flag, create_by, create_time, update_by, update_time from base_annextype
    </sql>

    <select id="selectBaseAnnextypeList" parameterType="com.ruoyi.project.domain.BaseAnnextype" resultMap="BaseAnnextypeResult">
@@ -31,7 +32,8 @@
            <if test="annexname != null  and annexname != ''"> and annexname like concat('%', #{annexname}, '%')</if>
            <if test="need != null "> and need = #{need}</if>
            <if test="seqno != null "> and seqno = #{seqno}</if>
            <if test="caseNo != null "> and case_no = #{caseNo}</if>
        </where>
    </select>

</mapper>
</mapper>

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

@@ -1,41 +1,58 @@
<?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.ServiceDonateannexMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceDonateannex" id="ServiceDonateannexResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
        <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"    />
        <result property="annexname"    column="AnnexName"    />
        <result property="annexno"    column="AnnexNo"    />
        <result property="annexurl"    column="AnnexUrl"    />
        <result property="annexfilestype"    column="AnnexfilesType"    />
        <result property="annextypeid"    column="annextypeid"    />
        <result property="id" column="ID"/>
        <result property="infoid" column="InfoID"/>
        <result property="caseNo" column="case_no"/>
        <result property="donorno" column="DonorNo"/>
        <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"/>
        <result property="annexname" column="AnnexName"/>
        <result property="annexno" column="AnnexNo"/>
        <result property="annexurl" column="AnnexUrl"/>
        <result property="annexfilestype" column="AnnexfilesType"/>
        <result property="annextypeid" column="annextypeid"/>
    </resultMap>

    <sql id="selectServiceDonateannexVo">
        select ID, InfoID, DonorNo, del_flag, create_by, create_time, update_by, update_time, AnnexName, AnnexNo, AnnexUrl,AnnexfilesType,annextypeid from service_donateannex
        select ID,
               case_no,
               InfoID,
               DonorNo,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time,
               AnnexName,
               AnnexNo,
               AnnexUrl,
               AnnexfilesType,
               annextypeid
        from service_donateannex
    </sql>

    <select id="selectServiceDonateannexList" parameterType="com.ruoyi.project.domain.ServiceDonateannex" resultMap="ServiceDonateannexResult">
    <select id="selectServiceDonateannexList" parameterType="com.ruoyi.project.domain.ServiceDonateannex"
            resultMap="ServiceDonateannexResult">
        <include refid="selectServiceDonateannexVo"/>
        <where>
            <if test="infoid != null "> and InfoID = #{infoid}</if>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>
            <if test="annexname != null  and annexname != ''"> and AnnexName like concat('%', #{annexname}, '%')</if>
            <if test="annexno != null  and annexno != ''"> and AnnexNo = #{annexno}</if>
            <if test="annexurl != null  and annexurl != ''"> and AnnexUrl = #{annexurl}</if>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="caseNo != null ">and case_no = #{caseNo}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
            <if test="annexname != null  and annexname != ''">and AnnexName like concat('%', #{annexname}, '%')</if>
            <if test="annexno != null  and annexno != ''">and AnnexNo = #{annexno}</if>
            <if test="annexurl != null  and annexurl != ''">and AnnexUrl = #{annexurl}</if>
        </where>
    </select>
    <select id="selectVOList" resultType="com.ruoyi.project.domain.vo.DonateAnnexVO">
    SELECT
        SELECT
        `service_donatebaseinfo`.`ID` AS `ID`,
        `service_donatebaseinfo`.`DonorNo` AS `DonorNo`,
        `service_donatebaseinfo`.`RecordState` AS `RecordState`,
@@ -64,25 +81,29 @@
        `service_donateannex`.`create_by` AS `create_by`,
        `service_donateannex`.`create_time` AS `create_time`,
        `service_donateannex`.`update_by` AS `update_by`,
        `service_donateannex`.`case_no` AS `case_no`,
        `service_donateannex`.`update_time` AS `update_time`
    FROM
        FROM
        (
            `service_donatebaseinfo`
            JOIN `service_donateannex` ON ((
                `service_donatebaseinfo`.`ID` = `service_donateannex`.`InfoID`
        `service_donatebaseinfo`
        JOIN `service_donateannex` ON ((
        `service_donatebaseinfo`.`ID` = `service_donateannex`.`InfoID`
        )))


        <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="idcardno != null  and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
            <if test="recordstate != null  and recordstate != ''"> and `service_donatebaseinfo`.`RecordState` = #{recordstate}</if>
            <if test="create_by != null  and create_by != ''"> and `service_donateannex`.`create_by` = #{create_by}</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="idcardno != null  and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''">and
                `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
            </if>
            <if test="recordstate != null  and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
                #{recordstate}
            </if>
            <if test="create_by != null  and create_by != ''">and `service_donateannex`.`create_by` = #{create_by}</if>
            <if test="caseNo != null  and caseNo != ''">and `service_donateannex`.`case_no` = #{caseNo}</if>
        </where>

        order by `service_donateannex`.`create_time` desc
    </select>

</mapper>
</mapper>

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

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

    <resultMap type="com.ruoyi.project.domain.ServiceDonatebaseinfo" id="ServiceDonatebaseinfoResult">
        <result property="id" column="ID"/>
        <result property="caseNo" column="case_no"/>
        <result property="name" column="Name"/>
        <result property="sex" column="Sex"/>
        <result property="idcardtype" column="IDCardType"/>
@@ -85,6 +86,7 @@
        <result property="firstMedicalInstitution" column="first_medical_institution"/>
        <result property="currentDept" column="current_dept"/>
        <result property="firstDept" column="first_dept"/>
        <result property="reportId" column="report_id"/>
    </resultMap>

    <sql id="selectServiceDonatebaseinfoVo">
@@ -106,6 +108,7 @@
            service_donatebaseinfo.del_flag = 0
            <if test="name != null  and name != ''">and Name like concat('%', #{name}, '%')</if>
            <if test="sex != null ">and Sex = #{sex}</if>
            <if test="caseNo != null ">and service_donatebaseinfo.case_no = #{caseNo}</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>
@@ -222,6 +225,7 @@
            <if test="donatetime != null ">and donatetime = #{donatetime}</if>
            <if test="donateno != null ">and donateno = #{donateno}</if>
            <if test="workflow != null ">and workflow = #{workflow}</if>
            <if test="reportId != null ">and report_id = #{reportId}</if>
        </where>

        order by ReportTime desc
@@ -246,6 +250,8 @@
        <where>
            AND b.del_flag=0
            <if test="starttime != null ">and b.donatetime >= #{starttime}</if>
            <if test="caseNo != null ">and b.case_no >= #{caseNo}</if>
            <if test="reportId != null ">and b.report_id = #{reportId}</if>
            <if test="endtime != null ">and b.donatetime &lt;= #{endtime}</if>
            <if test="city != null and city != ''">and o.City = #{city}</if>
            <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
@@ -282,6 +288,7 @@
        inner join base_organization o on b.TreatmentHospitalNo = o.OrganizationID
        <where>
            <if test="starttime != null ">and b.ReportTime >= #{starttime}</if>
            <if test="caseNo != null ">and b.case_no >= #{caseNo}</if>
            <if test="endtime != null ">and b.ReportTime &lt;= #{endtime}</if>
            <if test="city != null and city != ''">and o.City = #{city}</if>
            <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
@@ -379,6 +386,7 @@
            <if test="endtime != null ">and d.CompleteTime &lt;= #{endtime}</if>
            <if test="city != null and city != ''">and o.City = #{city}</if>
            <if test="reporterno != null and reporterno != ''">and b.ReporterNo = #{reporterno}</if>
            <if test="caseNo != null ">and b.case_no >= #{caseNo}</if>
        </where>
    </select>


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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,55 @@
<?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.ServiceDonatebaseinfoReportFileMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile"
               id="ServiceDonatebaseinfoReportFileResult">
        <result property="id" column="id"/>
        <result property="donatebaseinfoReportId" column="donatebaseinfo_report_id"/>
        <result property="caseNo" column="case_no"/>
        <result property="fileName" column="file_name"/>
        <result property="type" column="type"/>
        <result property="path" column="path"/>
        <result property="remart" column="remart"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createTime" column="create_time"/>
        <result property="createBy" column="create_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="updateBy" column="update_by"/>
    </resultMap>

    <sql id="selectServiceDonatebaseinfoReportFileVo">
        select id,
               donatebaseinfo_report_id,
               case_no,
               file_name,
               type,
               path,
               remart,
               del_flag,
               create_time,
               create_by,
               update_time,
               update_by
        from service_donatebaseinfo_report_file
    </sql>

    <select id="selectServiceDonatebaseinfoReportFileList"
            parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfoReportFile"
            resultMap="ServiceDonatebaseinfoReportFileResult">
        <include refid="selectServiceDonatebaseinfoReportFileVo"/>
        <where>
            <if test="donatebaseinfoReportId != null  and donatebaseinfoReportId != ''">and donatebaseinfo_report_id =
                #{donatebaseinfoReportId}
            </if>
            <if test="type != null  and type != ''">and type = #{type}</if>
            <if test="fileName != null  and fileName != ''">and file_name = #{fileName}</if>
            <if test="caseNo != null  and caseNo != ''">and case_no = #{caseNo}</if>
            <if test="path != null  and path != ''">and path = #{path}</if>
            <if test="remart != null  and remart != ''">and remart = #{remart}</if>
        </where>
    </select>

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,210 @@
<?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.ServiceDonatebaseinfoReportMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceDonatebaseinfoReport" id="ServiceDonatebaseinfoReportResult">
        <result property="id" column="ID"/>
        <result property="caseNo" column="case_no"/>
        <result property="reportStatus" column="report_status"/>
        <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="nationality" column="Nationality"/>
        <result property="nativeplace" column="NativePlace"/>
        <result property="nation" column="Nation"/>
        <result property="occupation" column="Occupation"/>
        <result property="education" column="Education"/>
        <result property="residenceaddress" column="ResidenceAddress"/>
        <result property="residenceprovince" column="ResidenceProvince"/>
        <result property="residenceprovincename" column="ResidenceProvinceName"/>
        <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="registeraddress" column="RegisterAddress"/>
        <result property="registerprovince" column="RegisterProvince"/>
        <result property="registerprovincename" column="RegisterProvinceName"/>
        <result property="registercityname" column="RegisterCityName"/>
        <result property="registertownname" column="RegisterTownName"/>
        <result property="registercommunityname" column="RegisterCommunityName"/>
        <result property="treatmenthospitalname" column="TreatmentHospitalName"/>
        <result property="treatmentdeptname" column="TreatmentDeptName"/>
        <result property="diagnosisname" column="DiagnosisName"/>
        <result property="inpatientno" column="InpatientNo"/>
        <result property="illnessoverview" column="IllnessOverview"/>
        <result property="infectious" column="Infectious"/>
        <result property="infectiousOther" column="Infectious_Other"/>
        <result property="patientstate" column="PatientState"/>
        <result property="reporterno" column="ReporterNo"/>
        <result property="reportername" column="ReporterName"/>
        <result property="reporterphone" column="ReporterPhone"/>
        <result property="reporttime" column="ReportTime"/>
        <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"/>
        <result property="terminationCase" column="termination_case"/>
        <result property="userNo" column="user_no"/>
        <result property="userName" column="user_name"/>
        <result property="deptName" column="dept_name"/>
        <result property="deptNo" column="dept_no"/>
        <result property="isTransport" column="is_transport"/>
        <result property="gscScore" column="gsc_score"/>
    </resultMap>

    <sql id="selectServiceDonatebaseinfoReportVo">
        select ID,
               case_no,
               report_status,
               gsc_score,
               Name,
               Sex,
               IDCardType,
               IDCardNo,
               Age,
               AgeUnit,
               Birthday,
               Phone,
               Nationality,
               NativePlace,
               Nation,
               Occupation,
               Education,
               ResidenceAddress,
               ResidenceProvince,
               ResidenceProvinceName,
               ResidenceTownName,
               ResidenceCommunity,
               ResidenceCommunityName,
               ResidenceCountyCode,
               ResidenceCountyName,
               RegisterAddress,
               RegisterProvince,
               RegisterProvinceName,
               RegisterCityName,
               RegisterTownName,
               RegisterCommunityName,
               TreatmentHospitalName,
               TreatmentDeptName,
               DiagnosisName,
               InpatientNo,
               IllnessOverview,
               Infectious,
               Infectious_Other,
               PatientState,
               ReporterNo,
               ReporterName,
               ReporterPhone,
               ReportTime,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time,
               termination_case,
               user_no,
               user_name,
               dept_no,
               dept_name,
               is_transport
        from service_donatebaseinfo_report
    </sql>

    <select id="selectServiceDonatebaseinfoReportList"
            parameterType="com.ruoyi.project.domain.ServiceDonatebaseinfoReport"
            resultMap="ServiceDonatebaseinfoReportResult">
        <include refid="selectServiceDonatebaseinfoReportVo"/>
        <where>
            <if test="caseNo != null  and caseNo != ''">and case_no = #{caseNo}</if>
            <if test="gscScore != null  and gscScore != ''">and gsc_score = #{gscScore}</if>
            <if test="reportStatus != null  and reportStatus != ''">and report_status = #{reportStatus}</if>
            <if test="name != null  and name != ''">and Name like concat('%', #{name}, '%')</if>
            <if test="sex != null  and sex != ''">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 = #{birthday}</if>
            <if test="phone != null  and phone != ''">and Phone = #{phone}</if>
            <if test="nationality != null  and nationality != ''">and Nationality = #{nationality}</if>
            <if test="nativeplace != null  and nativeplace != ''">and NativePlace = #{nativeplace}</if>
            <if test="nation != null  and nation != ''">and Nation = #{nation}</if>
            <if test="occupation != null  and occupation != ''">and Occupation = #{occupation}</if>
            <if test="education != null  and education != ''">and Education = #{education}</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="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>
            <if test="registeraddress != null  and registeraddress != ''">and RegisterAddress = #{registeraddress}</if>
            <if test="registerprovince != null  and registerprovince != ''">and RegisterProvince = #{registerprovince}
            </if>
            <if test="registerprovincename != null  and registerprovincename != ''">and RegisterProvinceName like
                concat('%', #{registerprovincename}, '%')
            </if>
            <if test="registercityname != null  and registercityname != ''">and RegisterCityName like concat('%',
                #{registercityname}, '%')
            </if>
            <if test="registertownname != null  and registertownname != ''">and RegisterTownName like concat('%',
                #{registertownname}, '%')
            </if>
            <if test="registercommunityname != null  and registercommunityname != ''">and RegisterCommunityName like
                concat('%', #{registercommunityname}, '%')
            </if>
            <if test="treatmenthospitalname != null  and treatmenthospitalname != ''">and TreatmentHospitalName like
                concat('%', #{treatmenthospitalname}, '%')
            </if>
            <if test="treatmentdeptname != null  and treatmentdeptname != ''">and TreatmentDeptName like concat('%',
                #{treatmentdeptname}, '%')
            </if>
            <if test="diagnosisname != null  and diagnosisname != ''">and DiagnosisName like concat('%',
                #{diagnosisname}, '%')
            </if>
            <if test="inpatientno != null  and inpatientno != ''">and InpatientNo = #{inpatientno}</if>
            <if test="illnessoverview != null  and illnessoverview != ''">and IllnessOverview = #{illnessoverview}</if>
            <if test="infectious != null  and infectious != ''">and Infectious = #{infectious}</if>
            <if test="infectiousOther != null  and infectiousOther != ''">and Infectious_Other = #{infectiousOther}</if>
            <if test="patientstate != null  and patientstate != ''">and PatientState = #{patientstate}</if>
            <if test="reporterno != null  and reporterno != ''">and ReporterNo = #{reporterno}</if>
            <if test="reportername != null  and reportername != ''">and ReporterName like concat('%', #{reportername},
                '%')
            </if>
            <if test="reporterphone != null  and reporterphone != ''">and ReporterPhone = #{reporterphone}</if>
            <if test="reporttime != null ">and ReportTime = #{reporttime}</if>
            <if test="terminationCase != null ">and termination_case = #{terminationCase}</if>
            <if test="userNo != null  and userNo != ''">and userNo = #{userNo}</if>
            <if test="userName != null  and userName != ''">and user_name = #{userName}</if>
            <if test="deptNo != null  and deptNo != ''">and dept_no = #{deptNo}</if>
            <if test="deptName != null  and deptName != ''">and dept_name = #{deptName}</if>
            <if test="isTransport != null  and isTransport != ''">and is_transport = #{isTransport}</if>
        </where>
    </select>

</mapper>

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

@@ -39,7 +39,7 @@
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="caseno" column="caseno"/>
        <result property="caseNo" column="case_no"/>
        <result property="donorname" column="donorname"/>
    </resultMap>

@@ -55,7 +55,7 @@
               HospitalNo,
               HospitalName,
               Name,
               caseno,
               case_no,
               Sex,
               IDCardType,
               IDCardNo,
@@ -102,7 +102,7 @@
            </if>
            <if test="name != null  and name != ''">and Name like concat('%', #{name}, '%')</if>
            <if test="sex != null ">and Sex = #{sex}</if>
            <if test="caseno != null ">and caseno = #{caseno}</if>
            <if test="caseNo != null ">and case_no = #{caseNo}</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>
@@ -142,4 +142,4 @@
        </where>
    </select>

</mapper>
</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,57 @@
<?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.ServiceEthicalreviewinitiateMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceEthicalreviewinitiate" id="ServiceEthicalreviewinitiateResult">
        <result property="id" column="ID"/>
        <result property="infoid" column="InfoID"/>
        <result property="caseNo" column="case_no"/>
        <result property="initiatePerson" column="initiate_person"/>
        <result property="startTime" column="start_time"/>
        <result property="endTime" column="end_time"/>
        <result property="initiateTheme" column="initiate_theme"/>
        <result property="cutOffTime" column="cut_off_time"/>
        <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"/>
        <result property="remark" column="remark"/>
    </resultMap>

    <sql id="selectServiceEthicalreviewinitiateVo">
        select ID,
               InfoID,
               case_no,
               initiate_person,
               start_time,
               end_time,
               initiate_theme,
               cut_off_time,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time,
               remark
        from service_ethicalreviewinitiate
    </sql>

    <select id="selectServiceEthicalreviewinitiateList"
            parameterType="com.ruoyi.project.domain.ServiceEthicalreviewinitiate"
            resultMap="ServiceEthicalreviewinitiateResult">
        <include refid="selectServiceEthicalreviewinitiateVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="caseNo != null  and caseNo != ''">and case_no = #{caseNo}</if>
            <if test="initiatePerson != null  and initiatePerson != ''">and initiate_person = #{initiatePerson}</if>
            <if test="startTime != null ">and start_time = #{startTime}</if>
            <if test="endTime != null ">and end_time = #{endTime}</if>
            <if test="initiateTheme != null  and initiateTheme != ''">and initiate_theme = #{initiateTheme}</if>
            <if test="cutOffTime != null ">and cut_off_time = #{cutOffTime}</if>
        </where>
    </select>

</mapper>

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

@@ -6,7 +6,8 @@

    <resultMap type="com.ruoyi.project.domain.ServiceEthicalreviewopinions" id="ServiceEthicalreviewopinionsResult">
        <result property="id" column="ID"/>
        <result property="del_flag" column="del_flag"/>
        <result property="delFlag" column="del_flag"/>
        <result property="caseNo" column="case_no"/>
        <result property="createBy" column="create_by"/>
        <result property="createTime" column="create_time"/>
        <result property="updateBy" column="update_by"/>
@@ -19,10 +20,21 @@
        <result property="conclusiontime" column="ConclusionTime"/>
        <result property="conclusionannex" column="ConclusionAnnex"/>
        <result property="conclusionorder" column="ConclusionOrder"/>
        <result property="sendType" column="send_type"/>
        <result property="receiveStatus" column="receive_status"/>
        <result property="deptCode" column="dept_code"/>
        <result property="deptName" column="dept_name"/>
        <result property="organType" column="organ_type"/>
    </resultMap>

    <sql id="selectServiceEthicalreviewopinionsVo">
        select ID,
               case_no,
               dept_code,
               dept_name,
               organ_type,
               send_type,
               receive_status,
               del_flag,
               create_by,
               create_time,
@@ -45,6 +57,10 @@
        <include refid="selectServiceEthicalreviewopinionsVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="deptCode != null ">and dept_code = #{deptCode}</if>
            <if test="deptName != null ">and dept_name = #{deptName}</if>
            <if test="organType != null ">and organ_type = #{organType}</if>
            <if test="caseNo != null ">and case_no = #{caseNo}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
            <if test="expertopinion != null  and expertopinion != ''">and ExpertOpinion = #{expertopinion}</if>
            <if test="expertconclusion != null ">and ExpertConclusion = #{expertconclusion}</if>
@@ -52,8 +68,13 @@
            <if test="conclusiontime != null ">and ConclusionTime = #{conclusiontime}</if>
            <if test="conclusionannex != null  and conclusionannex != ''">and ConclusionAnnex = #{conclusionannex}</if>
            <if test="conclusionorder != null ">and ConclusionOrder = #{conclusionorder}</if>
            <if test="sendType != null ">and send_type = #{sendType}</if>
            <if test="receiveStatus != null ">and receive_status = #{receiveStatus}</if>
            send_type,
            receive_status,
        </where>
    </select>

    <select id="selectVOList" resultType="com.ruoyi.project.domain.vo.EthicalReviewVO">
        SELECT
        service_donatebaseinfo.ID as id,
@@ -104,10 +125,16 @@
        service_donatebaseinfo.deptname,
        service_ethicalreviewopinions.ID as fcid,
        service_ethicalreviewopinions.ExpertOpinion as expertopinion,
        service_ethicalreviewopinions.send_type as sendType,
        service_ethicalreviewopinions.receive_status as receiveStatus,
        service_ethicalreviewopinions.ExpertConclusion as expertconclusion,
        service_ethicalreviewopinions.ExpertName as expertname,
        service_ethicalreviewopinions.ConclusionTime as conclusiontime,
        service_ethicalreviewopinions.ConclusionAnnex as conclusionannex,
        service_ethicalreviewopinions.case_no as case_no,
        service_ethicalreviewopinions.dept_name as dept_name,
        service_ethicalreviewopinions.dept_code as dept_code,
        service_ethicalreviewopinions.organ_type as organ_type,
        service_ethicalreviewopinions.ConclusionOrder as conclusionorder
        FROM
        service_donatebaseinfo
@@ -131,6 +158,9 @@
            <if test="recordstate != null  and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
                #{recordstate}
            </if>
            <if test="caseNo != null  and caseNo != ''">and `service_donatebaseinfo`.`case_no` =
                #{caseNo}
            </if>
            <if test="basecreateby != null  and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
                #{basecreateby}
            </if>
@@ -141,12 +171,13 @@
            </if>
            <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
            <if test="fcid != null ">and `service_ethicalreviewopinions`.`ID` = #{fcid}</if>
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
            <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
        </where>

        order by `service_ethicalreviewopinions`.`ConclusionTime` desc

    </select>

    <select id="countNumber" resultType="java.lang.Integer">
        select count(*)
        from service_donateflowchart

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

@@ -1,50 +1,81 @@
<?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.ServiceMedicalevaluationMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceMedicalevaluation" id="ServiceMedicalevaluationResult">
        <result property="id"    column="ID"    />
        <result property="infoid"    column="InfoID"    />
        <result property="donorno"    column="DonorNo"    />
        <result property="illnessoverview"    column="IllnessOverview"    />
        <result property="diagnosisname"    column="DiagnosisName"    />
        <result property="hospitalassesscontent"    column="HospitalAssessContent"    />
        <result property="hospitalassessdoctor"    column="HospitalAssessDoctor"    />
        <result property="hospitalassesstime"    column="HospitalAssessTime"    />
        <result property="hospitalassessconclusion"    column="HospitalAssessConclusion"    />
        <result property="provincialassesscontent"    column="ProvincialAssessContent"    />
        <result property="provincialassessdoctor"    column="ProvincialAssessDoctor"    />
        <result property="provincialassesstime"    column="ProvincialAssessTime"    />
        <result property="provincialassessconclusion"    column="ProvincialAssessConclusion"    />
        <result property="coreteamassesscontent"    column="CoreTeamAssessContent"    />
        <result property="coreteamassessdoctor"    column="CoreTeamAssessDoctor"    />
        <result property="coreteamassesstime"    column="CoreTeamAssessTime"    />
        <result property="coreteamassessconclusion"    column="CoreTeamAssessConclusion"    />
        <result property="assessannex"    column="AssessAnnex"    />
        <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="infoid" column="InfoID"/>
        <result property="caseNo" column="case_no"/>
        <result property="donorno" column="DonorNo"/>
        <result property="illnessoverview" column="IllnessOverview"/>
        <result property="diagnosisname" column="DiagnosisName"/>
        <result property="hospitalassesscontent" column="HospitalAssessContent"/>
        <result property="hospitalassessdoctor" column="HospitalAssessDoctor"/>
        <result property="hospitalassesstime" column="HospitalAssessTime"/>
        <result property="hospitalassessconclusion" column="HospitalAssessConclusion"/>
        <result property="provincialassesscontent" column="ProvincialAssessContent"/>
        <result property="provincialassessdoctor" column="ProvincialAssessDoctor"/>
        <result property="provincialassesstime" column="ProvincialAssessTime"/>
        <result property="provincialassessconclusion" column="ProvincialAssessConclusion"/>
        <result property="coreteamassesscontent" column="CoreTeamAssessContent"/>
        <result property="coreteamassessdoctor" column="CoreTeamAssessDoctor"/>
        <result property="coreteamassesstime" column="CoreTeamAssessTime"/>
        <result property="coreteamassessconclusion" column="CoreTeamAssessConclusion"/>
        <result property="assessannex" column="AssessAnnex"/>
        <result property="assessState" column="assess_state"/>
        <result property="assessFirstTime" column="assess_first_time"/>
        <result property="assessSecondTime" column="assess_second_time"/>
        <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="selectServiceMedicalevaluationVo">
        select ID, InfoID, DonorNo, IllnessOverview, DiagnosisName, HospitalAssessContent, HospitalAssessDoctor, HospitalAssessTime, HospitalAssessConclusion, ProvincialAssessContent, ProvincialAssessDoctor, ProvincialAssessTime, ProvincialAssessConclusion, CoreTeamAssessContent, CoreTeamAssessDoctor, CoreTeamAssessTime, CoreTeamAssessConclusion, AssessAnnex, del_flag, create_by, create_time, update_by, update_time from service_medicalevaluation
        select ID,
               InfoID,
               case_no,
               assess_second_time,
               assess_first_time,
               DonorNo,
               assess_state,
               IllnessOverview,
               DiagnosisName,
               HospitalAssessContent,
               HospitalAssessDoctor,
               HospitalAssessTime,
               HospitalAssessConclusion,
               ProvincialAssessContent,
               ProvincialAssessDoctor,
               ProvincialAssessTime,
               ProvincialAssessConclusion,
               CoreTeamAssessContent,
               CoreTeamAssessDoctor,
               CoreTeamAssessTime,
               CoreTeamAssessConclusion,
               AssessAnnex,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time
        from service_medicalevaluation
    </sql>

    <select id="selectServiceMedicalevaluationList" parameterType="com.ruoyi.project.domain.ServiceMedicalevaluation" resultMap="ServiceMedicalevaluationResult">
    <select id="selectServiceMedicalevaluationList" parameterType="com.ruoyi.project.domain.ServiceMedicalevaluation"
            resultMap="ServiceMedicalevaluationResult">
        <include refid="selectServiceMedicalevaluationVo"/>
        <where>
            <if test="donorno != null  and donorno != ''"> and DonorNo = #{donorno}</if>
            <if test="donorno != null  and donorno != ''">and DonorNo = #{donorno}</if>
        </where>
    </select>



    <select id="selectVOList" resultType="com.ruoyi.project.domain.vo.MedicalEvaluationVO">
    SELECT
        SELECT
        `service_donatebaseinfo`.`ID` AS `ID`,
        `service_donatebaseinfo`.`Name` AS `Name`,
        `service_donatebaseinfo`.`Sex` AS `Sex`,
@@ -73,6 +104,7 @@
        `service_donatebaseinfo`.`termination_case` AS `terminationCase`,
        `service_donatebaseinfo`.`donatetime` AS `donatetime`,
        `service_medicalevaluation`.`ID` AS `meID`,
        `service_medicalevaluation`.`case_no` AS `case_no`,
        `service_medicalevaluation`.`HospitalAssessContent` AS `HospitalAssessContent`,
        `service_medicalevaluation`.`HospitalAssessConclusion` AS `HospitalAssessConclusion`,
        `service_medicalevaluation`.`ProvincialAssessContent` AS `ProvincialAssessContent`,
@@ -93,36 +125,51 @@
        `service_medicalevaluation`.`create_time` AS `createtime`,
        `service_medicalevaluation`.`create_by` AS `createby`,
        `service_medicalevaluation`.`update_by` AS `updateby`,
        `service_medicalevaluation`.`assess_state` AS `assess_state`,
        `service_medicalevaluation`.`assess_second_time` AS `assess_second_time`,
        `service_medicalevaluation`.`assess_first_time` AS `assess_first_time`,
        `service_medicalevaluation`.`update_time` AS `updatetime`
        FROM
            `service_donatebaseinfo`
            LEFT JOIN `service_medicalevaluation` ON
            `service_donatebaseinfo`.`ID` = `service_medicalevaluation`.`InfoID`
        `service_donatebaseinfo`
        LEFT JOIN `service_medicalevaluation` ON
        `service_donatebaseinfo`.`ID` = `service_medicalevaluation`.`InfoID`
        LEFT JOIN `base_organization` ON
        `base_organization`.`OrganizationID` = `service_donatebaseinfo`.`TreatmentHospitalNo`
        <where>
            service_medicalevaluation.del_flag = 0
            and service_donatebaseinfo.del_flag = 0
            <if test="name != null  and name != ''"> and `service_donatebaseinfo`.Name like concat('%', #{name}, '%')</if>
            <if test="donorno != null  and donorno != ''"> and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
            <if test="idcardno != null  and idcardno != ''"> and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''"> and `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}</if>
            <if test="recordstate != null  and recordstate != ''"> and `service_donatebaseinfo`.`RecordState` = #{recordstate}</if>
            <if test="basecreateby != null  and basecreateby != ''"> and `service_donatebaseinfo`.`create_by` = #{basecreateby}</if>
            <if test="starttime != null "> and `service_medicalevaluation`.CoreTeamAssessTime >= #{starttime} </if>
            <if test="endtime != null ">  and `service_medicalevaluation`.CoreTeamAssessTime &lt;= #{endtime}</if>
            <if test="reporterno != null  and reporterno != ''"> and `service_donatebaseinfo`.ReporterNo = #{reporterno}</if>
            <if test="city != null and city != ''"> and `base_organization`.`City` = #{city}</if>
            <if test="workflow != null "> and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
    </where>
            <if test="name != null  and name != ''">and `service_donatebaseinfo`.Name like concat('%', #{name}, '%')
            </if>
            <if test="donorno != null  and donorno != ''">and `service_donatebaseinfo`.`DonorNo` = #{donorno}</if>
            <if test="caseNo != null  and caseNo != ''">and `service_donatebaseinfo`.`case_no` = #{caseNo}</if>
            <if test="idcardno != null  and idcardno != ''">and `service_donatebaseinfo`.`IDCardNo` = #{idcardno}</if>
            <if test="treatmenthospitalno != null  and treatmenthospitalno != ''">and
                `service_donatebaseinfo`.`TreatmentHospitalNo` = #{treatmenthospitalno}
            </if>
            <if test="recordstate != null  and recordstate != ''">and `service_donatebaseinfo`.`RecordState` =
                #{recordstate}
            </if>
            <if test="basecreateby != null  and basecreateby != ''">and `service_donatebaseinfo`.`create_by` =
                #{basecreateby}
            </if>
            <if test="starttime != null ">and `service_medicalevaluation`.CoreTeamAssessTime >= #{starttime}</if>
            <if test="endtime != null ">and `service_medicalevaluation`.CoreTeamAssessTime &lt;= #{endtime}</if>
            <if test="reporterno != null  and reporterno != ''">and `service_donatebaseinfo`.ReporterNo =
                #{reporterno}
            </if>
            <if test="city != null and city != ''">and `base_organization`.`City` = #{city}</if>
            <if test="workflow != null ">and `service_donatebaseinfo`.`workflow` = #{workflow}</if>
        </where>

        order by `service_medicalevaluation`.`create_time` desc,
        `service_donatebaseinfo`.`create_time` desc
    </select>

    <select id="countNumber" resultType="java.lang.Integer">
        select count(*) from service_medicalevaluation
        where CoreTeamAssessTime >= #{starttime} and CoreTeamAssessTime &lt;= #{endtime}
        select count(*)
        from service_medicalevaluation
        where CoreTeamAssessTime >= #{starttime}
          and CoreTeamAssessTime &lt;= #{endtime}
    </select>

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,90 @@
<?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.ServiceMedicalevaluationorganMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceMedicalevaluationorgan" id="ServiceMedicalevaluationorganResult">
        <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="Organ_state"/>
        <result property="notgetreason" column="notgetreason"/>
        <result property="organAssessTime" column="Organ_assess_time"/>
        <result property="organAssessDoct" column="Organ_assess_doct"/>
        <result property="gainhospitalno" column="GainHospitalNo"/>
        <result property="gainhospitalname" column="GainHospitalName"/>
        <result property="isbiopsybefore" column="IsBiopsyBefore"/>
        <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="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="selectServiceMedicalevaluationorganVo">
        select ID,
               InfoID,
               DonorNo,
               OrganNo,
               OrganName,
               OrganNumber,
               Organ_state,
               notgetreason,
               Organ_assess_time,
               Organ_assess_doct,
               GainHospitalNo,
               GainHospitalName,
               IsBiopsyBefore,
               IsBiopsyAfter,
               IsMarginalOrgan,
               IsPathogenPositive,
               IsPNF,
               IsDGF,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time
        from service_medicalevaluationorgan
    </sql>

    <select id="selectServiceMedicalevaluationorganList"
            parameterType="com.ruoyi.project.domain.ServiceMedicalevaluationorgan"
            resultMap="ServiceMedicalevaluationorganResult">
        <include refid="selectServiceMedicalevaluationorganVo"/>
        <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 Organ_state = #{organState}</if>
            <if test="notgetreason != null  and notgetreason != ''">and notgetreason = #{notgetreason}</if>
            <if test="organAssessTime != null ">and Organ_assess_time = #{organAssessTime}</if>
            <if test="organAssessDoct != null  and organAssessDoct != ''">and Organ_assess_doct = #{organAssessDoct}
            </if>
            <if test="gainhospitalno != null  and gainhospitalno != ''">and GainHospitalNo = #{gainhospitalno}</if>
            <if test="gainhospitalname != null  and gainhospitalname != ''">and GainHospitalName like concat('%',
                #{gainhospitalname}, '%')
            </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/ServiceTransportFileMapper.xml

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,51 @@
<?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.ServiceTransportFileMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceTransportFile" id="ServiceTransportFileResult">
        <result property="id" column="id"/>
        <result property="transportId" column="transport_id"/>
        <result property="caseNo" column="case_no"/>
        <result property="fileName" column="file_name"/>
        <result property="type" column="type"/>
        <result property="path" column="path"/>
        <result property="remart" column="remart"/>
        <result property="delFlag" column="del_flag"/>
        <result property="createTime" column="create_time"/>
        <result property="createBy" column="create_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="updateBy" column="update_by"/>
    </resultMap>

    <sql id="selectServiceTransportFileVo">
        select id,
               transport_id,
               file_name,
               case_no,
               type,
               path,
               remart,
               del_flag,
               create_time,
               create_by,
               update_time,
               update_by
        from service_transport_file
    </sql>

    <select id="selectServiceTransportFileList" parameterType="com.ruoyi.project.domain.ServiceTransportFile"
            resultMap="ServiceTransportFileResult">
        <include refid="selectServiceTransportFileVo"/>
        <where>
            <if test="transportId != null  and transportId != ''">and transport_id = #{transportId}</if>
            <if test="fileName != null  and fileName != ''">and file_name = #{fileName}</if>
            <if test="caseNo != null  and caseNo != ''">and case_no = #{caseNo}</if>
            <if test="type != null  and type != ''">and type = #{type}</if>
            <if test="path != null  and path != ''">and path = #{path}</if>
            <if test="remart != null  and remart != ''">and remart = #{remart}</if>
        </where>
    </select>

</mapper>

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,104 @@
<?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.ServiceTransportMapper">

    <resultMap type="com.ruoyi.project.domain.ServiceTransport" id="ServiceTransportResult">
        <result property="id" column="id"/>
        <result property="reportId" column="report_id"/>
        <result property="caseNo" column="case_no"/>
        <result property="patName" column="pat_name"/>
        <result property="sex" column="sex"/>
        <result property="age" column="age"/>
        <result property="diagnosisname" column="DiagnosisName"/>
        <result property="treatmentHospitalName" column="Treatment_hospital_name"/>
        <result property="treatmentDeptName" column="Treatment_dept_name"/>
        <result property="transportStartTime" column="transport_start_time"/>
        <result property="transportStartPlace" column="transport_start_place"/>
        <result property="contactPerson" column="Contact_person"/>
        <result property="doctor" column="doctor"/>
        <result property="doctorPhone" column="doctor_phone"/>
        <result property="nurse" column="nurse"/>
        <result property="nursePhone" column="nurse_phone"/>
        <result property="driver" column="driver"/>
        <result property="driverPhone" column="driver_phone"/>
        <result property="icuDoctor" column="icu_doctor"/>
        <result property="icuDoctorPhone" column="icu_doctor_phone"/>
        <result property="delFlag" column="del_flag"/>
        <result property="remark" column="remark"/>
        <result property="transitStatus" column="transit_status"/>
        <result property="createTime" column="create_time"/>
        <result property="createBy" column="create_by"/>
        <result property="updateTime" column="update_time"/>
        <result property="updateBy" column="update_by"/>
    </resultMap>

    <sql id="selectServiceTransportVo">
        select id,
               report_id,
               case_no,
               pat_name,
               transit_status,
               remark,
               sex,
               age,
               DiagnosisName,
               Treatment_hospital_name,
               Treatment_dept_name,
               transport_start_time,
               transport_start_place,
               Contact_person,
               doctor,
               doctor_phone,
               nurse,
               nurse_phone,
               driver,
               driver_phone,
               icu_doctor,
               icu_doctor_phone,
               del_flag,
               create_time,
               create_by,
               update_time,
               update_by
        from service_transport
    </sql>

    <select id="selectServiceTransportList" parameterType="com.ruoyi.project.domain.ServiceTransport"
            resultMap="ServiceTransportResult">
        <include refid="selectServiceTransportVo"/>
        <where>
            <if test="caseNo != null  and caseNo != ''">and case_no = #{caseNo}</if>
            <if test="patName != null  and patName != ''">and pat_name like concat('%', #{patName}, '%')</if>
            <if test="sex != null  and sex != ''">and sex = #{sex}</if>
            <if test="reportId != null ">and report_id = #{reportId}</if>
            <if test="age != null ">and age = #{age}</if>
            <if test="diagnosisname != null  and diagnosisname != ''">and DiagnosisName like concat('%',
                #{diagnosisname}, '%')
            </if>
            <if test="treatmentHospitalName != null  and treatmentHospitalName != ''">and Treatment_hospital_name like
                concat('%', #{treatmentHospitalName}, '%')
            </if>
            <if test="treatmentDeptName != null  and treatmentDeptName != ''">and Treatment_dept_name like concat('%',
                #{treatmentDeptName}, '%')
            </if>
            <if test="transportStartTime != null ">and transport_start_time = #{transportStartTime}</if>
            <if test="transportStartPlace != null  and transportStartPlace != ''">and transport_start_place =
                #{transportStartPlace}
            </if>
            <if test="contactPerson != null  and contactPerson != ''">and Contact_person = #{contactPerson}</if>
            <if test="doctor != null  and doctor != ''">and doctor = #{doctor}</if>
            <if test="doctorPhone != null  and doctorPhone != ''">and doctor_phone = #{doctorPhone}</if>
            <if test="nurse != null  and nurse != ''">and nurse = #{nurse}</if>
            <if test="nursePhone != null  and nursePhone != ''">and nurse_phone = #{nursePhone}</if>
            <if test="driver != null  and driver != ''">and driver = #{driver}</if>
            <if test="driverPhone != null  and driverPhone != ''">and driver_phone = #{driverPhone}</if>
            <if test="icuDoctor != null  and icuDoctor != ''">and icu_doctor = #{icuDoctor}</if>
            <if test="icuDoctorPhone != null  and icuDoctorPhone != ''">and icu_doctor_phone = #{icuDoctorPhone}</if>
            <if test="transitStatus != null ">and transit_status = #{transitStatus}</if>
            <if test="remark != null ">and remark = #{remark}</if>
        </where>
    </select>

</mapper>

 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java

@@ -95,7 +95,7 @@
                List<ServiceFund> serviceFunds = serviceFundService.queryInfoById(serviceFund);
                ServiceFund serviceFund1 = serviceFunds.get(0);
                serviceFund1.setFlowlevel(100L);
                serviceFund1.setDel_flag(0);
                serviceFund1.setDelFlag(0);
                serviceFund1.setRecordstatus(-1);
                serviceFund1.setBackflowlevel(199);
                serviceFundService.updateById(serviceFund1);
@@ -737,7 +737,7 @@
        ServiceFund serviceFund = new ServiceFund();
        serviceFund.setFlowlevel(totallevel);
        serviceFund.setUploadStates(1);
        serviceFund.setDel_flag(0);
        serviceFund.setDelFlag(0);
        serviceFund.setApplytype(applyType);
        List<ServiceFund> serviceFundList = serviceFundService.queryList(serviceFund);
        for (ServiceFund serviceFund1 : serviceFundList) {