Dixon 排序修改

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

@@ -9,7 +9,7 @@ namespace IRaCIS.Core.Application.Services
 {
     [ApiExplorerSettings(GroupName = "Image")]
     [AllowAnonymous]
-    public class InstanceService(IRepository<DicomInstance> _instanceRepository,
+    public class InstanceService(IRepository<DicomInstance> _instanceRepository, IRepository<DicomSeries> _seriesRepository,
         IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer, IWebHostEnvironment _hostEnvironment) : BaseService, IInstanceService
     {
 
@@ -29,12 +29,15 @@ namespace IRaCIS.Core.Application.Services
                 .OrderBy(s => s.InstanceNumber).ThenBy(s => s.InstanceTime).ThenBy(s => s.CreateTime)
                 .ProjectTo<DicomInstanceDTO>(_mapper.ConfigurationProvider).ToListAsync();
 
+            var des = _seriesRepository.Where(t => t.Id == seriesId).Select(t => t.Description).FirstOrDefault();
+
             // ⭐ DICOM 空间排序（带兜底）
             var sorted = DicomSortHelper.SortSlices(
                 list,
                 x => x.ImagePositionPatient,
                 x => x.ImageOrientationPatient,
-                x => x.InstanceNumber
+                x => x.InstanceNumber,
+                des
             );
 
             var seriesInfo = await _instanceRepository.Where(s => s.SeriesId == seriesId).Select(t => new

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

@@ -59,7 +59,8 @@ namespace IRaCIS.Core.Application.Services
                         instances,
                         x => x.ImagePositionPatient,
                         x => x.ImageOrientationPatient,
-                        x => x.InstanceNumber
+                        x => x.InstanceNumber,
+                        series.Description
                     );
 
                     series.InstanceInfoList = sorted.Select(k =>
@@ -104,13 +105,24 @@ 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, t.FileSize ,t.IsMasked}).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 ,t.IsMasked, t.ImagePositionPatient, t.ImageOrientationPatient }).ToListAsync();//.GroupBy(u => u.SeriesId);
 
 
                 foreach (var series in seriesList)
                 {
 
-                    series.InstanceInfoList = instanceList.Where(t => t.SeriesId == series.Id).OrderBy(t => t.InstanceNumber).Select(k =>
+                    var instances = instanceList.Where(x => x.SeriesId == series.Id);
+
+                    // ⭐ DICOM 空间排序（带兜底）
+                    var sorted = DicomSortHelper.SortSlices(
+                        instances,
+                        x => x.ImagePositionPatient,
+                        x => x.ImageOrientationPatient,
+                        x => x.InstanceNumber,
+                        series.Description
+                    );
+
+                    series.InstanceInfoList = sorted.Select(k =>
                        new InstanceBasicInfo()
                        {
                            Id = k.Id,

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

@@ -292,7 +292,8 @@ namespace IRaCIS.Core.Application.Services
                         instances,
                         x => x.ImagePositionPatient,
                         x => x.ImageOrientationPatient,
-                        x => x.InstanceNumber
+                        x => x.InstanceNumber,
+                        series.Description
                     );
 
                     series.InstanceInfoList = sorted.Select(k =>
@@ -629,7 +630,8 @@ namespace IRaCIS.Core.Application.Services
                             instances,
                             x => x.ImagePositionPatient,
                             x => x.ImageOrientationPatient,
-                            x => x.InstanceNumber
+                            x => x.InstanceNumber,
+                            series.Description
                         );
 
                         series.InstanceInfoList = sorted.Select(k =>
@@ -682,7 +684,8 @@ namespace IRaCIS.Core.Application.Services
                             series.InstanceInfoList,
                             x => x.ImagePositionPatient,
                             x => x.ImageOrientationPatient,
-                            x => x.InstanceNumber
+                            x => x.InstanceNumber,
+                            series.Description
                         );
 
                         series.InstanceInfoList = sorted;