From 5b92015c9862e793ee529e5814cbdaa530607cc1 Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Mon, 29 Apr 2024 15:07:29 +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

---
 .../Reading/Dto/ReadingImageTaskViewModel.cs     |  4 +++-
 .../ReadingImageTask/ReadingImageTaskService.cs  | 16 +++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index fef53e520..c380370d2 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1899,7 +1899,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class GetReadingPastResultListOutDto
     {
         public Guid VisitTaskId { get; set; }
-        public string TaskName { get; set; }
+
+		public Guid? ReadModuleVisitId { get; set; }
+		public string TaskName { get; set; }
 
 		public string VisitBlindName { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index ebf4919e9..9e8cfe616 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -693,12 +693,26 @@ namespace IRaCIS.Application.Services
                 VisitTaskId = x.Id,
                 TaskBlindName = x.TaskBlindName,
                 TaskName = x.TaskName,
+                ReadModuleVisitId=  x.ReadModule!=null?x.ReadModule.SubjectVisitId:null,
 				VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName,
-				VisitBlindName =   x.SourceSubjectVisit != null ? x.SourceSubjectVisit.BlindName : x.ReadModule!=null? x.ReadModule.SubjectVisit.BlindName:string.Empty,
+				VisitBlindName = x.TaskBlindName,
 				VisitTaskNum = x.VisitTaskNum,
                 JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum,
 
             }).ToListAsync();
+
+
+            foreach (var item in readingPastResultList)
+            {
+                if (item.ReadModuleVisitId != null)
+                {
+                    item.VisitBlindName = await _visitTaskRepository.Where(x => x.SourceSubjectVisitId == item.ReadModuleVisitId && x.IsSelfAnalysis == taskInfo.IsSelfAnalysis &&
+              x.IsAnalysisCreate == taskInfo.IsAnalysisCreate ).Select(x => x.TaskBlindName).FirstOrDefaultAsync();
+
+				}
+            }
+
+
             return readingPastResultList;
         }