IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs

@@ -1005,8 +1005,6 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string VisitName { get; set; }
 
-        public Guid SourceSubjectVisitId { get; set; }
-
 
         public List<DicomStudyBasicInfo> DicomStudyList { get; set; } = new List<DicomStudyBasicInfo>();
 

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
             if (inQuery.IsImageSegmentLabel == true)
             {
-                var querySV = _subjectVisitRepository.WhereIf(inQuery.SubjectVisitId != null, t => t.Id == inQuery.SubjectVisitId)
+                var querySV = _subjectVisitRepository.Where(t => t.Id == inQuery.SubjectVisitId)
                 .WhereIf(inQuery.SubjectId != null, t => t.SubjectId == inQuery.SubjectId)
                .Select(u => new SubjectVisitMarkUploadDto()
                {
@@ -1248,7 +1248,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 var dicomStudyList = list.Where(item => item.DicomStudyList.Count > 0)
                   .Select(item => new SubjectVisitMarkStudyDto
                   {
-                      SourceSubjectVisitId=item.SourceSubjectVisitId,
                       VisitTaskId = item.VisitTaskId,
                       SubjectId = item.SubjectId,
                       SubjectCode = item.SubjectCode,
@@ -1261,7 +1260,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                 var noneStudyList = list.Where(item => item.NoneDicomStudyList.Count > 0)
                .Select(item => new SubjectVisitMarkStudyDto
                {
-                   SourceSubjectVisitId = item.SourceSubjectVisitId,
                    VisitTaskId = item.VisitTaskId,
                    SubjectId = item.SubjectId,
                    SubjectCode = item.SubjectCode,
@@ -1435,7 +1433,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 == false ? t.ModalityForEdit == "XA" : true)
+               .Where(t => inQuery.IsImageSegmentLabel == true ? t.ModalityForEdit == "XA" : true)
                .SelectMany(t => t.InstanceList.Where(t => t.IsReading && t.DicomSerie.IsReading))
                .Select(t => new StudyDIRInfo()
                {
@@ -1542,11 +1540,6 @@ 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,
@@ -1603,7 +1596,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
                             }).ToList()
                             ,
 
-                            NoneDicomStudyList = inQuery.IsImageSegmentLabel != false ? sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false)
+                            NoneDicomStudyList = inQuery.IsImageSegmentLabel == null ? sv.NoneDicomStudyList.Where(t => isQueryNoneDicom ? inQuery.NoneDicomStudyIdList.Contains(t.Id) : false)
                              .Where(t => info.IsImageFilter ? ("|" + info.CriterionModalitys + "|").Contains("|" + t.Modality + "|") : true)
                              .Where(t => t.IsReading)
                               .Select(nd => new DownloadNoneDicomStudyDto()

IRaCIS.Core.Application/Service/ImageAndDoc/_MapConfig.cs

@@ -166,7 +166,6 @@ namespace IRaCIS.Core.Application.Service
 
 
             CreateMap<SubjectVisit, SubjectVisitMarkStudyDto>()
-                .ForMember(d => d.SourceSubjectVisitId, u => u.MapFrom(u => u.Id))
                 .ForMember(d => d.SubjectCode, u => u.MapFrom(u => u.Subject.Code))
                 .ForMember(d => d.DicomStudyList, u => u.MapFrom(s => s.StudyList))
                  .ForMember(d => d.NoneDicomStudyList, u => u.MapFrom(s => s.NoneDicomStudyList.Where(t => t.IsReading)));

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -224,7 +224,7 @@ namespace IRaCIS.Core.Application.Services
 
             var isImageFilter = false;
             var criterionModalitys = "";
-            if (visitTaskId != null && visitTaskId != Guid.Empty)
+            if (visitTaskId != null)
             {
                 var info = await _visitTaskRepository.Where(t => t.Id == visitTaskId)
                     .Select(t => new { t.TrialReadingCriterion.IsImageFilter, t.TrialReadingCriterion.CriterionModalitys }).FirstNotNullAsync();