diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs index f0d944125..245c15eb1 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs @@ -87,7 +87,7 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO public bool IsReading { get; set; } public bool IsDeleted { get; set; } - + public long? FileSize { get; set; } public Guid? StudyId { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs index e8a7bd208..f8f88e201 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/SeriesService.cs @@ -22,7 +22,7 @@ namespace IRaCIS.Core.Application.Services /// Dicom检查的Id /// [HttpGet, Route("{studyId:guid}")] - public async Task>> List(Guid studyId,bool? isReading) + public async Task>> List(Guid studyId, bool? isReading) { //质控的时候,要标记序列,和instance 删除 ,所以要返回全部,但是 质控通过后,pm 进去看的时候要看过滤后的 @@ -34,7 +34,7 @@ namespace IRaCIS.Core.Application.Services //断点 var seriesList = await _seriesRepository.Where(s => s.StudyId == studyId).IgnoreQueryFilters() .WhereIf(isQCFinished, t => t.IsDeleted == false) - .WhereIf(isReading==true, t => t.IsReading == true) + .WhereIf(isReading == true, t => t.IsReading == true) .OrderBy(s => s.SeriesNumber).ThenBy(s => s.SeriesTime).ThenBy(s => s.CreateTime) .ProjectTo(_mapper.ConfigurationProvider).ToListAsync(); @@ -43,7 +43,7 @@ namespace IRaCIS.Core.Application.Services .WhereIf(isReading == true, t => t.IsReading == true) .OrderBy(t => t.SeriesId).ThenBy(t => t.InstanceNumber) .ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime) - .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted }).ToListAsync();//.GroupBy(u => u.SeriesId); + .Select(t => new { t.SeriesId, t.Id, t.Path, t.NumberOfFrames, t.InstanceNumber, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize }).ToListAsync();//.GroupBy(u => u.SeriesId); foreach (var series in seriesList) @@ -58,7 +58,8 @@ namespace IRaCIS.Core.Application.Services Path = k.Path, InstanceNumber = k.InstanceNumber, IsReading = k.IsReading, - IsDeleted = k.IsDeleted + IsDeleted = k.IsDeleted, + FileSize = k.FileSize }).ToList();