From 41b2a638fe0e665d96a14148d91ff4bca4f38ed5 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 19 Jun 2025 10:21:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=85=A8=E9=9A=8F=E6=9C=BA=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=B3=BB=E7=BB=9F=E7=9B=B2=E6=80=81=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingImageTask/ReadingImageTaskService.cs | 10 +++++++++- IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 9 +++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 9dc3e07ea..64bbf13b7 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -3135,7 +3135,7 @@ namespace IRaCIS.Core.Application.Service Random random = new Random(); var skipcount = 0; - + var minRandomOrder = query.Where(t => t.RandomOrder != null).Select(t => t.RandomOrder).MinOrDefault(); //以随机序号优先，阅片中优先先给IR @@ -3189,6 +3189,14 @@ namespace IRaCIS.Core.Application.Service { throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows); } + else + { + //触发任务随机编号 + + await _downloadAndUploadService.SubejctRandomReadingTaskNameDeal(task.SubjectId, task.TrialReadingCriterionId); + + task.TaskBlindName = await _visitTaskRepository.Where(t => t.Id == task.VisitTaskId).Select(t => t.TaskBlindName).FirstOrDefaultAsync() ?? ""; + } if (task.SubjectCode.IsNullOrEmpty()) { diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 5b8859e06..4f4436c74 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -3632,6 +3632,15 @@ namespace IRaCIS.Core.Infra.EFCore.Common } } + if(entity.TaskBlindName.Contains("Timepoint Ran")) + { + if(_dbContext.VisitTask.Where(t => t.Id == entity.Id).Any(t => !t.TaskBlindName.Contains("Timepoint Ran"))) + { + isDistinctionInterface = false; + extraIdentification = "/TriggerSystemBlindingName"; + } + } + }