Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupServiceImpl.java

@@ -105,8 +105,16 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
             pageUtils.setTotalAmount(new BigDecimal("0.0000"));
             return pageUtils;
         }
+        List<CostIncomeGroup> list = this.list(new QueryWrapper<CostIncomeGroup>().lambda()
+                .eq(Objects.nonNull(hospId), CostIncomeGroup::getHospId, hospId)
+                .eq(!NumberConstant.ZERO.equals(year), CostIncomeGroup::getDateYear, year)
+                .eq(!NumberConstant.ZERO.equals(month), CostIncomeGroup::getDateMonth, month)
+                .and(StrUtil.isNotBlank(responsibilityCode), i -> i.like(CostIncomeGroup::getOpenResponsibilityCode, responsibilityCode)
+                        .or().like(CostIncomeGroup::getStartResponsibilityCode, responsibilityCode))
+                .like(StrUtil.isNotBlank(productCode), CostIncomeGroup::getProductCode, productCode));
         // 进行金额合并
-        List<Long> idList = costIncomeGroupBeforeVOList.stream().map(CostIncomeGroupBeforeVO::getId).collect(Collectors.toList());
+        List<CostIncomeGroupBeforeVO> costIncomeGroupBeforeVOList1 = BeanUtil.convertList(list, CostIncomeGroupBeforeVO.class);
+        List<Long> idList = costIncomeGroupBeforeVOList1.stream().map(CostIncomeGroupBeforeVO::getId).collect(Collectors.toList());
         List<CostIncomeGroupAllAmountVO> costIncomeGroupAllAmountVoS = baseMapper.countMoney(idList);
         // 查询所有的责任中心 科室 会计科目  成本项目的数据  处理名字
         setCodeName(costIncomeGroupAllAmountVoS);