From 102e193ae865241fe72537084423269d67e87d34 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 17 Jul 2024 10:19:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingImageTaskService.cs | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index d2a6c9cee..00af22d3d 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2737,11 +2737,6 @@ namespace IRaCIS.Application.Services cacheIds.Add(inDto.VisitTaskId); _provider.Set(clearSkipReadingCacheKey, JsonConvert.SerializeObject(cacheIds), TimeSpan.FromHours(24)); } - - var c = _provider.Get(clearSkipReadingCacheKey).Value; - Console.WriteLine(c); - // 加这个测试 - Thread.Sleep(3000); // 3000毫秒 = 3秒 return true; } @@ -2870,9 +2865,9 @@ namespace IRaCIS.Application.Services })).CurrentPageData; - subjectTaskList = subjectTaskList - // 排除跳过的 - .Where(x => x.UnReadCanReadTaskList.Select(y => y.Id).Except(cacheSkipIds).Count() > 0).ToList(); + + + if (subjectTaskList.Count() == 0) { @@ -2880,6 +2875,14 @@ namespace IRaCIS.Application.Services } var taskList = subjectTaskList.FirstOrDefault()!.UnReadCanReadTaskList; + // 排除跳过的 + List remainingItems = taskList.Select(x => x.Id).Except(cacheSkipIds).ToList(); + + taskList = taskList.Where(x => remainingItems.Contains(x.Id)).ToList(); + if (taskList.Count() == 0) + { + throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows); + } Random random = new Random(); //返回的范围是 0- taskList.Count-1