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

@@ -449,14 +449,14 @@ namespace IRaCIS.Core.Application.Services
             var studyList = await _repository.Where<DicomStudy>(t => t.TrialId == indto.TrialId && t.SubjectVisitId == indto.SujectVisitId)
                 .WhereIf(isManualGenerate,t=>t.SubjectCriteriaEvaluationVisitStudyFilterList.Any(t=>t.TrialReadingCriterionId==taskInfo.TrialReadingCriterionId && t.IsConfirmed &&t.IsReading ))
                 .Select(k => new VisitStudyDTO()
-                {
-                    InstanceCount = k.InstanceCount,
-                    Modalities = k.Modalities,
-                    SeriesCount = k.SeriesCount,
-                    StudyCode = k.StudyCode,
-                    StudyId = k.Id,
+            {
+                InstanceCount = k.InstanceCount,
+                Modalities = k.Modalities,
+                SeriesCount = k.SeriesCount,
+                StudyCode = k.StudyCode,
+                StudyId = k.Id,
 
-                }).ToListAsync();
+            }).ToListAsync();
             var studyIds = studyList.Select(t => t.StudyId).ToList();
 
             var instanceList = await _repository.Where<DicomInstance>(t => studyIds.Contains(t.StudyId))
@@ -534,35 +534,23 @@ namespace IRaCIS.Core.Application.Services
             foreach (var item in noDicomStudyList)
             {
                 var nodicom = noDicomList.Where(x => x.Id == item.StudyId).First();
-
-                var instanceCount = await _noneDicomStudyFileRepository.Where(x => x.NoneDicomStudyId == item.StudyId).CountAsync();
-
-                if (instanceCount == 0)
+                item.SeriesList = new List<DicomSeriesDTO>()
                 {
-                    item.SeriesList = new List<DicomSeriesDTO>();
-                    item.SeriesCount = 0;
-				}
-                else
-                {
-					item.SeriesList = new List<DicomSeriesDTO>()
-				{
-					new DicomSeriesDTO (){
-					IsDicom=false,
-					Id=item.StudyId,
-					InstanceCount=instanceCount,
-					Modality=item.Modalities,
-					StudyId=item.StudyId,
-					TrialId=nodicom.TrialId,
-					SiteId=nodicom.SiteId,
-					SubjectVisitId=nodicom.SubjectVisitId,
-					SubjectId=nodicom.SubjectId,
-					SeriesNumber=1,
-					NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId).Select(x=>x.Path).FirstOrDefaultAsync(),
-					}
+                    new DicomSeriesDTO (){
+                    IsDicom=false,
+                    Id=item.StudyId,
+                    InstanceCount=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId).CountAsync(),
+                    Modality=item.Modalities,
+                    StudyId=item.StudyId,
+                    TrialId=nodicom.TrialId,
+                    SiteId=nodicom.SiteId,
+                    SubjectVisitId=nodicom.SubjectVisitId,
+                    SubjectId=nodicom.SubjectId,
+                    SeriesNumber=1,
+                    NoneDicomFileFirstFile=await _noneDicomStudyFileRepository.Where(x=>x.NoneDicomStudyId==item.StudyId).Select(x=>x.Path).FirstOrDefaultAsync(),
+                    }
 
-				};
-				}
-              
+                };
             }