变更

liusheng

2024-07-26 fb4d7127cd860b39e1c1c4242cfbbc09a659fc7a

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

@@ -719,41 +719,33 @@
    }

    @Override
    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>();
        //List<String> organNo = new ArrayList<>();
    public Map<String, Object> getOrganCount(TimeVO timeVO) {
        Map<String, Object> map = new HashMap<>();
        List<OrganInfoVO> organInfoVOList = new ArrayList<>();
        Integer countSum = 0;
        Integer abandonCountSum = 0;

        List<SysDictData> data = dictDataMapper.selectDictDataByType("sys_Organ");
        if (StringUtils.isNull(data)) {
            data = new ArrayList<SysDictData>();
        }


        for (SysDictData sysDictData : data) {
            if (!sysDictData.getDictValue().equals("C00")) {
                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);
                countSum = countSum + distinctOrgansCount.getGainsum();
                abandonCountSum = abandonCountSum + distinctOrgansCount.getAbandonCount();
                organInfoVOList.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;
        map.put("countSum", countSum);
        map.put("abandonCountSum", abandonCountSum);
        map.put("organInfoVOList", organInfoVOList);
        return map;
    }

    @Override