From 26796b180d4dd01b83afdc5ac9c70bf0d71d0567 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 22 Nov 2022 10:58:08 +0800 Subject: [PATCH] x --- IRaCIS.Core.API/Startup.cs | 3 ++- .../IRaCIS.Core.Application.xml | 20 ++++++++++++++ .../Service/Allocation/_MapConfig.cs | 8 ++++++ .../Service/QC/DTO/QCListViewModel.cs | 18 ++++++++----- .../Reading/Dto/ReadingMedicalReviewDto.cs | 27 +++++++++++++++++++ .../ReadingMedicalReviewService.cs | 10 ++++++- 6 files changed, 77 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.API/Startup.cs b/IRaCIS.Core.API/Startup.cs index b256f421f..d147a6c38 100644 --- a/IRaCIS.Core.API/Startup.cs +++ b/IRaCIS.Core.API/Startup.cs @@ -164,6 +164,7 @@ namespace IRaCIS.Core.API app.UseForwardedHeaders(); + app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader()); //不需要 token 访问的静态文件 wwwroot css, JavaScript, and images don't require authentication. app.UseStaticFiles(); @@ -209,7 +210,7 @@ namespace IRaCIS.Core.API app.UseRouting(); - app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader()); + //app.UseCors(t => t.AllowAnyOrigin().AllowAnyMethod().AllowAnyHeader()); app.UseAuthentication(); diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 91bb360b3..f20cdcb40 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -3065,6 +3065,26 @@ 鏃犳晥鐨 涓篢rue鏃犳晥 + + + 闃呯墖宸ュ叿 + + + + + 浠诲姟灞曠ず璁胯 璇荤墖浠诲姟鏄剧ず鏄惁椤哄簭 + + + + + 闃呯墖鏄惁鏄剧ず鍙楄瘯鑰呬俊鎭 + + + + + IR闃呯墖椤甸潰鏄惁鍙互鏌ョ湅鏃㈠線浠诲姟缁撴灉 + + 瀵硅瘽鍐呭 diff --git a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs index 3facd1aaa..97d99945e 100644 --- a/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs @@ -201,6 +201,14 @@ namespace IRaCIS.Core.Application.Service CreateMap().IncludeMembers(t => t.VisitTask) .ForMember(o => o.TrialReadingCriterionName, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.CriterionName)) + .ForMember(o => o.ReadingTool, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.ReadingTool)) + .ForMember(o => o.IsReadingTaskViewInOrder, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsReadingTaskViewInOrder)) + .ForMember(o => o.IsReadingShowSubjectInfo, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsReadingShowSubjectInfo)) + .ForMember(o => o.IsReadingShowPreviousResults, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IsReadingShowPreviousResults)) + .ForMember(o => o.DigitPlaces, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.DigitPlaces)) + .ForMember(o => o.IseCRFShowInDicomReading, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.IseCRFShowInDicomReading)) + .ForMember(o => o.CriterionType, t => t.MapFrom(u => u.VisitTask.TrialReadingCriterion.CriterionType)) + .ForMember(o => o.Id, t => t.MapFrom(u => u.Id)) .ForMember(o => o.MedicalNo, t => t.MapFrom(u => u.VisitTask.Subject.MedicalNo)) .ForMember(o => o.DoctorUser, t => t.MapFrom(u => u.VisitTask.DoctorUser)) diff --git a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs index 432703246..a3c4adf04 100644 --- a/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs +++ b/IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs @@ -308,17 +308,21 @@ namespace IRaCIS.Core.Application.Contracts public string TrialSiteCode { get; set; } = string.Empty; - - + public CriterionType CriterionType { get; set; } + + public ReadingMethod ReadingType { get; set; } + ///// + ///// 浠诲姟灞曠ず璁胯 璇荤墖浠诲姟鏄剧ず鏄惁椤哄簭 + ///// + //public bool IsReadingTaskViewInOrder { get; set; } = true; } public class ReadingPeriodOrVisitInfo { - public Guid SubjectVisitId { get; set; } //鏍告煡鐘舵 @@ -351,6 +355,7 @@ namespace IRaCIS.Core.Application.Contracts [DictionaryTranslateAttribute("Subject_Visit_Status")] public SubjectStatus SubjectStatus { get; set; } + public string TrialReadingCriterionName { get; set; } public DateTime? FirstGiveMedicineTime { get; set; } @@ -358,10 +363,6 @@ namespace IRaCIS.Core.Application.Contracts public string ModuleName { get; set; } - - - public string TrialReadingCriterionName { get; set; } - public string DeadlineVisitName { get; set; } @@ -369,6 +370,9 @@ namespace IRaCIS.Core.Application.Contracts public DateTime? LatestScanDate { get; set; } + + + } public class UnionStudyExportDTO diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs index 6d921de4c..49bf04fb0 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs @@ -147,6 +147,33 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public TaskState TaskState { get; set; } public string TrialReadingCriterionName { get; set; } + + /// + /// 闃呯墖宸ュ叿 + /// + public ReadingTool? ReadingTool { get; set; } + + /// + /// 浠诲姟灞曠ず璁胯 璇荤墖浠诲姟鏄剧ず鏄惁椤哄簭 + /// + public bool IsReadingTaskViewInOrder { get; set; } = true; + + + /// + /// 闃呯墖鏄惁鏄剧ず鍙楄瘯鑰呬俊鎭 + /// + public bool IsReadingShowSubjectInfo { get; set; } = false; + + /// + /// IR闃呯墖椤甸潰鏄惁鍙互鏌ョ湅鏃㈠線浠诲姟缁撴灉 + /// + public bool IsReadingShowPreviousResults { get; set; } = false; + + public int? DigitPlaces { get; set; } = 2; + + public bool IseCRFShowInDicomReading { get; set; } = false; + + public CriterionType CriterionType { get; set; } } public class FinishMedicalReviewInDto diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index de5f38e23..37c1b960a 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -622,7 +622,15 @@ namespace IRaCIS.Core.Application.Service MedicalDialogCloseEnum=x.MedicalDialogCloseEnum, IsInvalid=x.IsInvalid, - TrialReadingCriterionName=x.VisitTask.TrialReadingCriterion.CriterionName + TrialReadingCriterionName=x.VisitTask.TrialReadingCriterion.CriterionName, + ReadingTool= x.VisitTask.TrialReadingCriterion.ReadingTool, + + IsReadingTaskViewInOrder = x.VisitTask.TrialReadingCriterion.IsReadingTaskViewInOrder, + IsReadingShowSubjectInfo = x.VisitTask.TrialReadingCriterion.IsReadingShowSubjectInfo, + IsReadingShowPreviousResults = x.VisitTask.TrialReadingCriterion.IsReadingShowPreviousResults, + DigitPlaces = x.VisitTask.TrialReadingCriterion.DigitPlaces, + IseCRFShowInDicomReading = x.VisitTask.TrialReadingCriterion.IseCRFShowInDicomReading, + CriterionType = x.VisitTask.TrialReadingCriterion.CriterionType, }).WhereIf(!inDto.SubjectCode.IsNullOrEmpty(), x => x.SubjectCode == inDto.SubjectCode);