From f426df9d7f004eeb661430405fcc6a44a048418d Mon Sep 17 00:00:00 2001
From: he <109787524@qq.com>
Date: Wed, 4 Sep 2024 10:36:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/ImageAndDoc/DTO/DicomSeriesModel.cs                | 2 ++
 IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs   | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
index 155bc42ad..c47c42da3 100644
--- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
+++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs
@@ -81,6 +81,8 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO
 
         public Guid? StudyId { get; set; }
 
+        public List<int?> KeyFramesList{ get; set; }
+
         public Guid? SeriesId { get; set; }
 
         [JsonIgnore]
diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
index 8672695b0..86a8721da 100644
--- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
+++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
@@ -586,7 +586,7 @@ namespace IRaCIS.Core.Application.Services
 
                                 var markInstanceIdList = rowInfoList.Where(y => y.InstanceId != null).OrderBy(x => x.ShowOrder).ThenBy(x => x.RowIndex).Select(y => y.InstanceId!.Value).Distinct().ToList();
 
-                                item.InstanceInfoList = await _dicomInstanceRepository.Where(t => markInstanceIdList.Contains(t.Id)).OrderBy(t => t.InstanceNumber).Select(k =>
+                                item.InstanceInfoList = await _dicomInstanceRepository.Where(t => markInstanceIdList.Contains(t.Id)).Select(k =>
                                   new InstanceBasicInfo()
                                   {
                                       Id = k.Id,
@@ -601,6 +601,7 @@ namespace IRaCIS.Core.Application.Services
                                 item.InstanceInfoList.ForEach(x =>
                                 {
 
+                                    x.KeyFramesList = rowInfoList.Where(y => y.InstanceId == x.Id).Select(y => y.NumberOfFrames).Distinct().ToList();
                                     var item = rowInfoList.FirstOrDefault(y => y.InstanceId == x.Id);
                                     if (item != null)
                                     {