Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

2024-03-25 15:27:54 +08:00
parent cb9b54a089 57c5d14f5a
commit 6926bb877c
3 changed files with 8 additions and 1 deletions
@@ -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))
@@ -311,6 +311,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
        /// 上传方式
        /// </summary>
        public ClinicalUploadType? ClinicalUploadType { get; set; }
+
+        public List<int>? CriterionTypes { get; set; }
    }


@@ -2201,7 +2201,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public int ShowOrder { get; set; }


-
+		/// <summary>
+		/// 标准类型
+		/// </summary>
+		public CriterionType CriterionType { get; set; }


 		/// <summary>