From 0852acae13603be95eaaa0b501f3441508ff3fe5 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 14 四月 2025 09:52:12 +0800
Subject: [PATCH] 大屏统计修改
---
medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
index 89f29ce..55e7046 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwMicroEquipmentRecordServiceImpl.java
@@ -245,13 +245,13 @@
).map(MwMicroEquipmentStaticsVO::getWeight).reduce(BigDecimal.ZERO, BigDecimal::add).setScale(2, RoundingMode.HALF_UP);
long count = staticsData.stream().filter(e -> e.getWasteType().equals(sysDictData.getDictCode())
&& finalSdf.format(e.getUseTime()).equals(date)).count();
- departmentReportItemVO.getData().add(weight);
departmentReportItemVO.getData().add(BigDecimal.valueOf(count));
- totalWeight = totalWeight.add(weight);
+ departmentReportItemVO.getData().add(weight);
totalCount = totalCount.add(BigDecimal.valueOf(count));
+ totalWeight = totalWeight.add(weight);
}
- departmentReportItemVO.getData().add(totalWeight);
departmentReportItemVO.getData().add(totalCount);
+ departmentReportItemVO.getData().add(totalWeight);
result.add(departmentReportItemVO);
}
@@ -370,11 +370,11 @@
headTitles.add(Lists.newArrayList(title, "日期", "日期"));
String finalTitle = title;
medicalWasteTypeList.forEach(item -> {
- headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总数量"));
+ headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "数量"));
headTitles.add(Lists.newArrayList(finalTitle, item.getDictLabel(), "总重量（kg）"));
});
- headTitles.add(Lists.newArrayList(title, "小计", "总重量（KG）"));
- headTitles.add(Lists.newArrayList(title, "小计", "总数量"));
+ headTitles.add(Lists.newArrayList(title, "小计", "数量"));
+ headTitles.add(Lists.newArrayList(title, "小计", "总重量（kg）"));
return headTitles;
}
--
Gitblit v1.7.1