XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改按照标记时间排序
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-05-26 14:11:54 +08:00
parent 44536b803f
commit 0c28f85f49
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
View File

@ -66,6 +66,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
public Guid? InstanceId { get; set; } public Guid? InstanceId { get; set; }
public int? NumberOfFrames { get; set; } public int? NumberOfFrames { get; set; }
public DateTime CreateTime { get; set; }
} }
public class InstanceBasicInfo public class InstanceBasicInfo
{ {
@ -98,6 +100,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
public string WindowCenter { get; set; } public string WindowCenter { get; set; }
[JsonIgnore] [JsonIgnore]
public string WindowWidth { get; set; } public string WindowWidth { get; set; }
public DateTime? RowDate { get; set; }
} }
public class DicomSeriesWithLabelDTO : DicomSeriesDTO public class DicomSeriesWithLabelDTO : DicomSeriesDTO

6
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -569,6 +569,7 @@ namespace IRaCIS.Core.Application.Services
StudyId = x.StudyId, StudyId = x.StudyId,
InstanceId = x.InstanceId, InstanceId = x.InstanceId,
NumberOfFrames = x.NumberOfFrames, NumberOfFrames = x.NumberOfFrames,
CreateTime=x.CreateTime,
}).ToListAsync(); }).ToListAsync();
@ -581,6 +582,7 @@ namespace IRaCIS.Core.Application.Services
StudyId = x.StudyId, StudyId = x.StudyId,
InstanceId = x.InstanceId, InstanceId = x.InstanceId,
NumberOfFrames = x.NumberOfFrames, NumberOfFrames = x.NumberOfFrames,
CreateTime = x.CreateTime,
}).ToListAsync(); }).ToListAsync();
rowInfoList.AddRange(customoList); rowInfoList.AddRange(customoList);
@ -627,7 +629,7 @@ namespace IRaCIS.Core.Application.Services
item.InstanceInfoList.ForEach(x => 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(); 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) 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; item.InstanceCount = item.InstanceInfoList.Count;