修改

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

@@ -104,6 +104,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public ValueUnit? Unit { get; set; }
 
+        public decimal FristAddTaskNum { get; set; }
+
+        public ReportLayType ReportLayType { get; set; } = ReportLayType.Group;
+
         public List<TaskQuestionAnswer> Answer { get; set; } = new List<TaskQuestionAnswer>();
 
         public List<ReadingReportDto> Childrens { get; set; } = new List<ReadingReportDto>();

IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs

@@ -140,7 +140,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 ShowOrder = x.ShowOrder,
                 ValueType = x.ValueType,
                 Unit = x.Unit,
-
+                ReportLayType=ReportLayType.Group,
             }).ToList();
 
             // 分组
@@ -163,7 +163,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     OrderMark = x.OrderMark,
                     ValueType = x.ValueType,
                     Unit = x.Unit,
-
+                    ReportLayType = ReportLayType.Question,
                 }).ToList();
 
                 // 问题
@@ -196,6 +196,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         IsCanEditPosition = x.IsCanEditPosition,
                         RowIndex = x.RowIndex,
                         BlindName = x.BlindName,
+                        ReportLayType = ReportLayType.Lesions,
+                        FristAddTaskNum=  x.FristAddTaskNum,
                     }).ToList();
 
 
@@ -217,6 +219,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             ShowOrder = x.ShowOrder,
                             ValueType = x.ValueType,
                             Unit = x.Unit,
+                            ReportLayType = ReportLayType.TableQuestion,
+                            FristAddTaskNum= row.FristAddTaskNum,
                         }).ToList();
 
 

IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs

@@ -118,7 +118,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 ShowOrder = x.ShowOrder,
                 ValueType = x.ValueType,
                 Unit = x.Unit,
-
+                ReportLayType= ReportLayType.Group,
             }).ToList();
 
             // 分组
@@ -140,7 +140,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                     OrderMark = x.OrderMark,
                     ValueType = x.ValueType,
                     Unit = x.Unit,
-
+                    ReportLayType = ReportLayType.Question,
                 }).ToList();
 
                 // 问题
@@ -173,6 +173,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                         IsCanEditPosition = x.IsCanEditPosition,
                         RowIndex = x.RowIndex,
                         BlindName = x.BlindName,
+                        ReportLayType = ReportLayType.Lesions,
                     }).ToList();
 
 
@@ -194,6 +195,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             ShowOrder = x.ShowOrder,
                             ValueType = x.ValueType,
                             Unit = x.Unit,
+                            ReportLayType = ReportLayType.TableQuestion,
                         }).ToList();
 
 

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -58,6 +58,32 @@ namespace IRaCIS.Core.Domain.Share
         Percentage = 2
     }
 
+    /// <summary>
+    /// 报告层级
+    /// </summary>
+    public enum ReportLayType
+    {
+        /// <summary>
+        /// 分组
+        /// </summary>
+        Group=0,
+
+        /// <summary>
+        /// 问题
+        /// </summary>
+        Question = 1,
+
+        /// <summary>
+        /// 病灶
+        /// </summary>
+        Lesions = 2,
+
+        /// <summary>
+        /// 表格问题
+        /// </summary>
+        TableQuestion = 3,
+    }
+
     public enum ImagePlatform
     {
         None = 0,