diff --git a/AsbCloudApp/Services/IDetectedOperationService.cs b/AsbCloudApp/Services/IDetectedOperationService.cs
index 0ba595ff..e4f8f201 100644
--- a/AsbCloudApp/Services/IDetectedOperationService.cs
+++ b/AsbCloudApp/Services/IDetectedOperationService.cs
@@ -35,7 +35,7 @@ namespace AsbCloudApp.Services
///
///
///
- Task?> GetOperationsAsync(DetectedOperationRequest request, CancellationToken token);
+ Task> GetOperationsAsync(DetectedOperationRequest request, CancellationToken token);
///
/// Удалить операции
diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
index 4b58e235..a65525ad 100644
--- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
+++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs
@@ -45,17 +45,13 @@ namespace AsbCloudInfrastructure.Services.DetectOperations
return result;
}
- public async Task?> GetOperationsAsync(DetectedOperationRequest request, CancellationToken token)
+ public async Task> GetOperationsAsync(DetectedOperationRequest request, CancellationToken token)
{
var well = await wellService.GetOrDefaultAsync(request.IdWell, token);
- if (well?.IdTelemetry is null || well.Timezone is null)
- return null;
+ if (well?.IdTelemetry is null)
+ return Enumerable.Empty();
- var query = BuildQuery(well, request)
- ?.AsNoTracking();
-
- if (query is null)
- return null;
+ var query = BuildQuery(well, request).AsNoTracking();
var data = await query.ToListAsync(token);
diff --git a/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs b/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs
index 7ff4076a..f7fdea51 100644
--- a/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs
+++ b/AsbCloudInfrastructure/Services/Subsystems/SubsystemService.cs
@@ -223,13 +223,11 @@ internal class SubsystemService : ISubsystemService
var dateRange = telemetryDataSaubService.GetRange(well.Id);
- var beginUTC = gtDate.HasValue
- ? gtDate.Value.ToUtcDateTimeOffset(hoursOffset)
- : dateRange.From.ToUtcDateTimeOffset(hoursOffset);
+ var beginUTC = gtDate?.ToUtcDateTimeOffset(hoursOffset)
+ ?? dateRange?.From.ToUtcDateTimeOffset(hoursOffset);
- var endUTC = ltDate.HasValue
- ? ltDate.Value.ToUtcDateTimeOffset(hoursOffset)
- : dateRange.To.ToUtcDateTimeOffset(hoursOffset);
+ var endUTC = ltDate?.ToUtcDateTimeOffset(hoursOffset)
+ ?? dateRange?.To.ToUtcDateTimeOffset(hoursOffset);
var request = new DetectedOperationRequest
{