修改一版

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

@@ -1516,6 +1516,16 @@
             答案
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialReadingQuestionOutDto.PageName">
+            <summary>
+            分页名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialReadingQuestionOutDto.ReadingCriterionPageId">
+            <summary>
+            标准分页Id
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.IRConfirmMedicalReviewInDto.DoctorUserIdeaEnum">
             <summary>
             阅片人是否认同

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

@@ -337,6 +337,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public int ShowOrder { get; set; }
 
+
+        public int PageShowOrder { get; set; }
+
         /// <summary>
         /// 父问题ID
         /// </summary>

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

@@ -316,6 +316,7 @@ namespace IRaCIS.Application.Services
                        Answer= leftquestionAnswer.Answer,
                        ReadingCriterionPageId=data.ReadingCriterionPageId,
                        PageName= data.ReadingCriterionPage.PageName,
+                       PageShowOrder = data.ReadingCriterionPage.ShowOrder,
                      };
 
 
@@ -329,8 +330,22 @@ namespace IRaCIS.Application.Services
             if (formType == FormType.MultiplePage)
             {
                 qusetionList  = qusetionList.Where(x => x.ReadingCriterionPageId != null).ToList();
+                var readingCriterionPageIds = qusetionList.OrderBy(x => x.PageShowOrder).Select(x => x.ReadingCriterionPageId).Distinct().ToList();
+                foreach (var item in readingCriterionPageIds)
+                {
+                    var newPageQusetionList = qusetionList.Where(x => x.ReadingCriterionPageId == item).ToList();
+                    var  pageGroupList = newPageQusetionList.Where(x => x.Type == "group").ToList();
+                    pageGroupList.ForEach(x =>
+                    {
+                        x.Childrens = newPageQusetionList.Where(y => y.GroupName == x.GroupName && y.ParentId == null && y.Type != "group").ToList();
+                        x.Childrens.ForEach(z =>
+                        {
+                            this.FindChildQuestion(z, newPageQusetionList);
+                        });
+                    });
+                    groupList.AddRange(pageGroupList);
+                }
 
-                 //var readingCriterionPageIds= qusetionList.Select(x=>x.)
 
 
             }