From e18ea0fd9c8779d51bde9ab20b45a01018341808 Mon Sep 17 00:00:00 2001
From: he <10978375@qq.com>
Date: Fri, 24 Jun 2022 11:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?=
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           | 9 ++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
index 2d220394e..8bf5c14fb 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
@@ -30,6 +30,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         public Guid VisistTaskId { get; set; }
         public Guid VisistId { get; set; }
 
+        public string TaskBlindName { get; set; }
+
         public Guid SubjectId { get; set; }
 
         public string SubjectCode { get; set; }=String.Empty;
diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
index e5d387306..fac8d82e3 100644
--- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
@@ -81,14 +81,14 @@ namespace IRaCIS.Application.Services
                 task = await _visitTaskRepository.Where(x => x.Id==visistTaskId).Select(x => new GetReadingTaskDto()
                 {
                     VisistTaskId = x.Id,
+                    TaskBlindName = x.TaskBlindName,
+                    SubjectId=x.SubjectId,
                     ReadingCategory = x.ReadingCategory,
                     VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId,
                     VisitNum = x.SourceSubjectVisitId != null ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum,
 
                 }).FirstOrDefaultAsync();
               
-                task.SubjectId = await _subjectVisitRepository.Where(x => x.Id == task.VisistId).Select(x => x.SubjectId).FirstOrDefaultAsync();
-              
             }
             else if (subjectId != null)
             {
@@ -114,6 +114,7 @@ namespace IRaCIS.Application.Services
                 var taskquery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.SubjectId == newSubjectId && x.DoctorUserId == _userInfo.Id).Select(x => new GetReadingTaskDto()
                 {
                     VisistTaskId = x.Id,
+                    TaskBlindName=x.TaskBlindName,
                     ReadingCategory = x.ReadingCategory,
                     VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId,
                     VisitNum = x.SourceSubjectVisitId != null ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum,
@@ -133,6 +134,7 @@ namespace IRaCIS.Application.Services
                 task = await _visitTaskRepository.Where(x => x.TrialId == trialId && x.ReadingTaskState != ReadingTaskState.HaveSigned && x.DoctorUserId == _userInfo.Id).Select(x => new GetReadingTaskDto()
                 {
                     VisistTaskId = x.Id,
+                    TaskBlindName = x.TaskBlindName,
                     ReadingCategory = x.ReadingCategory,
                     VisistId = x.SourceSubjectVisitId != null ? x.SourceSubjectVisitId.Value : x.ReadModule.SubjectVisitId,
                     VisitNum = x.SourceSubjectVisitId != null ? x.SubjectVisit.VisitNum : x.ReadModule.VisitNum,
@@ -185,7 +187,8 @@ namespace IRaCIS.Application.Services
             SubjectId=task.SubjectId,
             SubjectCode=task.SubjectCode,
             ReadingCategory= task.ReadingCategory,
-            IsReadingShowPreviousResults= trialInfo.IsReadingShowPreviousResults,
+            TaskBlindName=task.TaskBlindName,
+            IsReadingShowPreviousResults = trialInfo.IsReadingShowPreviousResults,
             IsReadingShowSubjectInfo=trialInfo.IsReadingShowSubjectInfo,
             });
         }