修改访视检查+序列接口排序

2026-03-26 15:51:01 +08:00
parent 52f49994ab
commit 42e34b5e5c
2 changed files with 24 additions and 4 deletions
@@ -270,7 +270,7 @@ namespace IRaCIS.Core.Application.Services
            var instanceList = await _dicomInstanceRepository.Where(t => studyIds.Contains(t.StudyId)).IgnoreQueryFilters()
                   .WhereIf(isReading == 1, s => s.IsReading && s.IsDeleted == false)
                   .WhereIf(isQCFinished, t => t.IsDeleted == false)
-                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize }).ToListAsync();
+                   .Select(t => new { t.SeriesId, t.Id, t.InstanceNumber, t.Path, t.NumberOfFrames, t.HtmlPath, t.IsReading, t.IsDeleted, t.FileSize, t.ImagePositionPatient, t.ImageOrientationPatient }).ToListAsync();

            foreach (var t in studyList)
            {
@@ -284,7 +284,17 @@ namespace IRaCIS.Core.Application.Services
                t.SeriesList.ForEach(series =>
                {

-                    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.InstanceInfoList = sorted.Select(k =>
                    new InstanceBasicInfo()
                    {
                        Id = k.Id,