From dfe3db2c2292b7ea5d1547d14e62170de97ab656 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 23 Sep 2022 10:18:44 +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

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

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 7eeccdf6..16ba305c 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -575,6 +575,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid VisitTaskId { get; set; }
         public string TaskName { get; set; }
 
+        public bool IsBaseLineTask { get; set; }
+
         public string TaskBlindName { get; set; }
 
         public decimal VisitTaskNum { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index e9dda100..b082cc7b 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -769,6 +769,7 @@ namespace IRaCIS.Application.Services
         public async Task<(List<GetRelatedVisitTaskOutDto>, object)> GetRelatedVisitTask(GetRelatedVisitTaskInDto inDto)
         {
             var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
+            var baselineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskInfo.SubjectId && x.IsBaseLine && !x.IsLostVisit).Select(x => x.Id).FirstNotNullAsync();
             var result = await _visitTaskRepository.Where(x =>
             (x.TrialId == taskInfo.TrialId &&
             x.SubjectId == taskInfo.SubjectId &&
@@ -785,6 +786,7 @@ namespace IRaCIS.Application.Services
                     VisitId = x.SourceSubjectVisitId,
                     VisitTaskId = x.Id,
                     VisitTaskNum = x.VisitTaskNum,
+                    IsBaseLineTask= x.SourceSubjectVisitId== baselineVisitId,
                     IsCurrentTask = x.Id == inDto.VisitTaskId,
 
                 }).OrderBy(x => x.VisitTaskNum).ToListAsync();