Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs

@@ -1899,9 +1899,13 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     public class GetReadingPastResultListOutDto
     {
         public Guid VisitTaskId { get; set; }
-        public string TaskName { get; set; }
 
-        public string TaskBlindName { get; set; }
+		public Guid? ReadModuleVisitId { get; set; }
+		public string TaskName { get; set; }
+
+		public string VisitBlindName { get; set; }
+
+		public string TaskBlindName { get; set; }
 
 		public string VisitName { get; set; }
 

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -689,15 +689,30 @@ namespace IRaCIS.Application.Services
 
             var readingPastResultList = await taskQuery.OrderBy(x => x.VisitTaskNum).ThenBy(x => x.TaskState).Select(x => new GetReadingPastResultListOutDto()
             {
+
                 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.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())??string.Empty;
+
+				}
+            }
+
+
             return readingPastResultList;
         }
 

README.md

@@ -0,0 +1 @@
+[![Build Status](https://drone.frp.extimaging.com/api/badges/XCKJ/irc-netcore-api/status.svg)](https://drone.frp.extimaging.com/XCKJ/irc-netcore-api)