修改

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

@@ -667,6 +667,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public Guid? ReadingCriterionPageId { get; set; }
 
+        /// <summary>
+        /// 关联ID
+        /// </summary>
+        public Guid? RelevanceId { get; set; }
+
+        /// <summary>
+        /// 关联Value
+        /// </summary>
+        public string RelevanceValue { get; set; } = string.Empty;
+
         public List<GetTrialReadingQuestionOutDto> Childrens { get; set; }
     }
 

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

@@ -267,6 +267,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 标准分页Id
 		/// </summary>
 		public Guid? ReadingCriterionPageId { get; set; }
+
+
+		/// <summary>
+		/// 关联ID
+		/// </summary>
+		public Guid? RelevanceId { get; set; }
+
+		/// <summary>
+		/// 关联Value
+		/// </summary>
+		public string RelevanceValue { get; set; } = string.Empty;
 	}
 
 	public class ReadingQuestionSystemView
@@ -492,6 +503,17 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 裁判类型
 		/// </summary>
 		public JudgeTypeEnum JudgeType { get; set; }
+
+
+		/// <summary>
+		/// 关联ID
+		/// </summary>
+		public Guid? RelevanceId { get; set; }
+
+		/// <summary>
+		/// 关联Value
+		/// </summary>
+		public string RelevanceValue { get; set; } = string.Empty;
 	}
 	public class AddOrUpdateReadingQuestionSystemInDto
 	{
@@ -641,6 +663,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 标准分页Id
 		/// </summary>
 		public Guid? ReadingCriterionPageId { get; set; }
+
+		/// <summary>
+		/// 关联ID
+		/// </summary>
+		public Guid? RelevanceId { get; set; }
+
+		/// <summary>
+		/// 关联Value
+		/// </summary>
+		public string RelevanceValue { get; set; } = string.Empty;
 	}
 
 
@@ -730,6 +762,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 
 
+
+
 		/// <summary>
 		/// 是否是系统数据
 		/// </summary>

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

@@ -672,6 +672,8 @@ namespace IRaCIS.Application.Services
                             QuestionName = data.QuestionName,
                             IsRequired = data.IsRequired,
                             ShowOrder = data.ShowOrder,
+                            RelevanceId=data.RelevanceId,
+                            RelevanceValue=data.RelevanceValue,
                             ParentId = data.ParentId,
                             TypeValue = data.TypeValue,
                             Answer = leftquestionAnswer.Answer,

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

@@ -287,6 +287,8 @@ namespace IRaCIS.Application.Services
                 Id = x.Id,
                 JudgeType = x.JudgeType,
                 ReadingCriterionPageId = x.ReadingCriterionPageId,
+                RelevanceId=x.RelevanceId,
+                RelevanceValue=x.RelevanceValue,
                 ParentId = x.ParentId,
                 ReadingQuestionCriterionTrialId = x.ReadingQuestionCriterionTrialId,
                 ReadingQuestionSystemId = x.ReadingQuestionSystemId,
@@ -328,10 +330,13 @@ namespace IRaCIS.Application.Services
                    ParentTriggerValue=c.system.ParentTriggerValue,
                    QuestionName=c.system.QuestionName,
                    ReadingCriterionPageId=c.trial.FirstOrDefault()?.ReadingCriterionPageId,
+                   RelevanceId = c.trial.FirstOrDefault()?.RelevanceId,
+                   RelevanceValue = c.trial.FirstOrDefault()?.RelevanceValue,
                    ReadingQuestionCriterionTrialId = item.Id,
                    Remark=c.system.Remark,
                    TrialId=item.TrialId,
                    Type=c.system.Type,
+                   
                    TypeValue=c.system.TypeValue,
                }).ToList();
                var copydata = needAddQuestionList.Clone();

IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs

@@ -620,6 +620,10 @@ namespace IRaCIS.Core.Application.Contracts
         public int? DigitPlaces { get; set; }
 
         public FormType? FormType { get; set; }
+
+        public int ImageCount { get; set; }
+        
+
         /// <summary>
         /// 项目标准Id
         /// </summary>
@@ -702,6 +706,9 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public int? DigitPlaces { get; set; }
 
+
+        public int ImageCount { get; set; }
+
         public bool IsSignSave { get; set; } = false;
     }
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -229,6 +229,7 @@ namespace IRaCIS.Core.Application
                 result.DigitPlaces = trialCriterion.DigitPlaces;
                 result.TrialCriterionId = trialCriterion.Id;
                 result.FormType = trialCriterion.FormType;
+                result.ImageCount=trialCriterion.ImageCount;
             };
 
             result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId
@@ -247,7 +248,6 @@ namespace IRaCIS.Core.Application
         /// <returns></returns>
         public async Task<IResponseOutput> SetTrialReadingCriterion(SetTrialReadingCriterionInDto inDto)
         {
-
             if (inDto.IsSignSave)
             {
                 var criterionFormType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialCriterionId).Select(x => x.FormType).FirstOrDefaultAsync();
@@ -261,12 +261,11 @@ namespace IRaCIS.Core.Application
                 }
             }
          
-
             await _readingQuestionCriterionTrialRepository.UpdatePartialFromQueryAsync(inDto.TrialCriterionId, x => new ReadingQuestionCriterionTrial()
             {
-               
                 FormType = inDto.FormType,
                 DigitPlaces = inDto.DigitPlaces,
+                ImageCount=inDto.ImageCount,
 
             });
 

IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs

@@ -71,6 +71,11 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public int? DigitPlaces { get; set; } = 2;
 
+		/// <summary>
+		/// 图片数量
+		/// </summary>
+		public int ImageCount { get; set; } = 0;
+
 		/// <summary>
 		/// 评估结果
 		/// </summary>

IRaCIS.Core.Domain/Reading/ReadingQuestionTrial.cs

@@ -117,6 +117,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid? ReadingCriterionPageId { get; set; }
 
+		/// <summary>
+		/// 关联ID
+		/// </summary>
+		public Guid? RelevanceId { get; set; }
+
+		/// <summary>
+		/// 关联Value
+		/// </summary>
+		public string RelevanceValue { get; set; }=string.Empty;
+
 		/// <summary>
 		/// 分页标准
 		/// </summary>