XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改任务配置

Browse Source
This commit is contained in:
hang
2022-10-12 10:36:35 +08:00
parent c04c58e8dc
commit 626b83850b
9 changed files with 102 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs
+48 -40
View File
@@ -16,11 +16,7 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public string SubjectCodeRule { get; set; } = string.Empty;
public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();
public List<string> TrialCriterionNames { get; set; } = new List<string>();
public List<Guid> ClinicalDataTrialSetIds { get; set; } = new List<Guid>();
public bool IsSubjectSecondCodeView { get; set; }
@@ -208,6 +204,17 @@ namespace IRaCIS.Core.Application.Contracts
}
public class TrialProcessConfigDTO
{
/// <summary>
/// QC流程 0 不审，1 单审，2双审
/// </summary>
public TrialQCProcess QCProcessEnum { get; set; } = TrialQCProcess.DoubleAudit;
public bool IsImageConsistencyVerification { get; set; } = true;
}
public class TrialTaskConfigView : TrialTaskConfig
{
public ReadingTaskViewMethod ReadingTaskViewEnum { get; set; }
@@ -216,8 +223,6 @@ namespace IRaCIS.Core.Application.Contracts
public ReadingMethod ReadingType { get; set; }
public ReadingTool ReadingTool { get; set; }
/// <summary>
/// 阅片是否显示受试者信息
/// </summary>
@@ -226,7 +231,10 @@ namespace IRaCIS.Core.Application.Contracts
/// <summary>
/// 阅片是否显示既往结果
/// </summary>
public bool IsReadingShowPreviousResults { get; set; }
public bool IsReadingShowPreviousResults { get; set; }
public ReadingTool ReadingTool { get; set; }
@@ -862,11 +870,13 @@ namespace IRaCIS.Core.Application.Contracts
public class TrialConfigDTO : BasicTrialConfig
{
public List<Guid> TrialCriterionIds { get; set; } = new List<Guid>();
public List<string> TrialCriterionNames { get; set; } = new List<string>();
public List<Guid> ClinicalDataTrialSetIds { get; set; } = new List<Guid>();
public List<Guid> CriterionIds { get; set; } = new List<Guid>();
public List<string> ClinicalDataSetNames { get; set; } = new List<string>();
public bool IsTrialProcessConfirmed { get; set; }
@@ -874,9 +884,6 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsTrialUrgentConfirmed { get; set; }
public int DigitPlaces { get; set; }
/// <summary>
/// QC流程 0 不审，1 单审，2双审
@@ -888,32 +895,9 @@ namespace IRaCIS.Core.Application.Contracts
/// </summary>
public bool IsImageConsistencyVerification { get; set; } = false;
/// <summary>
/// 1 Mint、2 PACS
/// </summary>
public int ImagePlatform { get; set; } = 1;
//阅片方式
public int ReadingMode { get; set; }
//阅片类型
public int ReadingType { get; set; }
public bool IsGlobalReading { get; set; } = true;
public bool? IsArbitrationReading { get; set; }
public bool? IsClinicalReading { get; set; }
public ArbitrationRule ArbitrationRule { get; set; }
public bool IsSubjectExpeditedView { get; set; } = false;
/// <summary>
@@ -926,18 +910,42 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsPDProgressView { get; set; }
//public bool IsTrialStart { get; set; } = false;
public bool IsQCQuestionConfirmed { get; set; }
public string TrialStatusStr { get; set; } = string.Empty;
//public bool IsTrialStart { get; set; } = false;
//public List<Guid> CriterionIds { get; set; } = new List<Guid>();
//public List<string> ClinicalDataSetNames { get; set; } = new List<string>();
//public bool IsGlobalReading { get; set; } = true;
//public bool? IsArbitrationReading { get; set; }
//public bool? IsClinicalReading { get; set; }
//public ArbitrationRule ArbitrationRule { get; set; }
//public int DigitPlaces { get; set; }
///// <summary>
///// 1 Mint、2 PACS
///// </summary>
//public int ImagePlatform { get; set; } = 1;
////阅片类型
//public int ReadingType { get; set; }
//读片任务显示是否顺序
public bool IsReadingTaskViewInOrder { get; set; }
//public bool IsReadingTaskViewInOrder { get; set; }
IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+16 -4
View File
@@ -17,8 +17,19 @@ namespace IRaCIS.Core.Application.Service
//CreateMap<TrialAttachmentCommand, TrialAttachment>().ForMember(t => t.UserTypes, u => u.MapFrom(k => string.Join(',', k.UserTypeList)));
//CreateMap<TrialTaskConfigView, Trial>().ForMember(d => d.Id, u => u.MapFrom(s => s.TrialId)).ReverseMap();
CreateMap<Trial, TrialProcessConfigDTO>();
CreateMap<TrialTaskConfigView, Trial>().ForMember(d => d.Id, u => u.MapFrom(s => s.TrialId)).ReverseMap();
CreateMap<ReadingQuestionCriterionTrial, TrialTaskConfigView > ()
.ForMember(d => d.QCProcessEnum, u => u.MapFrom(s => s.Trial.QCProcessEnum))
.ForMember(d => d.IsImageConsistencyVerification, u => u.MapFrom(s => s.Trial.IsImageConsistencyVerification))
.ReverseMap();
CreateMap<TrialTaskConfig, Trial>().ForMember(d => d.Id, u => u.MapFrom(s => s.TrialId)).ReverseMap();
CreateMap<TrialReadingTaskViewConfig, Trial>().ForMember(d => d.Id, u => u.MapFrom(s => s.TrialId)).ReverseMap();
@@ -153,9 +164,10 @@ namespace IRaCIS.Core.Application.Service
CreateMap<Domain.Models.Trial, TrialConfigDTO>().ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id))
.ForMember(t => t.TrialCriterionIds, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v =>v.IsConfirm).Select(r => r.Id)))
.ForMember(t => t.TrialCriterionNames, u => u.MapFrom(c => c.ReadingQuestionCriterionTrialList.Where(v => v.IsConfirm).Select(r => r.CriterionName)))
.ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id)))
.ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.ClinicalDataSetName)))
.ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId)));
.ForMember(t => t.ClinicalDataTrialSetIds, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.Id)))
//.ForMember(t => t.ClinicalDataSetNames, u => u.MapFrom(c => c.clinicalDataTrialSets.Where(v => v.IsConfirm).Select(r => r.ClinicalDataSetName)))
//.ForMember(t => t.CriterionIds, u => u.MapFrom(c => c.TrialDicList.Where(v => v.KeyName == StaticData.Criterion).Select(r => r.DictionaryId)))
;
CreateMap<Domain.Models.Trial, TrialSubjectConfig>();
CreateMap<Domain.Models.Trial, TrialSubjectAndSVConfig>();