diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs index e05935740..799f3126f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs @@ -272,8 +272,10 @@ namespace IRaCIS.Application.Services { await this.AddTrialClinicalDataTrialSet(inDto.TrialId); + var trialClinicalDataList = await _clinicalDataTrialSetRepository.AsQueryable() .Where(x => x.TrialId == inDto.TrialId) + .WhereIf(inDto.CriterionTypes!=null,x=>x.IsConfirm||x.SystemClinicalDataSetId==null||inDto.CriterionTypes.Intersect(x.CriterionEnumList).Count()>0) .WhereIf(inDto.ClinicalDataLevel != null, x => x.ClinicalDataLevel == inDto.ClinicalDataLevel) .WhereIf(inDto.ClinicalUploadType != null, x => x.ClinicalUploadType == inDto.ClinicalUploadType) .WhereIf(inDto.ClinicalDataSetName != String.Empty, x => x.ClinicalDataSetName.Contains(inDto.ClinicalDataSetName)) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs index fd279e1a1..4be0b57d8 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ClinicalDataServiceViewModel.cs @@ -311,6 +311,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// 上传方式 /// public ClinicalUploadType? ClinicalUploadType { get; set; } + + public List? CriterionTypes { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs index eca632b44..6914f6893 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingQuestionViewModel.cs @@ -2201,7 +2201,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public int ShowOrder { get; set; } - + /// + /// 标准类型 + /// + public CriterionType CriterionType { get; set; } ///