修改一版

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -2071,6 +2071,9 @@
             阅片期名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCriterionPageQuery.PageName">
+            <summary> PageName</summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.ShowOrder">
             <summary>
             排序
@@ -2086,6 +2089,16 @@
             是否启用
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.FormType">
+            <summary>
+            表单类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.DigitPlaces">
+            <summary>
+            修约小数点
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionSystemInDto.CriterionId">
             <summary>
             标准ID
@@ -2171,6 +2184,11 @@
             是否是裁判问题
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionTrialView.ReadingCriterionPageId">
+            <summary>
+            标准分页Id
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionSystemView.Id">
             <summary>
             Id
@@ -2506,6 +2524,16 @@
             是否完成配置
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.FormType">
+            <summary>
+            表单类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.DigitPlaces">
+            <summary>
+            修约小数点
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionTrialView.IsSystemData">
             <summary>
             是否是系统数据
@@ -3791,46 +3819,11 @@
             项目ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingMode">
-            <summary>
-            阅片方式
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ImagePlatform">
             <summary>
             阅片平台
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsGlobalReading">
-            <summary>
-            全局阅片
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ArbitrationRule">
-            <summary>
-            仲裁规则
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingType">
-            <summary>
-            阅片模式
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsArbitrationReading">
-            <summary>
-            仲裁阅片
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsClinicalReading">
-            <summary>
-            肿瘤学阅片
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingTaskViewInOrder">
-            <summary>
-            读片任务显示是否顺序
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingTaskViewEnum">
             <summary>
             任务组织级别
@@ -3838,22 +3831,37 @@
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsImageStandard">
             <summary>
-            图像是否有标注
+            影像是否有标注
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowSubjectInfo">
             <summary>
-            阅片是否显示受试者信息
+            IR阅片是否显示受试者信息
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.IsReadingShowPreviousResults">
             <summary>
-            阅片是否显示既往结果
+            IR阅片是否显示既往结果
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialReadingCriterionList">
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.DigitPlaces">
             <summary>
-            项目标准集合
+            修约小数点
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ArbitrationRule">
+            <summary>
+            仲裁规则/对象
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialCriterionId">
+            <summary>
+            项目标准Id
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingCriterionPageList">
+            <summary>
+            项目分页
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialJudgeQuestionList">
@@ -3861,6 +3869,111 @@
             项目裁判问题集合
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.TrialQuestionList">
+            <summary>
+            项目问题集合
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.TrialId">
+            <summary>
+            项目ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.PageName">
+            <summary>
+            分页名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.IsEnable">
+            <summary>
+            是否启用
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateTime">
+            <summary>
+            创建时间
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateUserId">
+            <summary>
+            创建用户ID
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ShowOrder">
+            <summary>
+            排序
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.PageName">
+            <summary>
+            分页名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.QuestionName">
+            <summary>
+            问题名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.Type">
+            <summary>
+            类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ParentTriggerValue">
+            <summary>
+            父问题触发
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.ParentQuestionName">
+            <summary>
+            父问题名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.IsRequired">
+            <summary>
+            是否是必须
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.TypeValue">
+            <summary>
+            类型值
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.IsEnable">
+            <summary>
+            是否启用
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.IsJudgeQuestion">
+            <summary>
+            是否是裁判问题
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.Remark">
+            <summary>
+            备注
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.GroupName">
+            <summary>
+            分组
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.AnswerGroup">
+            <summary>
+            答案分组
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.AnswerCombination">
+            <summary>
+            答案组合
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.TrialReadQuestion.JudgeType">
+            <summary>
+            裁判类型
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.TrialJudgeQuestion.QuestionName">
             <summary>
             问题名称
@@ -3891,41 +4004,11 @@
             项目ID
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ReadingMode">
-            <summary>
-            阅片方式
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ImagePlatform">
             <summary>
             阅片平台
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsGlobalReading">
-            <summary>
-            全局阅片
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ReadingType">
-            <summary>
-            阅片模式
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsArbitrationReading">
-            <summary>
-            仲裁阅片
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsClinicalReading">
-            <summary>
-            肿瘤学阅片
-            </summary>
-        </member>
-        <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsReadingTaskViewInOrder">
-            <summary>
-            读片任务显示是否顺序
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ReadingTaskViewEnum">
             <summary>
             任务组织级别
@@ -3933,22 +4016,22 @@
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsImageStandard">
             <summary>
-            图像是否有标注
+            影像是否有标注
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsReadingShowSubjectInfo">
             <summary>
-            阅片是否显示受试者信息
+            IR阅片是否显示受试者信息
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.IsReadingShowPreviousResults">
             <summary>
-            阅片是否显示既往结果
+            IR阅片是否显示既往结果
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingInfoInDto.ArbitrationRule">
             <summary>
-            仲裁规则
+            仲裁规则/对象
             </summary>
         </member>
         <member name="P:IRaCIS.Core.Application.Contracts.TrialConfigDTO.QCProcessEnum">
@@ -5609,6 +5692,20 @@
             阅片问题.标准
             </summary>
         </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.AddOrUpdateReadingCriterionPage(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCriterionPageAddOrEdit)">
+            <summary>
+            新增修改项目标准分页
+            </summary>
+            <param name="addOrEditReadingCriterionPage"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Application.Services.ReadingQuestionService.DeleteReadingCriterionPage(System.Guid)">
+            <summary>
+            删除标准分页
+            </summary>
+            <param name="Id"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Application.Services.ReadingQuestionService.GetReadingQuestionCriterionSystemList(IRaCIS.Core.Application.Service.Reading.Dto.ReadingQuestionCriterionSystemViewInDto)">
             <summary>
             获取系统问题标准

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

@@ -35,6 +35,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		public string PageName { get; set; }
 		public bool IsEnable { get; set; }
 
+		public Guid ReadingQuestionCriterionTrialId{ get; set; }
+
 }
 
 

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));
 

IRaCIS.Core.Domain/Reading/ReadingCriterionPage.cs

@@ -42,6 +42,9 @@ namespace IRaCIS.Core.Domain.Models
         /// </summary>
 		public Guid CreateUserId { get; set; }
 
+
+		public Guid ReadingQuestionCriterionTrialId { get; set; }
+
 		public List<ReadingQuestionTrial> ReadingQuestionList { get; set; } = new List<ReadingQuestionTrial>();