代码提交

liusheng

2024-03-05 0c5e744bd9b52147c7fc273ec8fe7bd7afea0ebb

代码提交

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

@@ -6,6 +6,7 @@
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.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseOrganization;
import com.ruoyi.project.service.IBaseOrganizationService;
@@ -85,10 +86,21 @@
    @RepeatSubmit
    public AjaxResult add(@RequestBody BaseOrganization baseOrganization) {
        log.info("新增机构信息{}：", baseOrganization);
        String organization = onlyValueCommon.addOnlyValue("organization");
        //"0"+地市编码+医院类型+序号
        baseOrganization.setOrganizationid("0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature() + organization);

        //"0"+地市编码+医院类型
        String str = "0" + baseOrganization.getRegionallevel() + baseOrganization.getHospitalnature();
        String maxOrganizationID = baseOrganizationService.getMaxOrganizationID(str + "__");
        if (StringUtils.isNotBlank(maxOrganizationID)) {
            String result = maxOrganizationID.substring(str.length());
            //获取序号，+1，生成新的序号
            int xh = Integer.valueOf(result) + 1;
            if (String.valueOf(xh).length() > 1) {
                baseOrganization.setOrganizationid(str + xh);
            } else {
                baseOrganization.setOrganizationid(str + "0" + xh);
            }
        } else {
            baseOrganization.setOrganizationid(str + str + "01");
        }
        boolean save = baseOrganizationService.save(baseOrganization);
        log.info("新增机构信息baseOrganization的ID{}：", baseOrganization.getId());
        return AjaxResult.success(baseOrganization);

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

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

import com.alibaba.fastjson.JSON;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
@@ -7,8 +8,10 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.bean.DtoConversionUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.ServiceDonorchargeorgan;
import com.ruoyi.project.domain.ServiceDonorchargeorganVO;
import com.ruoyi.project.service.IServiceDonorchargeorganService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -18,6 +21,7 @@
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;

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

@@ -78,7 +82,11 @@
    @Log(title = "捐献器官", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    @RepeatSubmit
    public AjaxResult add(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
    public AjaxResult add(@RequestBody ServiceDonorchargeorganVO serviceDonorchargeorganvo) {
        if (!CollectionUtils.isEmpty(serviceDonorchargeorganvo.getAnnexFilesList())) {
            serviceDonorchargeorganvo.setAnnexFiles(JSON.toJSONString(serviceDonorchargeorganvo.getAnnexFilesList()));
        }
        ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonorchargeorganvo, ServiceDonorchargeorgan.class);
        boolean save = serviceDonorchargeorganService.save(serviceDonorchargeorgan);
        return AjaxResult.success(serviceDonorchargeorgan);
    }
@@ -91,7 +99,11 @@
    @Log(title = "捐献器官", businessType = BusinessType.UPDATE)
    @PostMapping("/edit")
    @RepeatSubmit
    public AjaxResult edit(@RequestBody ServiceDonorchargeorgan serviceDonorchargeorgan) {
    public AjaxResult edit(@RequestBody ServiceDonorchargeorganVO serviceDonorchargeorganVO) {
        if (!CollectionUtils.isEmpty(serviceDonorchargeorganVO.getAnnexFilesList())) {
            serviceDonorchargeorganVO.setAnnexFiles(JSON.toJSONString(serviceDonorchargeorganVO.getAnnexFilesList()));
        }
        ServiceDonorchargeorgan serviceDonorchargeorgan = DtoConversionUtils.sourceToTarget(serviceDonorchargeorganVO, ServiceDonorchargeorgan.class);
        return toAjax(serviceDonorchargeorganService.updateById(serviceDonorchargeorgan));
    }


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

@@ -59,14 +59,12 @@
    @ApiOperation("查询未读消息数量")
    @GetMapping("/noreadcount")
    public AjaxResult noreadcount() {
//        LoginUser loginUser = getLoginUser();
//        ServiceSystemmessage serviceSystemmessage = new ServiceSystemmessage();
//        serviceSystemmessage.setReceiveuserno(loginUser.getUsername());
//        serviceSystemmessage.setIsread(0);
//        List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
//        return AjaxResult.success(list.size());
        //   log.info("不用管我，正在测试程序");
        return null;
        LoginUser loginUser = getLoginUser();
        ServiceSystemmessage serviceSystemmessage=new ServiceSystemmessage();
        serviceSystemmessage.setReceiveuserno(loginUser.getUsername());
        serviceSystemmessage.setIsread(0);
        List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
        return AjaxResult.success(list.size());
    }

    /**

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

@@ -31,6 +31,12 @@
    @TableId(type = IdType.AUTO)
    private Long id;

    @ApiModelProperty("关联service_donorpayment表的ID")
    private Long paymentid;

    @ApiModelProperty("关联service_donorpayment表的paymentno")
    private String paymentno;

    /**
     * å…³è”service_donorcharge表的ID
     */
@@ -138,5 +144,26 @@
    @Excel(name = "器官实际收到费用说明")
    private String organchargedesc;

    /**
     * äº‹ä»¶ç¼–号
     */
    @ApiModelProperty("事件编号")
    @Excel(name = "事件编号")
    private String caseno;

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

    /**
     * ç¥¨æ®é™„件
     */
    @ApiModelProperty("票据附件")
    @Excel(name = "票据附件")
    private String annexFiles;

}


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

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

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

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;

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

    @ApiModelProperty("关联service_donorpayment表的paymentno")
    private String paymentno;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

    /**
     * äº‹ä»¶ç¼–号
     */
    @ApiModelProperty("事件编号")
    @Excel(name = "事件编号")
    private String caseno;

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

    /**
     * ç¥¨æ®é™„件
     */
    @ApiModelProperty("票据附件")
    @Excel(name = "票据附件")
    private String annexFiles;

    /**
     * ç¥¨æ®é™„件
     */
    @ApiModelProperty("票据附件集合")
    @Excel(name = "票据附件集合")
    private List<String> annexFilesList;

}


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

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


import com.baomidou.mybatisplus.core.mapper.BaseMapper;

import java.util.List;

import com.ruoyi.common.core.domain.entity.BasePrcaddressDict;
@@ -15,8 +16,7 @@
 * @date 2021-11-05
 */
@Mapper
public interface BaseOrganizationMapper extends BaseMapper<BaseOrganization>
{
public interface BaseOrganizationMapper extends BaseMapper<BaseOrganization> {
    /**
     * æŸ¥è¯¢æœºæž„管理列表
     *
@@ -36,4 +36,6 @@
    List<BaseOrganization> getTransOrg();

    String getNameByNo(String orgno);

    String getMaxOrganizationID(String organizationid);
}

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

@@ -20,4 +20,8 @@
     * @return æœºæž„管理集合
     */
    public List<BaseOrganization> queryList(BaseOrganization baseOrganization);


    public String getMaxOrganizationID(String organizationid);

}

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

@@ -1,14 +1,18 @@
package com.ruoyi.project.service.impl;

import java.util.List;

import com.fasterxml.jackson.databind.ser.Serializers;
import com.ruoyi.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.project.mapper.BaseOrganizationMapper;
import com.ruoyi.project.domain.BaseOrganization;
@@ -21,9 +25,9 @@
 * @date 2021-11-05
 */
@Service
public class BaseOrganizationServiceImpl extends ServiceImpl<BaseOrganizationMapper, BaseOrganization> implements IBaseOrganizationService 
{

public class BaseOrganizationServiceImpl extends ServiceImpl<BaseOrganizationMapper, BaseOrganization> implements IBaseOrganizationService {
    @Autowired
    private BaseOrganizationMapper baseOrganizationMapper;

    /**
     * æŸ¥è¯¢æœºæž„管理列表
@@ -109,4 +113,9 @@
        return this.list(wrappers);
    }

    @Override
    public String getMaxOrganizationID(String organizationid) {
        return baseOrganizationMapper.getMaxOrganizationID(organizationid);

    }
}

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

@@ -54,8 +54,9 @@
    @Autowired
    private IServiceRelativesconfirmationService serviceRelativesconfirmationService;

    //    @Autowired
//    private IServiceDonateflowchartService iServiceDonateflowchartService;
    @Autowired
    private IServiceFundflowruleService serviceFundflowruleService;

    @Autowired
    private IServiceEthicalreviewopinionsService iServiceEthicalreviewopinionsService;

@@ -273,13 +274,29 @@
        Map<String, Object> map = new ConcurrentHashMap<>();

        ServiceDonatebaseinfo serviceDonatebaseinfo = getById(id);

        if (ObjectUtils.isEmpty(serviceDonatebaseinfo)) {
            return null;
        }

        //封装serviceDonateorgan潜在捐献数据
        Map<String, String> donatebaseinfo = new HashMap<>();
        donatebaseinfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getCreateTime()));
        donatebaseinfo.put("updatetime", serviceDonatebaseinfo.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatebaseinfo.getUpdateTime()) : "");
        donatebaseinfo.put("createperson", null);
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getCreateBy())) {
            ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
            serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getCreateBy());
            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
            donatebaseinfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
        }
        donatebaseinfo.put("updateperson", null);
        if (StringUtils.isNotBlank(serviceDonatebaseinfo.getUpdateBy())) {
            ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
            serviceFundflowrule.setCheckuserno(serviceDonatebaseinfo.getUpdateBy());
            List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
            donatebaseinfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
        }
        donatebaseinfo.put("process", "");
        //封装serviceDonateorgan潜在捐献返回数据
        map.put("donatebaseinfo", donatebaseinfo);
@@ -293,6 +310,20 @@
            if (!CollectionUtils.isEmpty(serviceMedicalevaluations)) {
                medicalevaluation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getCreateTime()));
                medicalevaluation.put("updatetime", serviceMedicalevaluations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceMedicalevaluations.get(0).getUpdateTime()) : null);
                medicalevaluation.put("createperson", null);
                if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    medicalevaluation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                medicalevaluation.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceMedicalevaluations.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceMedicalevaluations.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    medicalevaluation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }
                medicalevaluation.put("process", "");
            }
        }
@@ -308,6 +339,20 @@
            if (!CollectionUtils.isEmpty(serviceRelativesconfirmations)) {
                relativesconfirmation.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getCreateTime()));
                relativesconfirmation.put("updatetime", serviceRelativesconfirmations.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceRelativesconfirmations.get(0).getUpdateTime()) : "");
                relativesconfirmation.put("createperson", null);
                if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    relativesconfirmation.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                relativesconfirmation.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceRelativesconfirmations.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceRelativesconfirmations.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    relativesconfirmation.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }
                relativesconfirmation.put("process", "");
            }
        }
@@ -324,6 +369,20 @@
            if (!CollectionUtils.isEmpty(serviceEthicalreviewopinionsList)) {
                donateflowcharts.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getCreateTime()));
                donateflowcharts.put("updatetime", serviceEthicalreviewopinionsList.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceEthicalreviewopinionsList.get(0).getUpdateTime()) : "");
                donateflowcharts.put("createperson", null);
                if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateflowcharts.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donateflowcharts.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceEthicalreviewopinionsList.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceEthicalreviewopinionsList.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateflowcharts.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donateflowcharts.put("process", "");
            }
        }
@@ -339,6 +398,21 @@
            if (!CollectionUtils.isEmpty(serviceDonateorgans)) {
                donateorgansService.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getCreateTime()));
                donateorgansService.put("updatetime", serviceDonateorgans.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonateorgans.get(0).getUpdateTime()) : "");

                donateorgansService.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateorgansService.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donateorgansService.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonateorgans.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonateorgans.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donateorgansService.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donateorgansService.put("process", "");
            }
        }
@@ -352,6 +426,22 @@
            if (!ObjectUtils.isEmpty(serviceDonationwitness)) {
                donationwitness.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getCreateTime()));
                donationwitness.put("updatetime", serviceDonationwitness.getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonationwitness.getUpdateTime()) : "");

                donationwitness.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonationwitness.getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonationwitness.getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donationwitness.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donationwitness.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonationwitness.getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonationwitness.getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donationwitness.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }

                donationwitness.put("process", "");
            }
        }
@@ -367,6 +457,22 @@
            if (!CollectionUtils.isEmpty(serviceDonatecompletioninfos)) {
                donatecompletioninfo.put("createtime", DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getCreateTime()));
                donatecompletioninfo.put("updatetime", serviceDonatecompletioninfos.get(0).getUpdateTime() != null ? DateUtils.parseDateToStr("yyyy-MM-dd HH:mm:ss", serviceDonatecompletioninfos.get(0).getUpdateTime()) : "");

                donatecompletioninfo.put("createperson", null);
                if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getCreateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getCreateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donatecompletioninfo.put("createperson", serviceFundflowrules.get(0).getCheckusername());
                }
                donatecompletioninfo.put("updateperson", null);
                if (StringUtils.isNotBlank(serviceDonatecompletioninfos.get(0).getUpdateBy())) {
                    ServiceFundflowrule serviceFundflowrule = new ServiceFundflowrule();
                    serviceFundflowrule.setCheckuserno(serviceDonatecompletioninfos.get(0).getUpdateBy());
                    List<ServiceFundflowrule> serviceFundflowrules = serviceFundflowruleService.queryList(serviceFundflowrule);
                    donatecompletioninfo.put("updateperson", serviceFundflowrules.get(0).getCheckusername());
                }

                donatecompletioninfo.put("process", "");
            }
        }
@@ -377,5 +483,3 @@
        return map;
    }
}



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

@@ -32,7 +32,8 @@
        LambdaQueryWrapper<ServiceDonorchargeorgan> wrappers = Wrappers.lambdaQuery();
        if (serviceDonorchargeorgan.getInfoid() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getInfoid, serviceDonorchargeorgan.getInfoid());
        }if (serviceDonorchargeorgan.getDonorchargeid() != null) {
        }
        if (serviceDonorchargeorgan.getDonorchargeid() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getDonorchargeid, serviceDonorchargeorgan.getDonorchargeid());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getDonorname())) {
@@ -71,9 +72,21 @@
        if (serviceDonorchargeorgan.getChargestate() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getChargestate, serviceDonorchargeorgan.getChargestate());
        }
        if (serviceDonorchargeorgan.getPaymentid() != null) {
            wrappers.eq(ServiceDonorchargeorgan::getPaymentid, serviceDonorchargeorgan.getPaymentid());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getOrganchargedesc())) {
            wrappers.eq(ServiceDonorchargeorgan::getOrganchargedesc, serviceDonorchargeorgan.getOrganchargedesc());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getPaymentno())) {
            wrappers.eq(ServiceDonorchargeorgan::getPaymentno, serviceDonorchargeorgan.getPaymentno());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getName())) {
            wrappers.eq(ServiceDonorchargeorgan::getName, serviceDonorchargeorgan.getName());
        }
        if (StringUtils.isNotBlank(serviceDonorchargeorgan.getCaseno())) {
            wrappers.eq(ServiceDonorchargeorgan::getCaseno, serviceDonorchargeorgan.getCaseno());
        }
        return this.list(wrappers);
    }


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

@@ -38,13 +38,45 @@
    </resultMap>

    <sql id="selectBaseOrganizationVo">
        select ID, OrganizationName, OrganizationID, LogoUrl, RegisterTime, RegisterAddress, OfficePlace, LegalPerson, ContactPerson, ContactNumber, Introduction, OrganizationType, HospitalNature, RegionalLevel, MedicalCode, del_flag, create_by, create_time, update_by, update_time, Province, ProvinceName, City, CityName, Town, TownName, Community, CommunityName, CountyCode, CountyName from base_organization
        select ID,
               OrganizationName,
               OrganizationID,
               LogoUrl,
               RegisterTime,
               RegisterAddress,
               OfficePlace,
               LegalPerson,
               ContactPerson,
               ContactNumber,
               Introduction,
               OrganizationType,
               HospitalNature,
               RegionalLevel,
               MedicalCode,
               del_flag,
               create_by,
               create_time,
               update_by,
               update_time,
               Province,
               ProvinceName,
               City,
               CityName,
               Town,
               TownName,
               Community,
               CommunityName,
               CountyCode,
               CountyName
        from base_organization
    </sql>

    <select id="selectBaseOrganizationList" parameterType="BaseOrganization" resultMap="BaseOrganizationResult">
        <include refid="selectBaseOrganizationVo"/>
        <where>
            <if test="organizationname != null  and organizationname != ''"> and OrganizationName like concat('%', #{organizationname}, '%')</if>
            <if test="organizationname != null  and organizationname != ''">and OrganizationName like concat('%',
                #{organizationname}, '%')
            </if>
            <if test="organizationid != null  and organizationid != ''"> and OrganizationID = #{organizationid}</if>
            <if test="logourl != null  and logourl != ''"> and LogoUrl = #{logourl}</if>
            <if test="registertime != null "> and RegisterTime = #{registertime}</if>
@@ -54,18 +86,23 @@
            <if test="contactperson != null  and contactperson != ''"> and ContactPerson = #{contactperson}</if>
            <if test="contactnumber != null  and contactnumber != ''"> and ContactNumber = #{contactnumber}</if>
            <if test="introduction != null  and introduction != ''"> and Introduction = #{introduction}</if>
            <if test="organizationtype != null  and organizationtype != ''"> and OrganizationType = #{organizationtype}</if>
            <if test="organizationtype != null  and organizationtype != ''">and OrganizationType = #{organizationtype}
            </if>
            <if test="hospitalnature != null  and hospitalnature != ''"> and HospitalNature = #{hospitalnature}</if>
            <if test="regionallevel != null  and regionallevel != ''"> and RegionalLevel = #{regionallevel}</if>
            <if test="medicalcode != null  and medicalcode != ''"> and MedicalCode = #{medicalcode}</if>
            <if test="province != null  and province != ''"> and Province = #{province}</if>
            <if test="provincename != null  and provincename != ''"> and ProvinceName like concat('%', #{provincename}, '%')</if>
            <if test="provincename != null  and provincename != ''">and ProvinceName like concat('%', #{provincename},
                '%')
            </if>
            <if test="city != null  and city != ''"> and City = #{city}</if>
            <if test="cityname != null  and cityname != ''"> and CityName like concat('%', #{cityname}, '%')</if>
            <if test="town != null  and town != ''"> and Town = #{town}</if>
            <if test="townname != null  and townname != ''"> and TownName like concat('%', #{townname}, '%')</if>
            <if test="community != null  and community != ''"> and Community = #{community}</if>
            <if test="communityname != null  and communityname != ''"> and CommunityName like concat('%', #{communityname}, '%')</if>
            <if test="communityname != null  and communityname != ''">and CommunityName like concat('%',
                #{communityname}, '%')
            </if>
            <if test="countycode != null  and countycode != ''"> and CountyCode = #{countycode}</if>
            <if test="countyname != null  and countyname != ''"> and CountyName like concat('%', #{countyname}, '%')</if>
        </where>
@@ -76,7 +113,8 @@
        where OrganizationID = #{hospitalNo}
    </select>
    <select id="getOrganizationByCity" resultType="java.lang.Integer">
        select count(*) from base_organization
        select count(*)
        from base_organization
        where City = #{cityNumber}
    </select>

@@ -92,8 +130,16 @@
        where OrganizationType = "4"
    </select>
    <select id="getNameByNo" resultType="java.lang.String">
        select OrganizationName from base_organization
        select OrganizationName
        from base_organization
        where OrganizationID =#{orgno}
    </select>

    <select id="getMaxOrganizationID" resultType="java.lang.String">
        select max(OrganizationID)
        from base_organization
        where OrganizationID like concat(#{organizationid})

    </select>

</mapper>

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

@@ -7,6 +7,8 @@
    <resultMap type="com.ruoyi.project.domain.ServiceDonorchargeorgan" id="ServiceDonorchargeorganResult">
        <result property="id" column="ID"/>
        <result property="donorchargeid" column="donorchargeid"/>
        <result property="paymentid" column="paymentid"/>
        <result property="paymentno" column="paymentno"/>
        <result property="donorname" column="donorname"/>
        <result property="hospitalname" column="HospitalName"/>
        <result property="hospitalno" column="HospitalNo"/>
@@ -25,11 +27,16 @@
        <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="name" column="name"/>
        <result property="annexFiles" column="annex_files"/>
    </resultMap>

    <sql id="selectServiceDonorchargeorganVo">
        select ID,
               donorchargeid,
               paymentid,
               paymentno,
               InfoID,
               donorname,
               HospitalName,
@@ -48,7 +55,10 @@
               create_by,
               create_time,
               update_by,
               update_time
               update_time,
               caseno,
               name,
               annex_files
        from service_donorchargeorgan
    </sql>

@@ -57,6 +67,8 @@
        <include refid="selectServiceDonorchargeorganVo"/>
        <where>
            <if test="infoid != null ">and InfoID = #{infoid}</if>
            <if test="paymentid != null ">and paymentid = #{paymentid}</if>
            <if test="paymentno != null ">and paymentno = #{paymentno}</if>
            <if test="donorchargeid != null ">and donorchargeID = #{donorchargeid}</if>
            <if test="donorname != null  and donorname != ''">and donorname like concat('%', #{donorname}, '%')</if>
            <if test="hospitalname != null  and hospitalname != ''">and HospitalName like concat('%', #{hospitalname},