修改一版

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

@@ -34,8 +34,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public Guid TrialId { get; set; }
 		public string PageName { get; set; }
 		public bool IsEnable { get; set; }
-	
-	}
+
+		public Guid ReadingQuestionCriterionTrialId{ get; set; }
+
+}
 
 
 	public class AddOrUpdateReadingQuestionCriterionTrialInDto

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

@@ -317,6 +317,9 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public bool IsReadingShowPreviousResults { get; set; } = false;
 
+        //读片任务显示是否顺序
+        public bool IsReadingTaskViewInOrder { get; set; } = true;
+
         /// <summary>
         /// 修约小数点
         /// </summary>
@@ -367,7 +370,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// <summary>
         /// 项目分页
         /// </summary>
-        public List<ReadingCriterionPage> ReadingCriterionPageList { get; set; }
+        public List<ReadingCriterionPageDto> ReadingCriterionPageList { get; set; }
 
         /// <summary>
         /// 项目裁判问题集合
@@ -381,6 +384,33 @@ namespace IRaCIS.Core.Application.Contracts
         public List<TrialReadQuestion> TrialQuestionList { get; set; }
     }
 
+    public class ReadingCriterionPageDto
+    {
+        /// <summary>
+		/// 项目ID
+		/// </summary>
+		public Guid TrialId { get; set; }
+
+        /// <summary>
+        /// 分页名称
+        /// </summary>
+        public string PageName { get; set; }
+
+        /// <summary>
+        /// 是否启用
+        /// </summary>
+        public bool IsEnable { get; set; }
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreateTime { get; set; }
+
+        /// <summary>
+        /// 创建用户ID
+        /// </summary>
+        public Guid CreateUserId { get; set; }
+    }
 
     public class TrialReadQuestion 
     {
@@ -510,6 +540,8 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class SetTrialReadingInfoInDto
     {
+
+
         /// <summary>
         /// 项目ID
         /// </summary>
@@ -533,7 +565,8 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public bool IsImageStandard { get; set; }
 
-
+        //读片任务显示是否顺序
+        public bool IsReadingTaskViewInOrder { get; set; } = true;
 
         /// <summary>
         /// IR阅片是否显示受试者信息
@@ -545,10 +578,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public bool IsReadingShowPreviousResults { get; set; } = false;
 
-        /// <summary>
-        /// 修约小数点
-        /// </summary>
-        public int? DigitPlaces { get; set; } = 2;
+    
 
         /// <summary>
         /// 仲裁规则/对象

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

@@ -54,7 +54,7 @@ namespace IRaCIS.Core.Application
         {
             GetTrialReadingInfoOutDto trialInfo= await _trialRepository.Where(x=>x.Id==inDto.TrialId).ProjectTo<GetTrialReadingInfoOutDto>(_mapper.ConfigurationProvider).FirstNotNullAsync();
 
-            trialInfo.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ToListAsync();
+            trialInfo.ReadingCriterionPageList = await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<ReadingCriterionPageDto>(_mapper.ConfigurationProvider).ToListAsync();
             trialInfo.TrialCriterionId = await _readingQuestionCriterionTrialRepository.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).Select(x => x.Id).ToListAsync();
             trialInfo.TrialJudgeQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.IsJudgeQuestion && x.TrialId == inDto.TrialId)
                 .Select(x => new TrialJudgeQuestion()
@@ -85,7 +85,8 @@ namespace IRaCIS.Core.Application
         {
             await _trialRepository.UpdatePartialFromQueryAsync(inDto.TrialId, x => new Trial()
             {
-                DigitPlaces=inDto.DigitPlaces,
+                //DigitPlaces=inDto.DigitPlaces,
+                IsReadingTaskViewInOrder=inDto.IsReadingTaskViewInOrder,
                 ReadingTaskViewEnum = inDto.ReadingTaskViewEnum,
                 IsImageStandard = inDto.IsImageStandard,
                 IsReadingShowSubjectInfo = inDto.IsReadingShowSubjectInfo,

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

@@ -215,6 +215,7 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialExternalUserConfirm, TrialSiteUserSurvey>();
 
+            CreateMap<ReadingCriterionPage, ReadingCriterionPageDto>();
 
             CreateMap<Trial, TrialBasicConfigView>();
 
@@ -223,6 +224,8 @@ namespace IRaCIS.Core.Application.Service
                 .ForMember(t => t.TrialUserList, u => u.Ignore());
 
 
+
+
             CreateMap<Trial, GetTrialReadingInfoOutDto>()
            .ForMember(t => t.TrialId, u => u.MapFrom(c => c.Id));