From e789c32564eb28cc15f5a8479e00dba3acf50062 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 18 Oct 2023 11:41:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=98=85=E7=89=87?= =?UTF-8?q?=E6=A0=87=E5=87=86=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Third-partyProject/DTO/UltrasonicDicomViewModel.cs | 3 +++ .../Service/Third-partyProject/_MapConfig.cs | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs b/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs index ff508d461..b804536ad 100644 --- a/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs +++ b/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs @@ -63,6 +63,9 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO public decimal VisitTaskNum { get; set; } public int ImageStudyState { get; set; } + + public Guid TrialReadingCriterionId { get; set; } + public string TrialReadingCriterionName { get; set; } } public class UpdateTaskImageStateCommand diff --git a/IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs b/IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs index 582212586..900ca913f 100644 --- a/IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Third-partyProject/_MapConfig.cs @@ -20,7 +20,9 @@ namespace IRaCIS.Core.Application.Service .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode)) .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code)) .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName)) - .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName)); + .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName)) + .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.TrialReadingCriterion.CriterionName)) + ; } } From 108be0bc23ac468976fa84eb4faa28c7ee32c201 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 18 Oct 2023 12:18:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Third-partyProject/DTO/UltrasonicDicomViewModel.cs | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs b/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs index b804536ad..a59bc54b2 100644 --- a/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs +++ b/IRaCIS.Core.Application/Service/Third-partyProject/DTO/UltrasonicDicomViewModel.cs @@ -89,6 +89,9 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO public string StudyCode { get; set; } + + public List ModalitySeriesList => SeriesModalityList.GroupBy(t=>t.Modality).Select(g=>new ModalitySeriesIdList() { Modality= g.Key,SeriesIdList=g.Select(t=>t.SeriesId).ToList() }).ToList(); + public List SeriesModalityList { get; set; } } @@ -100,6 +103,13 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject.DTO public List SeriesIdList { get; set; } } + + public class ModalitySeriesIdList + { + public string Modality { get; set; } + + public List SeriesIdList { get; set; } + } public class SeriesModality { public Guid SeriesId { get; set; }