1.大屏接口 2.bug修改

mitao

2025-01-03 ab9346537901418d4cabd62fa5a9bff490f886be

 medicalWaste-system/src/main/java/com/sinata/system/service/biz/StaticsService.java

@@ -6,7 +6,6 @@
import com.sinata.common.core.domain.entity.SysDictData;
import com.sinata.common.utils.CollUtils;
import com.sinata.common.utils.DateUtils;
import com.sinata.system.domain.MedicalWasteStaticsVO;
import com.sinata.system.domain.MwCollectRecord;
import com.sinata.system.domain.MwWarningRecord;
import com.sinata.system.domain.SysDepartment;
@@ -61,19 +60,7 @@
    private final MwDisposalRecordService mwDisposalRecordService;
    private final MwDisposalHandleRecordService mwDisposalHandleRecordService;

    /**
     * 机构分布-获取机构列表
     *
     * @param type 1：全部 2：医院 3：处置单位
     * @return
     */
    public List<SysDepartment> departmentList(Integer type) {
        return sysDepartmentService.lambdaQuery().eq(type != 1, SysDepartment::getOrgType, type).list();
    }

    public MedicalWasteStaticsVO medicalWaste() {
        return null;
    }

    /**
     * 医院报表
@@ -246,6 +233,7 @@
                if (CollUtils.isNotEmpty(wasteTypeList)) {
                    vo.setLegend(wasteTypeList.stream().map(SysDictData::getDictLabel).collect(Collectors.toList()));
                    vo.getLegend().add("小计");
                    List<DepartmentReportItemVO> list = new ArrayList<>();
                    for (TransformVO transformVO : checkoutRecordVOList) {
                        BigDecimal totalCount = BigDecimal.ZERO;
                        BigDecimal totalWeight = BigDecimal.ZERO;
@@ -265,7 +253,9 @@
                        }
                        departmentReportItemVO.getData().add(totalCount);
                        departmentReportItemVO.getData().add(totalWeight);
                        list.add(departmentReportItemVO);
                    }
                    vo.setList(list);
                }
            }
        }