From f7dd5117a01da78b989cc731db1d731d48a19ec1 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 10 Sep 2024 18:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=BB=E5=AD=A6=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs       | 2 ++
 .../Service/ImageAndDoc/DownloadAndUploadService.cs      | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
index 088c77ef3..8a3f8d0a1 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
@@ -527,6 +527,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         [NotDefault]
         public string SubjectCode { get; set; }
+
+        public Guid? VisitTaskId { get; set; }
     }
 
 
diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index 69534ade5..edd727cbc 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -738,9 +738,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         [HttpPost]
         public async Task<List<SubjectCRCImageUploadedStudyDto>> GetSubjectImageDownloadSelectList(IRReadingDownloadQuery inQuery)
         {
+            var doctorUserId = _userInfo.Id;
+
+            //医学审核查看下载按钮，这个时候需要知道医生
+            if (inQuery.VisitTaskId != null && inQuery.VisitTaskId!=Guid.Empty)
+            {
+                doctorUserId = await _visitTaskRepository.Where(t => t.Id == inQuery.VisitTaskId).Select(t => (Guid)t.DoctorUserId).FirstNotNullAsync();
+            }
 
             var query = _visitTaskRepository.Where(t => t.SubjectId == inQuery.SubjectId && t.TrialReadingCriterionId == inQuery.TrialReadingCriterionId
-                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id && t.TaskState == TaskState.Effect)
+                                                    && t.SourceSubjectVisitId != null && t.DoctorUserId == doctorUserId && t.TaskState == TaskState.Effect)
                 .ProjectTo<SubjectCRCImageUploadedDto>(_mapper.ConfigurationProvider);