From de69956a71ee0d93ff4e9b12e861af6108e2c2e2 Mon Sep 17 00:00:00 2001 From: feng <18691763612@163.com> Date: Fri, 12 Dec 2025 10:57:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=AE=A1=E7=AE=97=E9=9D=99?= =?UTF-8?q?=E6=81=AF=E5=BF=83=E7=8E=87=E8=BF=87=E6=BB=A4=E7=A9=BA=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/WatchDataServiceImpl.java | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java index 244de63..9960353 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java @@ -570,10 +570,10 @@ public class WatchDataServiceImpl extends ServiceImpl ObjectUtil.isNotNull(f.getMinValue())) .mapToInt(WatchStatUserInfoDayHeartRate::getMinValue).min().orElse(0); // 和 - int sum = list.stream() - .filter(f -> ObjectUtil.isNotNull(f.getAvgValue())) - .mapToInt(WatchStatUserInfoDayHeartRate::getAvgValue).sum(); - + List heartRateList = list.stream() + .filter(f -> ObjectUtil.isNotNull(f.getAvgValue()) && f.getAvgValue() > 0) + .collect(Collectors.toList()); + int sum = heartRateList.stream().mapToInt(WatchStatUserInfoDayHeartRate::getAvgValue).sum(); // 最大值 int skinMax = list.stream() .filter(f -> ObjectUtil.isNotNull(f.getSilenceMaxValue())) @@ -583,17 +583,17 @@ public class WatchDataServiceImpl extends ServiceImpl ObjectUtil.isNotNull(f.getSilenceMinValue())) .mapToInt(WatchStatUserInfoDayHeartRate::getSilenceMinValue).min().orElse(0); // 和 - int skinSum = list.stream() - .filter(f -> ObjectUtil.isNotNull(f.getSilenceAvgValue())) - .mapToInt(WatchStatUserInfoDayHeartRate::getSilenceAvgValue).sum(); - + List silenceList = list.stream() + .filter(f -> ObjectUtil.isNotNull(f.getSilenceAvgValue()) && f.getSilenceAvgValue() > 0) + .collect(Collectors.toList()); + int skinSum = silenceList.stream().mapToInt(WatchStatUserInfoDayHeartRate::getSilenceAvgValue).sum(); stat.setMax(max); stat.setMin(min); - stat.setAvg((sum / list.size())); + stat.setAvg((sum / heartRateList.size())); stat.setSilenceMax(skinMax); stat.setSilenceMin(skinMin); - stat.setSilenceAvg(skinSum / list.size()); + stat.setSilenceAvg(skinSum / silenceList.size()); return stat; }