From e36dd04d3e4f21a8a834257c9975d7a8b2a9e2fc Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 30 Jul 2024 11:19:17 +0800 Subject: [PATCH 1/2] =?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 | 4 ++++ IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs index c95598753..155bc42ad 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs @@ -79,6 +79,10 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO public int InstanceNumber { get; set; } + public Guid? StudyId { get; set; } + + public Guid? SeriesId { get; set; } + [JsonIgnore] public int ShowOrder { get; set; } [JsonIgnore] diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 3f8ab4aec..26020ecf5 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -637,7 +637,8 @@ namespace IRaCIS.Core.Application.Services HtmlPath = k.HtmlPath, Path = k.Path, InstanceNumber = k.InstanceNumber, - + StudyId = k.StudyId, + SeriesId = k.SeriesId, }).ToListAsync(); item.InstanceInfoList.ForEach(x => From ee4b4a62acf35677592449c48a66f25e66f3f53b Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Tue, 30 Jul 2024 11:30:16 +0800 Subject: [PATCH 2/2] =?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 | 4 ---- IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs | 2 -- 2 files changed, 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs index 155bc42ad..c95598753 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DicomSeriesModel.cs @@ -79,10 +79,6 @@ namespace IRaCIS.Core.Application.Contracts.Dicom.DTO public int InstanceNumber { get; set; } - public Guid? StudyId { get; set; } - - public Guid? SeriesId { get; set; } - [JsonIgnore] public int ShowOrder { get; set; } [JsonIgnore] diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs index 26020ecf5..c997b8cec 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs @@ -637,8 +637,6 @@ namespace IRaCIS.Core.Application.Services HtmlPath = k.HtmlPath, Path = k.Path, InstanceNumber = k.InstanceNumber, - StudyId = k.StudyId, - SeriesId = k.SeriesId, }).ToListAsync(); item.InstanceInfoList.ForEach(x =>