diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 12e1366a..cec6bbff 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -8358,7 +8358,7 @@ - 或者阅片答案预览 + 项目配置的阅片问题(不包含表格问题) 以及配置的分页 和任务对应的答案 一维表 -- 非dicom 阅片 diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs index edd3afe5..e94b7ed7 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingTaskQuestionService.cs @@ -120,7 +120,7 @@ namespace IRaCIS.Application.Services } /// - /// 或者阅片答案预览 + /// 项目配置的阅片问题(不包含表格问题) 以及配置的分页 和任务对应的答案 一维表 -- 非dicom 阅片 /// /// /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs new file mode 100644 index 00000000..0c3e096b --- /dev/null +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -0,0 +1,29 @@ +using IRaCIS.Core.Application.Service.Reading.Dto; +using IRaCIS.Core.Application.ViewModel; + + +namespace IRaCIS.Core.Application.Service.ReadingCalculate +{ + public class PCWG3CalculateService : BaseService, ICriterionCalculateService + { + public Task AddTaskLesionAnswerFromLastTask(AddTaskLesionAnswerFromLastTaskInDto inDto) + { + throw new NotImplementedException(); + } + + public Task CalculateTask(CalculateTaskInDto inDto) + { + throw new NotImplementedException(); + } + + public Task GetReportVerify(GetReportVerifyInDto inDto) + { + throw new NotImplementedException(); + } + + public Task VerifyVisitTaskQuestions(VerifyVisitTaskQuestionsInDto inDto) + { + throw new NotImplementedException(); + } + } +} diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs index 73764967..92d0922d 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/ReadingCalculateService.cs @@ -16,7 +16,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// Dictionary CalculateServiceDic = new Dictionary() { - {CriterionType.RECIST1Pointt1,typeof(RECIST1Point1CalculateService) } //RECIST1.1 + {CriterionType.RECIST1Pointt1,typeof(RECIST1Point1CalculateService) }, //RECIST1.1 + {CriterionType.PCWG3,typeof(PCWG3CalculateService) } }; diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index 95813d1d..d2190137 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -937,13 +937,15 @@ namespace IRaCIS.Core.Application.Contracts public string TrialStatusStr { get; set; } = string.Empty; + public List ClinicalDataSetNames { get; set; } = new List(); + //public bool IsTrialStart { get; set; } = false; //public List CriterionIds { get; set; } = new List(); - //public List ClinicalDataSetNames { get; set; } = new List(); + //public bool IsGlobalReading { get; set; } = true; //public bool? IsArbitrationReading { get; set; } @@ -962,7 +964,7 @@ namespace IRaCIS.Core.Application.Contracts //public int ImagePlatform { get; set; } = 1; - + ////阅片类型 //public int ReadingType { get; set; } diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs index 0c405873..ec000415 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs @@ -165,7 +165,7 @@ namespace IRaCIS.Core.Application.Service .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.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();