From bbfa966b575bf53690f2edccfbbc1a3cdbd20fab Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 11 Nov 2025 14:08:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 138f7bcbd..3bdce95f3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -3776,11 +3776,12 @@ namespace IRaCIS.Core.Application.Service
             });
             await _visitTaskRepository.SaveChangesAsync();
             _userInfo.IsNotNeedInspection = true;
+            await AddDefaultValueToTask(inDto.VisitTaskId);
             await _readingCalculateService.AddTaskLesionAnswerFromLastTask(new AddTaskLesionAnswerFromLastTaskInDto()
             {
                 VisitTaskId = inDto.VisitTaskId
             });
-            await AddDefaultValueToTask(inDto.VisitTaskId);
+         
             return new ResetReadingTaskOutDto() { };
         }
         /// <summary>

From a1c13b5850f18301232923bea555053079ea90e2 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Tue, 11 Nov 2025 16:30:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs  | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 3bdce95f3..ac89912c7 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -3412,6 +3412,15 @@ namespace IRaCIS.Core.Application.Service
                 throw new BusinessValidationFailedException(_localizer["ReadingImage_IDMust"]);
             }
 
+            if (inDto.SubjectCode.IsNotNullOrEmpty() && inDto.SubjectId != null)
+            {
+                if (! (await _visitTaskRepository.AnyAsync(x => x.TrialReadingCriterionId == inDto.TrialReadingCriterionId
+                && x.SubjectId == inDto.SubjectId && (x.BlindSubjectCode == inDto.SubjectCode || x.Subject.Code == inDto.SubjectCode))))
+                {
+                    throw new BusinessValidationFailedException(_localizer["ReadingImage_SubjectCodeError"]);
+                }
+            }
+
 
             #region 跳过阅片
             var clearSkipReadingCache = await _fusionCache.GetOrDefaultAsync<string>(CacheKeys.SkipReadingCacheKey(_userInfo.UserRoleId));