调整

HealthMonitor.Service/Resolver/PregnancyHeartRateResolver.cs

@@ -371,7 +371,9 @@ namespace HealthMonitor.Service.Resolver
                                         _logger.LogInformation($"{heartRate.Serialno} 高频状态已经持续{(FreqStatsEnd - phrFreqstatus!.LastUpdate).TotalSeconds} 秒，超过约定的 {highFreqSampleTimes} 秒,即将结束高频状态，将下发指令");
                                         //计算高频
                                         await SaveAndPushFetalHeartRateAsync(heartRate, commonPHR, upperAlarmThreshold, lowerAlarmThreshold, avgPhr, DateTimeUtil.ConvertToTimeStamp(phrFreqstatus!.LastUpdate).ToString(), phrFreqstatus!.LastUpdate, FreqStatsEnd);
-
+                                        
+                                        // 计算本次常规心率的胎心数据（高频结束后，实时处理）
+                                        await CalculateNormalFetalHeartRateAsync(heartRate, upperAlarmThreshold, lowerAlarmThreshold, intervalFHR, commonPHR);
                                     }
                                     else
                                     {
@@ -434,6 +436,9 @@ namespace HealthMonitor.Service.Resolver
 
                                     }
 
+                                    // 计算本次常规心率的胎心数据（高频结束后，实时处理）
+                                    await CalculateNormalFetalHeartRateAsync(heartRate, upperAlarmThreshold, lowerAlarmThreshold, intervalFHR, commonPHR);
+
                                 }
 
                                 // 删除高频状态的首条记录
@@ -442,7 +447,7 @@ namespace HealthMonitor.Service.Resolver
                                 _logger.LogInformation($"{heartRate.Serialno} 超时结束高频心率状态 timeDiffInSeconds {timeDiffInSeconds},highFreqSampleInterval:{highFreqSampleInterval}，高频状态持续{(firstTwoPhr[1] - phrFreqstatus!.LastUpdate).TotalSeconds} 秒");
 
                                 // 计算本次常规心率的胎心数据（高频结束后，实时处理）
-                                await CalculateNormalFetalHeartRateAsync(heartRate, upperAlarmThreshold, lowerAlarmThreshold, intervalFHR, commonPHR);
+                                //await CalculateNormalFetalHeartRateAsync(heartRate, upperAlarmThreshold, lowerAlarmThreshold, intervalFHR, commonPHR);
                                 //// 使用延后计算
                                 //var fhrScheduleKey = $"health_monitor/schedule_push/cal_fetal_heart_rate/imei/{heartRate.Serialno}";
                                 //var fhrScheduleTTL = 60;