diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
index f91b34941..e920c8ae4 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
@@ -1435,7 +1435,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 var dirInfolist = _subjectRepository.Where(t => t.Id == inQuery.SubjectId).SelectMany(t => t.SubjectVisitList.Where(t => subjectVisitIdList.Contains(t.Id))).SelectMany(t => t.StudyList)
                .Where(t => isQueryDicom ? inQuery.DicomStudyIdList.Contains(t.Id) : false)
                .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.ModalityForEdit + "|") : true)
-               .Where(t => inQuery.IsImageSegmentLabel == true ? t.ModalityForEdit == "XA" : true)
+               .Where(t => inQuery.IsImageSegmentLabel == false ? t.ModalityForEdit == "XA" : true)
                .SelectMany(t => t.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading))
                .Select(t => new StudyDIRInfo()
                {
@@ -1542,6 +1542,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                         from leftVisitTask in cc.DefaultIfEmpty()
                         select new ImageDownloadDto()
                         {
+                            TrialId=sv.TrialId,
+                            SubjectId=sv.SubjectId,
+                            TrialSiteCode=sv.TrialSite.TrialSiteCode,
+                            VisitId=sv.Id,
+
                             SubjectCode = inQuery.SubjectCode,
                             VisitName = sv.VisitName,
                             TaskBlindName = leftVisitTask.TaskBlindName,