From 0b987f937d329ed2569165e7b7ec20563052a4ec Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 6 Sep 2024 16:14:25 +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

---
 .../ReadingImageTaskService.cs                | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index c595e069c..502ae077d 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -3212,7 +3212,6 @@ namespace IRaCIS.Application.Services
             // 冻结任务Id
             List<Guid> reportRelatedTaskIdList = new List<Guid>();
 
-
             if (isReadingTaskViewInOrder == ReadingOrder.InOrder)
             {
 
@@ -3279,7 +3278,28 @@ namespace IRaCIS.Application.Services
             {
                 if (taskInfo.ReadingCategory == ReadingCategory.Visit)
                 {
-                    relatedVisitTaskIdList.Add(taskInfo.Id);
+                    switch(isReadingTaskViewInOrder)
+                    {
+                        case ReadingOrder.SubjectRandom:
+
+                            relatedVisitTaskIdList = await _visitTaskRepository.Where(x =>
+                                x.TrialId == taskInfo.TrialId &&
+                                x.SubjectId == taskInfo.SubjectId &&
+                                x.ReadingCategory == ReadingCategory.Visit &&
+                                x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
+                                x.ReadingTaskState == ReadingTaskState.HaveSigned &&
+                                x.IsAnalysisCreate == taskInfo.IsAnalysisCreate &&
+                                x.ArmEnum == taskInfo.ArmEnum &&
+                                x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
+                                x.DoctorUserId == taskInfo.DoctorUserId &&
+                                x.TaskState == TaskState.Effect).Select(x => x.Id).ToListAsync();
+
+                            break;
+                        default:
+                            relatedVisitTaskIdList.Add(taskInfo.Id);
+                            break;
+                    }
+                  
                 }
             }
 

From c439e1bb425beb08825efa65c6654f513c20666c Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Fri, 6 Sep 2024 16:31:15 +0800
Subject: [PATCH 2/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

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

diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 502ae077d..629dabb14 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -3292,7 +3292,7 @@ namespace IRaCIS.Application.Services
                                 x.ArmEnum == taskInfo.ArmEnum &&
                                 x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
                                 x.DoctorUserId == taskInfo.DoctorUserId &&
-                                x.TaskState == TaskState.Effect).Select(x => x.Id).ToListAsync();
+                                x.TaskState == TaskState.Effect && x.Id != taskInfo.Id).Select(x => x.Id).ToListAsync();
 
                             break;
                         default: