From 53aee1020dc4c2dff2eddea5923aed9de86e10ba Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 22 May 2024 13:45:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E6=8E=89siteId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs | 13 ++++++++----- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 2 ++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs index eaea51e5d..4203925a5 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs @@ -10,6 +10,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO public class SubjectImageUploadDTO { public Guid VisitTaskId { get; set; } + + //public Guid SiteId { get; set; } + public Guid SubejctId { get; set; } public string SubjectCode { get; set; } @@ -30,14 +33,14 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO public class StudyBasicInfo { public Guid Id { get; set; } - public string StudyInstanceUid { get; set; } + public string StudyInstanceUid { get; set; } public string StudyCode { get; set; } public string ModalityForEdit { get; set; } public string BodyPartExamined { get; set; } - + public string BodyPartForEdit { get; set; } @@ -45,9 +48,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO public string Modalities { get; set; } - public string Description { get; set; } - public int SeriesCount { get; set; } - public int InstanceCount { get; set; } + public string Description { get; set; } + public int SeriesCount { get; set; } + public int InstanceCount { get; set; } public List SopInstanceUidList { get; set; } } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index ea4a93fae..e2969d9e0 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -58,6 +58,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc { VisitTaskId = u.Id, SubejctId = u.SubjectId, + + SubjectCode = u.IsSelfAnalysis == true ? u.Subject.Code : u.BlindSubjectCode, TaskBlindName = u.TaskBlindName, TaskName = u.TaskName,