增加查询参数

IRaCIS.Core.Application/Service/Reading/Dto/ReadingClinicalDataDto.cs

@@ -466,6 +466,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 上传角色
 		/// </summary>
 		public UploadRole? UploadRole { get; set; }
+
+
+		public Guid? TrialReadingCriterionId { get; set; }
 	}
 
 	public class GetTrialClinicalDataSelectOutDto

IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs

@@ -278,9 +278,11 @@ namespace IRaCIS.Application.Services
             keyValuePairs.Add(ModuleTypeEnum.Oncology, ClinicalLevel.OncologyRead);
 
             var usedIdsQuery = _readingClinicalDataRepository.Where(x => x.ReadingId == inDto.ReadingId && x.Id != inDto.ReadingClinicalDataId).Select(x => x.ClinicalDataTrialSetId);
+
             List<GetTrialClinicalDataSelectOutDto> clinicalList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm)
                 .WhereIf(inDto.UploadRole != null, x => x.UploadRole == inDto.UploadRole)
                 .Where(x => !usedIdsQuery.Contains(x.Id))
+                .WhereIf(inDto.TrialReadingCriterionId != null, t => t.TrialClinicalDataCriterionList.Any(t=>t.TrialReadingCriterionId == inDto.TrialReadingCriterionId) )
                 .WhereIf(inDto.IsVisit && inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.Subject || x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                 .WhereIf(inDto.IsVisit && !inDto.IsBaseLine, x => x.ClinicalDataLevel == ClinicalLevel.SubjectVisit)
                 .WhereIf(!inDto.IsVisit, x => x.ClinicalDataLevel == ClinicalLevel.ImageRead||x.ClinicalDataLevel==ClinicalLevel.OncologyRead)

IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs

@@ -1421,12 +1421,10 @@ namespace IRaCIS.Application.Services
                 x.IsReadingShowSubjectInfo,
                 x.CriterionName,
                 x.Id,
+                x.ReadingTool,
 
             }).FirstOrDefaultAsync();
 
-            #region 临床数据
-
-            #endregion
 
             bool isExistsClinicalData = false;
             if (trialInfo.ClinicalInformationTransmissionEnum == 1)