变更

liusheng

2024-07-29 0662ed4d69b6270dec5c2214454023dfe8d46308

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

@@ -15,6 +15,7 @@
import com.ruoyi.project.mapper.*;
import com.ruoyi.project.service.*;
import com.ruoyi.system.mapper.SysUserMapper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -31,6 +32,7 @@
 * @author ruoyi
 * @date 2021-11-13
 */
@Slf4j
@Service
public class ServiceDonatebaseinfoServiceImpl extends ServiceImpl<ServiceDonatebaseinfoMapper, ServiceDonatebaseinfo> implements IServiceDonatebaseinfoService {

@@ -221,7 +223,9 @@
            }
        }
        if (b == 1) {
            serviceDonatebaseinfo.setCreateBy(user.getUserName());
//            serviceDonatebaseinfo.setCreateBy(user.getUserName());
            log.info("user.getUserName()的值为 ---- ：{}", user.getUserName());
            serviceDonatebaseinfo.setReporterno(user.getUserName());
        }
        if (b == 2) {
            serviceDonatebaseinfo.setDeptid(user.getDeptId());
@@ -273,6 +277,7 @@

    @Override
    public Map<String, Object> getWorkFlow(Long id) {
        log.info("getWorkFlow的入参ID为：{}", id);
        //用于返回
        Map<String, Object> map = new ConcurrentHashMap<>();

@@ -302,14 +307,17 @@
        }
        donatebaseinfo.put("process", "");
        //封装serviceDonateorgan潜在捐献返回数据
        log.info("检查封装潜在捐献返回数据donatebaseinfo的值为：{}", donatebaseinfo);
        map.put("donatebaseinfo", donatebaseinfo);

        //封装医学评估
        log.info("检查serviceDonatebaseinfo.getWorkflow()的值为：{}", serviceDonatebaseinfo.getWorkflow());
        Map<String, String> medicalevaluation = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 1) {
            ServiceMedicalevaluation serviceMedicalevaluation = new ServiceMedicalevaluation();
            serviceMedicalevaluation.setInfoid(id);
            List<ServiceMedicalevaluation> serviceMedicalevaluations = serviceMedicalevaluationService.queryList(serviceMedicalevaluation);
            log.info("检查serviceMedicalevaluationService的值为：{}", serviceMedicalevaluations.size());
            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);
@@ -332,6 +340,7 @@
            }
        }
        //封装医学评估返回数据
        log.info("检查封装医学评估返回数据medicalevaluation的值为：{}", medicalevaluation);
        map.put("medicalevaluation", medicalevaluation);

        //封装捐献确认
@@ -340,6 +349,7 @@
            ServiceRelativesconfirmation serviceRelativesconfirmation = new ServiceRelativesconfirmation();
            serviceRelativesconfirmation.setInfoid(id);
            List<ServiceRelativesconfirmation> serviceRelativesconfirmations = serviceRelativesconfirmationService.queryList(serviceRelativesconfirmation);
            log.info("检查serviceRelativesconfirmations的值为：{}", serviceRelativesconfirmations.size());
            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()) : "");
@@ -362,6 +372,7 @@
            }
        }
        //封装捐献确认返回数据
        log.info("检查封装捐献确认返回数据relativesconfirmation的值为：{}", relativesconfirmation);
        map.put("relativesconfirmation", relativesconfirmation);


@@ -371,6 +382,7 @@
            ServiceEthicalreviewopinions serviceDonateflowchart = new ServiceEthicalreviewopinions();
            serviceDonateflowchart.setInfoid(id);
            List<ServiceEthicalreviewopinions> serviceEthicalreviewopinionsList = iServiceEthicalreviewopinionsService.queryList(serviceDonateflowchart);
            log.info("检查serviceEthicalreviewopinionsList的值为：{}", serviceEthicalreviewopinionsList.size());
            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()) : "");
@@ -394,6 +406,7 @@
            }
        }
        //封装伦理审查返回数据
        log.info("检查封装伦理审查返回数据donateflowcharts的值为：{}", donateflowcharts);
        map.put("donateflowcharts", donateflowcharts);

        //封装器官分配
@@ -402,6 +415,7 @@
            ServiceDonateorgan serviceDonateorgan = new ServiceDonateorgan();
            serviceDonateorgan.setInfoid(id);
            List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganService.queryList(serviceDonateorgan);
            log.info("检查serviceDonateorgans的值为：{}", serviceDonateorgans.size());
            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()) : "");
@@ -424,6 +438,7 @@
                donateorgansService.put("process", "");
            }
        }
        log.info("检查封装器官分配返回数据donateorgansService的值为：{}", donateorgansService);
        //封装器官分配返回数据
        map.put("donateorgansService", donateorgansService);

@@ -431,6 +446,7 @@
        Map<String, String> donationwitness = new HashMap<>();
        if (serviceDonatebaseinfo.getWorkflow() >= 5) {
            ServiceDonationwitness serviceDonationwitness = serviceDonationwitnessService.getByInfoId(id);
            log.info("检查serviceDonationwitness的值为：{}", serviceDonationwitness);
            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()) : "");
@@ -453,6 +469,7 @@
                donationwitness.put("process", "");
            }
        }
        log.info("检查封装获取见证返回数据donationwitness的值为：{}", donationwitness);
        //封装获取见证返回数据
        map.put("donationwitness", donationwitness);

@@ -462,6 +479,7 @@
            ServiceDonatecompletioninfo serviceDonatecompletioninfo = new ServiceDonatecompletioninfo();
            serviceDonatecompletioninfo.setInfoid(id);
            List<ServiceDonatecompletioninfo> serviceDonatecompletioninfos = serviceDonatecompletioninfoService.queryList(serviceDonatecompletioninfo);
            log.info("检查serviceDonatecompletioninfos的值为：{}", serviceDonatecompletioninfos);
            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()) : "");
@@ -484,6 +502,7 @@
                donatecompletioninfo.put("process", "");
            }
        }
        log.info("检查封装完成登记返回数据donatecompletioninfo的值为：{}", donatecompletioninfo);
        //封装完成登记返回数据
        map.put("donatecompletioninfo", donatecompletioninfo);