From 7c3b71de931a51acfe2261fa8b50b55eff1b499c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 4 Jul 2025 16:08:54 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9D=9Edicom=20=E6=A0=87=E8=AE=B0?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs | 2 +- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 2 ++ IRaCIS.Core.Domain/Allocation/VisitTask.cs | 3 +++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index 942b2e096..068b3bee6 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -574,7 +574,7 @@ namespace IRaCIS.Core.Application.Contracts public ReadingCategory ReadingCategory { get; set; } - + public List ReadingNoneDicomMarkPathList { get; set; } public List QuestionMarkPictureList { get; set; } public List TableQuestionRowPictureList { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index e6168c157..33c4b26c3 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1285,6 +1285,8 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc ArmEnum = t.ArmEnum, + ReadingNoneDicomMarkPathList = t.ReadingNoneDicomMarkList.Select(t => t.Path).ToList(), + QuestionMarkPictureList = t.ReadingTaskQuestionMarkList.Select(c => new TrialKeyPicturePath { PicturePath = c.PicturePath, OtherPicturePath = c.OtherPicturePath }).ToList(), TableQuestionRowPictureList = t.LesionList.Select(c => new TrialKeyPicturePath { PicturePath = c.PicturePath, OtherPicturePath = c.OtherPicturePath }).ToList(), diff --git a/IRaCIS.Core.Domain/Allocation/VisitTask.cs b/IRaCIS.Core.Domain/Allocation/VisitTask.cs index b87f946a8..82cec78de 100644 --- a/IRaCIS.Core.Domain/Allocation/VisitTask.cs +++ b/IRaCIS.Core.Domain/Allocation/VisitTask.cs @@ -9,6 +9,9 @@ namespace IRaCIS.Core.Domain.Models; public class VisitTask : BaseFullAuditEntity { #region 导航属性 + [JsonIgnore] + public List ReadingNoneDicomMarkList { get; set; } + [JsonIgnore] From c71f7e38cc495e589188e90c883082cc7e44c7e6 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 4 Jul 2025 16:14:22 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=9Edicom=20?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=B7=AF=E5=BE=84=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 33c4b26c3..69bccd2af 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -1285,7 +1285,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc ArmEnum = t.ArmEnum, - ReadingNoneDicomMarkPathList = t.ReadingNoneDicomMarkList.Select(t => t.Path).ToList(), + ReadingNoneDicomMarkPathList = t.ReadingNoneDicomMarkList.Select(c => new TrialKeyPicturePath { PicturePath = c.Path, OtherPicturePath = string.Empty }).ToList(), QuestionMarkPictureList = t.ReadingTaskQuestionMarkList.Select(c => new TrialKeyPicturePath { PicturePath = c.PicturePath, OtherPicturePath = c.OtherPicturePath }).ToList(), From e1e7abb65afaf8d14140baeab0e388ef0eb2839e Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 4 Jul 2025 16:16:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs index 068b3bee6..3f4f0df20 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs @@ -574,7 +574,7 @@ namespace IRaCIS.Core.Application.Contracts public ReadingCategory ReadingCategory { get; set; } - public List ReadingNoneDicomMarkPathList { get; set; } + public List ReadingNoneDicomMarkPathList { get; set; } public List QuestionMarkPictureList { get; set; } public List TableQuestionRowPictureList { get; set; }