From 6e849d810481ead4bc42a6353a152264dcfbb3ac Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Thu, 16 Jun 2022 14:37:34 +0500 Subject: [PATCH] Fix DetectedOperationService.Convert(). Predicate for operationValue --- .../Services/DetectOperations/DetectedOperationService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs index af442ac8..5d41d171 100644 --- a/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs +++ b/AsbCloudInfrastructure/Services/DetectOperations/DetectedOperationService.cs @@ -166,8 +166,9 @@ namespace AsbCloudInfrastructure.Services.DetectOperations var dateStart = operation.DateStart.ToRemoteDateTime(well.Timezone.Hours); dto.DateStart = dateStart; dto.DateEnd = operation.DateEnd.ToRemoteDateTime(well.Timezone.Hours); - dto.OperationValue = operationValues.FirstOrDefault(e => e.IdOperationCategory == dto.IdCategory - && e.DepthStart <= dto.DepthStart); + dto.OperationValue = operationValues.FirstOrDefault(v => v.IdOperationCategory == dto.IdCategory + && v.DepthStart <= dto.DepthStart + && v.DepthEnd > dto.DepthStart); var timeStart = new TimeDto(dateStart); var driller = schedules.FirstOrDefault(s =>