diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs index 6f0be1f32..6eb13813a 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs @@ -66,6 +66,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO public Guid? InstanceId { get; set; } public int? NumberOfFrames { get; set; } + + public DateTime CreateTime { get; set; } } public class InstanceBasicInfo { @@ -98,6 +100,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO public string WindowCenter { get; set; } [JsonIgnore] public string WindowWidth { get; set; } + + public DateTime? RowDate { get; set; } } public class DicomSeriesWithLabelDTO : DicomSeriesDTO diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 898ac2753..17be4e3ba 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -569,6 +569,7 @@ namespace IRaCIS.Core.Application.Services StudyId = x.StudyId, InstanceId = x.InstanceId, NumberOfFrames = x.NumberOfFrames, + CreateTime=x.CreateTime, }).ToListAsync(); @@ -581,6 +582,7 @@ namespace IRaCIS.Core.Application.Services StudyId = x.StudyId, InstanceId = x.InstanceId, NumberOfFrames = x.NumberOfFrames, + CreateTime = x.CreateTime, }).ToListAsync(); rowInfoList.AddRange(customoList); @@ -627,7 +629,7 @@ namespace IRaCIS.Core.Application.Services item.InstanceInfoList.ForEach(x => { - + x.RowDate = rowInfoList.FirstOrDefault(y => y.InstanceId == x.Id)?.CreateTime ?? DateTime.Now; var keyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id && y.NumberOfFrames != 0 && y.NumberOfFrames != null).Select(y => y.NumberOfFrames).Distinct().ToList(); if (keyFramesList.Count() > 0) @@ -644,7 +646,7 @@ namespace IRaCIS.Core.Application.Services }); - item.InstanceInfoList.OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).ToList(); + item.InstanceInfoList = item.InstanceInfoList.OrderBy(x => x.RowDate).ToList(); item.InstanceCount = item.InstanceInfoList.Count;