修改

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

@@ -325,6 +325,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		[NotDefault]
 		public Guid TrialId { get; set; }
 
+		/// <summary>
+		/// 描述
+		/// </summary>
+		public string Description { get; set; }
+
 		/// <summary>
 		/// 排序
 		/// </summary>
@@ -370,6 +375,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// </summary>
 		public string CriterionName { get; set; }
 
+		/// <summary>
+		/// 描述
+		/// </summary>
+		public string Description { get; set; }
+
 		/// <summary>
 		/// 是否启用
 		/// </summary>
@@ -1160,8 +1170,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public int QuestionCount { get; set; }
 
-		
 
+		/// <summary>
+		/// 描述
+		/// </summary>
+		public string Description { get; set; }
 		public bool IsBeUsed { get; set; } = false;
 	}
 
@@ -1204,6 +1217,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public FormType FormType { get; set; }
 
 
+		/// <summary>
+		/// 描述
+		/// </summary>
+		public string Description { get; set; }
+
+
 		/// <summary>
 		/// 修约小数点
 		/// </summary>

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

@@ -1088,26 +1088,18 @@ namespace IRaCIS.Application.Services
                 .Select(x => x.ReadingQuestionCriterionSystemId);
             var trialCriterionNames= _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == trialId)
                 .Select(x => x.CriterionName);
-            var needAddSystemDataList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)&&x.IsEnable&& !trialCriterionNames.Contains(x.CriterionName)).Include(x=>x.ReadingQuestionSystemList).ToListAsync();
+            List<ReadingQuestionCriterionTrial> needAddCriterionList = await _readingQuestionCriterionSystemRepository.Where(x => !trialUsrSystemIds.Contains(x.Id)&&x.IsEnable&& !trialCriterionNames.Contains(x.CriterionName)).ProjectTo<ReadingQuestionCriterionTrial>(_mapper.ConfigurationProvider).ToListAsync();
-            List<ReadingQuestionCriterionTrial> needAddCriterionList = new List<ReadingQuestionCriterionTrial>();
+         
             List<ReadingQuestionTrial> needAddQuestionList = new List<ReadingQuestionTrial>();
-            needAddSystemDataList.ForEach(x =>
+            needAddCriterionList.ForEach(x =>
             {
-                var criterion = new ReadingQuestionCriterionTrial()
+                x.IsEnable = false;
-                {
+                x.TrialId = trialId;
-                    CriterionName = x.CriterionName,
+                x.ReadingQuestionCriterionSystemId = x.Id;
-                    IsEnable = false,
+                x.Id = NewId.NextGuid();
-                    ReadingQuestionCriterionSystemId = x.Id,
-                    TrialId = trialId,
-                    IsCompleteConfig=x.IsCompleteConfig,
-                    Id = NewId.NextGuid(),
-                };
-                List<ReadingQuestionSystem> systemQuestionList = x.ReadingQuestionSystemList.Clone();
-                
                 // 同步问题暂时注释
                 //List<ReadingQuestionTrial> readingQuestionTrialList = new List<ReadingQuestionTrial>();
                 //SetChildParentQuestion(criterion.Id, trialId, systemQuestionList, readingQuestionTrialList);
-                needAddCriterionList.Add(criterion);
                 //needAddQuestionList.AddRange(readingQuestionTrialList);
             });
             await _readingQuestionCriterionTrialRepository.AddRangeAsync(needAddCriterionList);

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

@@ -114,7 +114,10 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<ReadingTableQuestionTrial, ReadingTrialTableQuestionData>()
                 .ForMember(d => d.OriginalId, u => u.MapFrom(s => s.Id));
 
-
+            CreateMap<ReadingQuestionCriterionSystem, ReadingQuestionCriterionTrial>()
+                 .ForMember(dest => dest.ReadingQuestionTrialList, opt => opt.Ignore())
+                 .ForMember(d => d.ReadingQuestionCriterionSystemId, u => u.MapFrom(s => s.Id)); ;
+                
 
             CreateMap<AddOrUpdateReadingQuestionCriterionSystemInDto, ReadingQuestionCriterionSystem>();
             CreateMap<ReadingQuestionCriterionSystem, ReadingQuestionCriterionSystemView>()

IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionSystem.cs

@@ -44,7 +44,10 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public DateTime ConfirmTime { get; set; }
 
-	
+		/// <summary>
+		/// 描述
+		/// </summary>
+		public string Description { get; set; }
 
 		/// <summary>
 		/// 创建人

IRaCIS.Core.Domain/Reading/ReadingQuestionCriterionTrial.cs

@@ -54,6 +54,12 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public Guid CreateUserId { get; set; }
 
+
+		/// <summary>
+		/// 描述
+		/// </summary>
+		public string Description { get; set; }
+
 		/// <summary>
 		/// 是否确认
 		/// </summary>