修改

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

@@ -2074,6 +2074,11 @@
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCriterionPageQuery.PageName">
             <summary> PageName</summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCriterionPageAddOrEdit.IsPublicPage">
+            <summary>
+            是否公共分页
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.AddOrUpdateReadingQuestionCriterionTrialInDto.ShowOrder">
             <summary>
             排序
@@ -3874,6 +3879,11 @@
             是否启用
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.IsPublicPage">
+            <summary>
+            是否公共分页
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Contracts.ReadingCriterionPageDto.CreateTime">
             <summary>
             创建时间
@@ -4644,6 +4654,13 @@
             <param name="inDto"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.TrialConfigService.GetReadingCriterionPageList(IRaCIS.Core.Application.Contracts.GetTrialReadingInfoInDto)">
+            <summary>
+            获取项目标准分页信息
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.TrialConfigService.GetTrialReadingCriterionInfo(IRaCIS.Core.Application.Contracts.GetTrialReadingInfoInDto)">
             <summary>
             获取项目阅片标准信息

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

@@ -37,7 +37,12 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
 		public Guid ReadingQuestionCriterionTrialId{ get; set; }
 
-}
+		/// <summary>
+		/// 是否公共分页
+		/// </summary>
+		public bool IsPublicPage { get; set; }
+
+	}
 
 
 	public class AddOrUpdateReadingQuestionCriterionTrialInDto
@@ -381,6 +386,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 		/// 当前ID
 		/// </summary>
 		public Guid? Id { get; set; }
+
+		public Guid? ReadingCriterionPageId { get; set; }
 	}
 
 	public class GetSystemCriterionOtherQuestionInDto

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

@@ -713,7 +713,7 @@ namespace IRaCIS.Application.Services
                  .WhereIf(!inDto.QuestionName.IsNullOrEmpty(), x => x.QuestionName.Contains(inDto.QuestionName))
                   .WhereIf(!inDto.Type.IsNullOrEmpty(), x => x.Type.Contains(inDto.Type))
                      .WhereIf(inDto.ReadingCriterionPageId!=null, x => x.ReadingCriterionPageId==inDto.ReadingCriterionPageId)
-                 .ProjectTo<ReadingQuestionTrialView>(_mapper.ConfigurationProvider);
+                 .ProjectTo<ReadingQuestionTrialView>(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder);
             return await query.ToListAsync();
         }
 
@@ -732,6 +732,7 @@ namespace IRaCIS.Application.Services
             var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == inDto.ReadingQuestionCriterionTrialId)
                    .Where(x => types.Contains(x.Type))
                 .WhereIf(inDto.Id != null, x => x.Id != inDto.Id && x.ParentId != inDto.Id)
+                  .WhereIf(inDto.ReadingCriterionPageId != null, x => x.ReadingCriterionPageId == inDto.ReadingCriterionPageId)
                 .Select(x => new CriterionOtherQuestionOutDto()
                 {
                     QuestionId = x.Id,

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

@@ -388,6 +388,12 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         public bool IsEnable { get; set; }
 
+
+        /// <summary>
+		/// 是否公共分页
+		/// </summary>
+		public bool IsPublicPage { get; set; }
+
         /// <summary>
         /// 创建时间
         /// </summary>
@@ -401,6 +407,9 @@ namespace IRaCIS.Core.Application.Contracts
 
     public class TrialReadQuestion 
     {
+
+        public Guid Id { get; set; }
+
         /// <summary>
         /// 排序
         /// </summary>

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

@@ -97,6 +97,17 @@ namespace IRaCIS.Core.Application
               }).ToListAsync();
         }
 
+        /// <summary>
+        /// 获取项目标准分页信息
+        /// </summary>
+        /// <param name="inDto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<ReadingCriterionPageDto>> GetReadingCriterionPageList(GetTrialReadingInfoInDto inDto)
+        {
+          return  await _readingCriterionPageRepository.Where(x => x.TrialId == inDto.TrialId).ProjectTo<ReadingCriterionPageDto>(_mapper.ConfigurationProvider).ToListAsync();
+        }
+
         /// <summary>
         /// 获取项目阅片标准信息
         /// </summary>
@@ -117,8 +128,8 @@ namespace IRaCIS.Core.Application
             };
 
 
-            result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId)
+            result.TrialQuestionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrial.IsConfirm && x.TrialId == inDto.TrialId&&x.ReadingQuestionCriterionTrialId == result.TrialCriterionId)
-              .ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).ToListAsync();
+              .ProjectTo<TrialReadQuestion>(_mapper.ConfigurationProvider).OrderBy(x => x.ShowOrder).ToListAsync();
 
           
 

IRaCIS.Core.Domain/Reading/ReadingCriterionPage.cs

@@ -43,6 +43,12 @@ namespace IRaCIS.Core.Domain.Models
 		public Guid CreateUserId { get; set; }
 
 
+		/// <summary>
+		/// 是否公共分页
+		/// </summary>
+		public bool IsPublicPage { get; set; } = false;
+
+
 		public Guid ReadingQuestionCriterionTrialId { get; set; }
 
 		public List<ReadingQuestionTrial> ReadingQuestionList { get; set; } = new List<ReadingQuestionTrial>();