调整胎动计算时间参数

HealthMonitor.WebApi/Worker.cs

@@ -1465,9 +1465,9 @@ namespace HealthMonitor.WebApi
                                                                             .FirstOrDefault()
                                                                     ;
 
-                                                                    var fetalMovementValue = (fetalMovementMapValue * duringMins * 2) / 120;
-                                                                    // 四舍五入
-                                                                    var fetalMovement = (int)Math.Round(fetalMovementValue, 0, MidpointRounding.AwayFromZero);
+                                                                    var fetalMovementTimeVar = (fetalMovementMapValue * duringMins * 2) / 120;
+                                                                    //// 四舍五入
+                                                                    //var fetalMovement = (int)Math.Round(fetalMovementValue, 0, MidpointRounding.AwayFromZero);
                                                                     // _logger.LogInformation($"{imeiDel} segmentCountFMIndex: {i} -- fetalMovementSampleTime:{fetalMovementSampleTime}|{midNight.AddHours(2 * i).ToString("yyyy-MM-dd HH:mm:ss")} -- statStartTime: {statStartTime} -- statEndTime: {statEndTime}-- isFetalMovementExisted: {isFetalMovementExisted} ");
 
                                                                     #region  生理健康与胎动的关系
@@ -1635,14 +1635,17 @@ namespace HealthMonitor.WebApi
                                                                     }
 
                                                                     #endregion
+                                                                    //var fetalMovementTimeVar = fetalMovementValue;
 
-                                                                    _logger.LogInformation($"{imeiDel} 原始胎动值：{fetalMovementValue}, 步数参数变动值：{fetalMovementStepVar}，体温参数变动值：{fetalMovementTempVar}，血压参数变动值：{fetalMovementBpVar}，心理压力参数变动值:{fetalMovementPpVar},胎心参数变动值:{fetalMovementFhrVar}");
+                                                                    _logger.LogInformation($"{imeiDel} 时间比例胎动值：{fetalMovementTimeVar}, 步数参数变动值：{fetalMovementStepVar}，体温参数变动值：{fetalMovementTempVar}，血压参数变动值：{fetalMovementBpVar}，心理压力参数变动值:{fetalMovementPpVar},胎心参数变动值:{fetalMovementFhrVar}");
 
 
-                                                                    fetalMovementValue = fetalMovementValue + fetalMovementStepVar + fetalMovementTempVar + fetalMovementBpVar + fetalMovementPpVar + fetalMovementFhrVar;
+                                                                   var fetalMovementValue = fetalMovementTimeVar + fetalMovementStepVar + fetalMovementTempVar + fetalMovementBpVar + fetalMovementPpVar + fetalMovementFhrVar;
 
+                                                                    // 四舍五入
+                                                                    var fetalMovement = (int)Math.Round(fetalMovementValue, 0, MidpointRounding.AwayFromZero);
 
-                                                                    _logger.LogInformation($"{imeiDel} 孕周：{pregnancyWeeks}，胎动数据采样时间:{fetalMovementSampleTime}|{statStartTime.ToString("yyyy-MM-dd HH:mm:ss")}, 采样周期:{statStartTime}-{statEndTime}, 原始胎动值:{fetalMovementMapValue}, 佩戴时间 :{duringMins}|{phrRange.Last()}-{phrRange.First()}, 胎动计算值:{fetalMovementValue}, 胎动最终值:{fetalMovement} 已完成.");
+                                                                    _logger.LogInformation($"{imeiDel} 孕周：{pregnancyWeeks}，胎动数据采样时间:{fetalMovementSampleTime}|{statStartTime.ToString("yyyy-MM-dd HH:mm:ss")}, 采样周期:{statStartTime}-{statEndTime}, 时间比例胎动值:{fetalMovementMapValue}, 佩戴时间 :{duringMins}|{phrRange.Last()}-{phrRange.First()}, 胎动计算值:{fetalMovementTimeVar}, 胎动四舍五入最终值:{fetalMovement} 已完成.");
 
                                                                     // 获取胎心数据状态与胎动数据状态一致
                                                                     //etalHeartRateIsAbnormal= fhr.IsAbnormal;