From d8ea1e8f941c8fd468c5dd92eea673ac9b2f95c6 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 21 May 2025 15:15:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9IR=20=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=EF=BC=8CPM=20=E5=90=8C=E6=84=8F=E5=8F=91=E9=80=81=E9=82=AE?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
index 800dc9ec8..64fbc4f1a 100644
--- a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
+++ b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs
@@ -367,7 +367,7 @@ public static class DBContext_Ext
             }
 
 
-            if ((originReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || originReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed) &&
+            if ((/*originReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed ||*/ originReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed) &&
                 (visitTask.ReReadingApplyState == ReReadingApplyState.Agree || visitTask.ReReadingApplyState == ReReadingApplyState.Reject))
             {
                 visitTask.AddDomainEvent(new HaveReadVisitTaskReReading() { SubjectId = visitTask.SubjectId, VisitTaskId = visitTask.Id, ReReadingApplyState = visitTask.ReReadingApplyState });

From 9748e70cdf2a161aeec9510a4f400aff72f918bb Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Thu, 22 May 2025 11:02:05 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E9=80=80=E5=9B=9E?=
 =?UTF-8?q?=E9=A2=86=E5=8F=96=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/Service/QC/QCOperationService.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index 2d460b07b..7214805ea 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -266,7 +266,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
             if (!_subjectVisitRepository.Any(t => t.Id == subjectVisitId && !t.VisitTaskList.Any(u => u.TaskState == TaskState.Effect) && t.SubmitState == SubmitStateEnum.Submitted))
             {
-                //已提交未生成任务的才允许申请
+                //已提交、未生成任务的才允许申请
                 throw new BusinessValidationFailedException(_localizer["QCOperation_ShouldBeforeCheckPassed"]);
             }
 
@@ -1356,6 +1356,11 @@ namespace IRaCIS.Core.Application.Image.QA
                     return ResponseOutput.NotOk(_localizer["QCOperation_QCConfigFirst"], ApiResponseCodeEnum.NeedTips);
                 }
 
+                if (_subjectVisitImageBackRecordReposiotry.Any(t => t.SubjectVisitId == subjectVisitId && t.ImageBackState == ImageBackStateEnum.None))
+                {
+                    //已申请的影像回退,不能领取
+                    throw new BusinessValidationFailedException(_localizer["QCOperation_HaveApplyedImageBackCanNotObtain"]);
+                }
 
                 //if (await _subjectVisitRepository.AnyAsync(t => t.IsTake &&
                 //                                                t.SubjectId != dbSubjectVisit.SubjectId &&