变更

liusheng

2024-07-24 b700ed6963d12a004b2d000e2446b4ef31aac0f0

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

@@ -1,10 +1,8 @@
package com.ruoyi.project.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.domain.entity.SysRole;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -21,12 +19,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;

import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Logger;

/**
 * 捐献器官管理Service业务层处理
@@ -237,8 +232,8 @@
    }

    @Override
    public organQuality getOrganQuality(TimeVO timeVO) {
        organQuality og = new organQuality();
    public OrganQuality getOrganQuality(TimeVO timeVO) {
        OrganQuality og = new OrganQuality();

        //本年度获取捐献者数量
        int transferNumber = serviceDonationwitnessMapper.countThisYearByTime(timeVO);
@@ -259,6 +254,9 @@
        int DCDDonaterNumber = serviceDonationwitnessMapper.getDCDDonaterNumberThisYear(timeVO);
        //本年度DBCD来源器官捐献者
        int DBCDDonaterNumber = serviceDonationwitnessMapper.getDBCDDonaterNumberThisYear(timeVO);
        //查出来的transferNumber有问题，先不用了，用下面相加的transferNumber
        transferNumber = DBDDonaterNumber + DCDDonaterNumber + DBCDDonaterNumber;
        log.info("transferNumber的值为：{}, DBDDonaterNumber的值为：{}，   DCDDonaterNumber的值为：{}，   DBCDDonaterNumber的值为：{}", transferNumber, DBDDonaterNumber, DCDDonaterNumber, DBCDDonaterNumber);
        if (transferNumber == 0) {
            og.setOrganProductionRate(0.0);
            og.setDBDDonateRate(0.0);
@@ -297,14 +295,14 @@
            og.setMarginOrganRate(0.0);
            og.setGermPositiveRate(0.0);
        } else {
            log.info("timeVO的值为 ： {}",timeVO);
            log.info("timeVO的值为 ： {}", timeVO);
            TimeVO timeVO1 = DtoConversionUtils.sourceToTarget(timeVO, TimeVO.class);
            timeVO1.setTransplantstate(1);
            //获取本年度已经移植器官数量
            int organTransplantNumber2 = serviceDonateorganMapper.getAllFinishedOrgansThisYear(timeVO1);
            log.info("timeVO1的值为 ： {}",timeVO1);
            log.info("organTransplantNumber2的值为 ： {}",organTransplantNumber2);
            log.info("organTransplantNumber的值为 ： {}",organTransplantNumber);
            log.info("timeVO1的值为 ： {}", timeVO1);
            log.info("organTransplantNumber2的值为 ： {}", organTransplantNumber2);
            log.info("organTransplantNumber的值为 ： {}", organTransplantNumber);
            double organUsedRate = (double) organTransplantNumber2 / (double) organTransplantNumber;
            og.setOrganUsedRate(organUsedRate);

@@ -721,8 +719,8 @@
    }

    @Override
    public List<organInfoVO> getOrganCount(TimeVO timeVO) {
        List<organInfoVO> l = new ArrayList<>();
    public List<OrganInfoVO> getOrganCount(TimeVO timeVO) {
        List<OrganInfoVO> l = new ArrayList<>();

        //List<ServiceDonateorgan> serviceDonateorgans = serviceDonateorganMapper.selectAll(timeVO);
        Map<String, Integer> map_organs = new HashMap<String, Integer>();
@@ -736,17 +734,24 @@

        for (SysDictData sysDictData : data) {
            if (!sysDictData.getDictValue().equals("C00")) {
                int count = serviceDonateorganMapper.getDistinctOrgansCount(sysDictData.getDictValue(), timeVO.getStarttime(), timeVO.getEndtime(), timeVO.getCity(), timeVO.getReporterno());
                map_organs.put(sysDictData.getDictValue(), count);
                DistinctOrgansCount distinctOrgansCount = serviceDonateorganMapper.getDistinctOrgansCount(sysDictData.getDictValue(), timeVO.getStarttime(), timeVO.getEndtime(), timeVO.getCity(), timeVO.getReporterno());
//                map_organs.put(sysDictData.getDictValue(), distinctOrgansCount.getGainsum());
//                map_organs.put("abandonCount", distinctOrgansCount.getAbandonCount());
                OrganInfoVO organ = new OrganInfoVO();
                organ.setOrganNo(sysDictData.getDictValue());
                organ.setCount(distinctOrgansCount.getGainsum());
                organ.setAbandonCount(distinctOrgansCount.getAbandonCount());
                l.add(organ);
            }
        }
        for (Map.Entry<String, Integer> entry : map_organs.entrySet()) {
            organInfoVO organ = new organInfoVO();
            organ.setOrganNo(entry.getKey());
            //organ.setOrganName(serviceDonateorganMapper.getOrganNameByNo(entry.getKey()));
            organ.setCount(entry.getValue());
            l.add(organ);
        }
//        for (Map.Entry<String, Integer> entry : map_organs.entrySet()) {
//            OrganInfoVO organ = new OrganInfoVO();
//            organ.setOrganNo(entry.getKey());
//            //organ.setOrganName(serviceDonateorganMapper.getOrganNameByNo(entry.getKey()));
//            organ.setCount(entry.getValue());
//            organ.setAbandonCount();
//            l.add(organ);
//        }

        return l;
    }