From 6d75714460c53db8e056b85a685cae2837631c05 Mon Sep 17 00:00:00 2001
From: tanglong <842690096@qq.com>
Date: Mon, 1 Jun 2026 10:39:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IServices/ShangWaiMao/IShangWaiMaoService.cs     |  2 +-
 .../Services/ShangWaiMao/ShangWaiMaoService.cs       | 12 +++++-------
 .../Controllers/Business/ShangWaiMaoController.cs    |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/VOL.Business/IServices/ShangWaiMao/IShangWaiMaoService.cs b/VOL.Business/IServices/ShangWaiMao/IShangWaiMaoService.cs
index 2aff06b..1f0a84b 100644
--- a/VOL.Business/IServices/ShangWaiMao/IShangWaiMaoService.cs
+++ b/VOL.Business/IServices/ShangWaiMao/IShangWaiMaoService.cs
@@ -35,6 +35,6 @@ namespace VOL.Business.IServices.ShangWaiMao
         /// </summary>
         /// <param name="paramDto"></param>
         /// <returns></returns>
-        Task<byte[]> ExportHeartRateDataAsync(ShangWaiMaoHeartRateExportParam paramDto);
+        Task<byte[]> ExportHeartRateDataAsync(ShangWaiMaoHeartRateExportParam paramDto);  
     }
 }
diff --git a/VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs b/VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs
index 2ed45e9..2c8e7a4 100644
--- a/VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs
+++ b/VOL.Business/Services/ShangWaiMao/ShangWaiMaoService.cs
@@ -161,14 +161,12 @@ namespace VOL.Business.Services.ShangWaiMao
                 var baseTime = GetMinuteBaseTime(group.Key.CourseStartTime, group.Min(x => x.ScoreTime));
 
                 var minuteData = BuildMinuteData(group, baseTime);
-
                 var duration = minuteData.Count == 0 ? 0 : minuteData.Keys.Max();
-                var avgHeartRate = Math.Round(group.Average(x => x.Value), 2);
-                var avgStrength = Math.Round(group.Average(x => x.Strength), 2);
-                var density = group.Any()
-                    ? Math.Round(group.Count(x => x.Strength > 50) * 100D / group.Count(), 2)
-                    : 0D;
-                var totalConsumption = Math.Round(group.Sum(x => (double)(x.Consumption ?? 0)), 2);
+                var avgHeartRate = (int)group.Average(x => x.Value);
+                var avgStrength = (int)group.Average(x => x.Strength);
+                var density = group.Any() ? Math.Round(group.Count(x => x.Strength > 50) * 100D / group.Count(), 0) : 0D;
+
+                var totalConsumption = Math.Abs((int)group.Average(x => x.Consumption ?? 0));
 
                 summarySheet.Cells[summaryRowIndex, 1].Value = group.Key.StudentName;
                 summarySheet.Cells[summaryRowIndex, 2].Value = group.Key.StudentNo;
diff --git a/VOL.WebApi/Controllers/Business/ShangWaiMaoController.cs b/VOL.WebApi/Controllers/Business/ShangWaiMaoController.cs
index f724b0d..493ccb9 100644
--- a/VOL.WebApi/Controllers/Business/ShangWaiMaoController.cs
+++ b/VOL.WebApi/Controllers/Business/ShangWaiMaoController.cs
@@ -70,6 +70,6 @@ namespace VOL.WebApi.Controllers.Business
             Response.Headers.Add("Content-Disposition", "attachment; filename=ExportedData.xlsx");
             Response.ContentType = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
             return File(excelBytes, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", $"学生课程心率与运动数据统计{DateTime.Now:yyyyMMddHHmmss}.xlsx");
-        }
+        }  
     }
 }