diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
index a94ade196..8ae885964 100644
--- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
+++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
@@ -441,6 +441,7 @@ namespace IRaCIS.Application.Services
ClinicalDataTrialSetId = x.ClinicalDataTrialSetId,
IsSign = x.IsSign,
ClinicalUploadType = x.ClinicalDataTrialSet.ClinicalUploadType,
+ CriterionEnumList= x.ClinicalDataTrialSet.CriterionEnumList,
Id = x.Id,
UploadRole = x.ClinicalDataTrialSet.UploadRole,
IsCRCUpload = x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC,
@@ -455,6 +456,14 @@ namespace IRaCIS.Application.Services
var result = await resultQuery.ToListAsync();
+ // 根据标准
+ if (inDto.VisitTaskId != null)
+ {
+ var criterionType = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Include(x=>x.TrialReadingCriterion).Select(x => x.TrialReadingCriterion.CriterionType).FirstNotNullAsync();
+ result = result.Where(x => x.CriterionEnumList.Contains((int)criterionType)).ToList();
+ }
+
+
result = result.Where(x => !(x.ClinicalUploadType == ClinicalUploadType.PDF && x.FileList.Count() == 0)).ToList();
// 需要排除表格为空的数据
diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
index 0ceff40cd..b218ed509 100644
--- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
+++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs
@@ -317,6 +317,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
///
public ClinicalUploadType ClinicalUploadType { get; set; }
+ ///
+ /// 标准枚举
+ ///
+ public List CriterionEnumList { get; set; }
+
///
/// 临床级别名称
///