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

@@ -92,9 +92,6 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<DicomSeries, DicomSeriesDTO>()
               .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.SubjectVisit.Subject.Code))
              .ForMember(o => o.VisitName, t => t.MapFrom(u => u.SubjectVisit.VisitName));
-            CreateMap<TaskSeries, DicomSeriesDTO>()
-            .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.SubjectVisit.Subject.Code))
-           .ForMember(o => o.VisitName, t => t.MapFrom(u => u.SubjectVisit.VisitName));
             CreateMap<SCPSeries, DicomSeriesDTO>();
 
 

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

@@ -28,8 +28,6 @@ namespace IRaCIS.Core.Application.Services
         IRepository<Subject> _subjectRepository,
         IRepository<DicomInstance> _dicomInstanceRepository,
         IRepository<TaskStudy> _taskStudyRepository,
-             IRepository<TaskSeries> _taskSeriesRepository,
-                 IRepository<TaskInstance> _taskInstanceRepository,
         IServiceProvider _serviceProvider,
         IRepository<DicomSeries> _dicomSeriesRepository,
         IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ISubjectVisitService
@@ -339,48 +337,29 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
         public async Task<DicomSeriesDTO> GetDicomSeriesInfo(GetDicomSeriesInfoInDto inDto)
         {
-            DicomSeriesDTO? series = await _dicomSeriesRepository.Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstOrDefaultAsync();
+            DicomSeriesDTO series = await _dicomSeriesRepository.Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
-            if (series != null)
+            var instanceList = await _dicomInstanceRepository.Where(t => t.SeriesId == inDto.SeriesId)
-            {
+               .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation, t.FileSize }).ToListAsync();
-                var instanceList = await _dicomInstanceRepository.Where(t => t.SeriesId == inDto.SeriesId)
-                              .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation, t.FileSize }).ToListAsync();
 
 
 
-                series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
+            series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
-                      new InstanceBasicInfo()
+                  new InstanceBasicInfo()
-                      {
+                  {
-                          Id = k.Id,
+                      Id = k.Id,
-                          NumberOfFrames = k.NumberOfFrames,
+                      NumberOfFrames = k.NumberOfFrames,
-                          HtmlPath = k.HtmlPath,
+                      HtmlPath = k.HtmlPath,
-                          Path = k.Path,
+                      Path = k.Path,
-                          InstanceNumber = k.InstanceNumber,
+                      InstanceNumber = k.InstanceNumber,
-                          FileSize = k.FileSize
+                      FileSize = k.FileSize
 
-                      }).ToList();
+                  }).ToList();
-            }
-            else
-            {
-                 series = await _taskSeriesRepository .Where(s => s.Id == inDto.SeriesId).ProjectTo<DicomSeriesDTO>(_mapper.ConfigurationProvider).FirstNotNullAsync();
-
-                var instanceList = await _taskInstanceRepository.Where(t => t.SeriesId == inDto.SeriesId)
-                          .Select(t => new { t.SeriesId, t.StudyId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.WindowCenter, t.WindowWidth, t.HtmlPath, t.SliceLocation, t.FileSize }).ToListAsync();
 
 
 
-                series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
+            //series.WindowWidth = instanceList.FirstOrDefault()!.WindowWidth;
-                      new InstanceBasicInfo()
+            //series.WindowCenter = instanceList.FirstOrDefault()!.WindowCenter;
-                      {
-                          Id = k.Id,
-                          NumberOfFrames = k.NumberOfFrames,
-                          HtmlPath = k.HtmlPath,
-                          Path = k.Path,
-                          InstanceNumber = k.InstanceNumber,
-                          FileSize = k.FileSize
-
-                      }).ToList();
-            }
 
             return series;
         }