diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 5e0723b6..5a32eaf6 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -104,6 +104,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public ValueUnit? Unit { get; set; } + public decimal FristAddTaskNum { get; set; } + + public ReportLayType ReportLayType { get; set; } = ReportLayType.Group; + public List Answer { get; set; } = new List(); public List Childrens { get; set; } = new List(); diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index a3253dda..df2c62e1 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/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(); diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 54bdc619..9783e436 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/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(); diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 61bccfd4..5d491e2c 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -58,6 +58,32 @@ namespace IRaCIS.Core.Domain.Share Percentage = 2 } + /// + /// 报告层级 + /// + public enum ReportLayType + { + /// + /// 分组 + /// + Group=0, + + /// + /// 问题 + /// + Question = 1, + + /// + /// 病灶 + /// + Lesions = 2, + + /// + /// 表格问题 + /// + TableQuestion = 3, + } + public enum ImagePlatform { None = 0,