From 304ad35f297f723ff628c1d67f141dfa178f42b2 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 15 Sep 2023 09:30:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Reading/Dto/ReadingImageTaskViewModel.cs           | 2 ++
 .../Reading/ReadingImageTask/ReadingImageTaskService.cs        | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index b37c865bc..ec08c286b 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -1163,6 +1163,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public string TaskBlindName { get; set; }
 
+        public string SubjectCode { get; set; }
+
         public ReadingTaskState ReadingTaskState { get; set; }
 
         public decimal VisitTaskNum { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
index 0a349b71d..c0ffe9314 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
@@ -519,13 +519,14 @@ namespace IRaCIS.Application.Services
                 taskQuery = _visitTaskRepository.Where(x => taskInfo.RelatedVisitTaskIdList.Contains(x.Id) || x.Id == taskInfo.Id);
             }
 
-            var result = await taskQuery.OrderBy(x => x.VisitTaskNum).ThenBy(x => x.TaskState)
+            var result = await taskQuery.Include(x=>x.Subject).OrderBy(x => x.VisitTaskNum).ThenBy(x => x.TaskState)
                 .Select(x => new GetRelatedVisitTaskOutDto()
                 {
                     TaskBlindName = x.TaskBlindName,
                     TaskName = x.TaskName,
                     ReadingTaskState = x.ReadingTaskState,
                     VisitId = x.SourceSubjectVisitId,
+                    SubjectCode=x.Subject.Code,
                     VisitTaskId = x.Id,
                     VisitTaskNum = x.VisitTaskNum,
                     IsBaseLineTask = x.SourceSubjectVisitId == baselineVisitId,