diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index 5511dbb77..09fc4aa49 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -30,6 +30,19 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 是否启用 /// public bool IsEnable { get; set; } + + /// + /// 表单类型 + /// + + public FormType FormType { get; set; } + + + /// + /// 修约小数点 + /// + public int? DigitPlaces { get; set; } = 2; + } @@ -608,6 +621,20 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsBeUsed { get; set; } = false; + /// + /// 表单类型 + /// + + public FormType FormType { get; set; } + + + /// + /// 修约小数点 + /// + public int? DigitPlaces { get; set; } = 2; + + + /// /// 是否是系统数据 /// diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index e4f4d421c..a817e8dcf 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -292,66 +292,84 @@ namespace IRaCIS.Core.Application.Contracts /// public Guid TrialId { get; set; } - /// - /// 阅片方式 - /// - public int ReadingMode { get; set; } = 1; + /// /// 阅片平台 /// public int ImagePlatform { get; set; } = 1; - /// - /// 全局阅片 - /// - public bool IsGlobalReading { get; set; } = true; - - /// - /// 仲裁规则 - /// - public int ArbitrationRule { get; set; } = 2; - - /// - /// 阅片模式 - /// - public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - - /// - /// 仲裁阅片 - /// - public bool? IsArbitrationReading { get; set; } = true; - - /// - /// 肿瘤学阅片 - /// - public bool IsClinicalReading { get; set; } - - /// - /// 读片任务显示是否顺序 - /// - public bool IsReadingTaskViewInOrder { get; set; } = true; /// /// 任务组织级别 /// public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } + /// - /// 图像是否有标注 + /// 影像是否有标注 /// public bool IsImageStandard { get; set; } + + /// - /// 阅片是否显示受试者信息 + /// IR阅片是否显示受试者信息 /// public bool IsReadingShowSubjectInfo { get; set; } = false; /// - /// 阅片是否显示既往结果 + /// IR阅片是否显示既往结果 /// public bool IsReadingShowPreviousResults { get; set; } = false; + /// + /// 修约小数点 + /// + public int? DigitPlaces { get; set; } = 2; + + /// + /// 仲裁规则/对象 + /// + public int ArbitrationRule { get; set; } = 2; + + + + + ///// + ///// 全局阅片 + ///// + //public bool IsGlobalReading { get; set; } = true; + + ///// + ///// 阅片方式 + ///// + //public int ReadingMode { get; set; } = 1; + + ///// + ///// 阅片模式 + ///// + //public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; + + ///// + ///// 仲裁阅片 + ///// + //public bool? IsArbitrationReading { get; set; } = true; + + ///// + ///// 肿瘤学阅片 + ///// + //public bool IsClinicalReading { get; set; } + + ///// + ///// 读片任务显示是否顺序 + ///// + //public bool IsReadingTaskViewInOrder { get; set; } = true; + + + + + /// /// 项目标准集合 /// @@ -415,63 +433,43 @@ namespace IRaCIS.Core.Application.Contracts /// public Guid TrialId { get; set; } - /// - /// 阅片方式 - /// - public int ReadingMode { get; set; } = 1; /// /// 阅片平台 /// public int ImagePlatform { get; set; } = 1; - /// - /// 全局阅片 - /// - public bool IsGlobalReading { get; set; } = true; - - /// - /// 阅片模式 - /// - public ReadingMethod ReadingType { get; set; } = ReadingMethod.Double; - - /// - /// 仲裁阅片 - /// - public bool? IsArbitrationReading { get; set; } = true; - - /// - /// 肿瘤学阅片 - /// - public bool IsClinicalReading { get; set; } - - /// - /// 读片任务显示是否顺序 - /// - public bool IsReadingTaskViewInOrder { get; set; } = true; /// /// 任务组织级别 /// public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; } + /// - /// 图像是否有标注 + /// 影像是否有标注 /// public bool IsImageStandard { get; set; } + + /// - /// 阅片是否显示受试者信息 + /// IR阅片是否显示受试者信息 /// public bool IsReadingShowSubjectInfo { get; set; } = false; /// - /// 阅片是否显示既往结果 + /// IR阅片是否显示既往结果 /// public bool IsReadingShowPreviousResults { get; set; } = false; /// - /// 仲裁规则 + /// 修约小数点 + /// + public int? DigitPlaces { get; set; } = 2; + + /// + /// 仲裁规则/对象 /// public int ArbitrationRule { get; set; } = 2; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index bf948c6cf..8efb79399 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -81,18 +81,14 @@ namespace IRaCIS.Core.Application { await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial() { - ReadingMode = inDto.ReadingMode, - ReadingType = inDto.ReadingType, - IsArbitrationReading = inDto.IsArbitrationReading, - IsReadingTaskViewInOrder = inDto.IsReadingTaskViewInOrder, + DigitPlaces=inDto.DigitPlaces, ReadingTaskViewEnum = inDto.ReadingTaskViewEnum, IsImageStandard = inDto.IsImageStandard, IsReadingShowSubjectInfo = inDto.IsReadingShowSubjectInfo, IsReadingShowPreviousResults = inDto.IsReadingShowPreviousResults, - IsGlobalReading = inDto.IsGlobalReading, ImagePlatform=inDto.ImagePlatform, ArbitrationRule=inDto.ArbitrationRule, - IsClinicalReading =inDto.IsClinicalReading, + }); var result = await _trialRepository.SaveChangesAsync(); diff --git a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs index 8026302a3..2e56b34e4 100644 --- a/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs +++ b/IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs @@ -171,6 +171,23 @@ namespace IRaCIS.Core.Domain.Share SubjectVisit = 1 } + + public enum FormType + { + None=0, + + /// + /// 单页 + /// + SinglePage=1, + + /// + /// 多页 + /// + MultiplePage = 2, + + } + //分配默认状态 public enum TaskAllocateDefaultState { diff --git a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs index dee1857cc..ba1d8db2b 100644 --- a/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs +++ b/IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs @@ -59,6 +59,18 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsConfirm { get; set; } + /// + /// 表单类型 + /// + + public FormType FormType { get; set; } + + + /// + /// 修约小数点 + /// + public int? DigitPlaces { get; set; } = 2; + /// /// 项目 /// diff --git a/IRaCIS.Core.Domain/Trial/Trial.cs b/IRaCIS.Core.Domain/Trial/Trial.cs index b8f5aee07..5d84e0792 100644 --- a/IRaCIS.Core.Domain/Trial/Trial.cs +++ b/IRaCIS.Core.Domain/Trial/Trial.cs @@ -374,6 +374,8 @@ namespace IRaCIS.Core.Domain.Models /// public bool IsImageStandard { get; set; } + + //public Guid? ReviewTypeId { get; set; } = Guid.Empty;