diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_CN_V1.docx index 9f6fafc68..583d92929 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_CN_V1.docx differ diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs index b80a109ce..91fbbb0dd 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs @@ -21,6 +21,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public List VisitList { get; set; } + public bool IsLastPage { get; set; } = false; + /// /// 受试者Code /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index a4726b404..5348f814b 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -156,7 +156,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate Number = i, }; targetInfo.Add(target); - + } } @@ -198,10 +198,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate List resultdata = new List(); - List times= new List() { "One", "Two", "Three" }; List columns=new List() { "VisitName", "CheckDate","CheckInfoStr", "HaveNewLesion", "TargetResult", "NoTargetResult", "OverallResult", "DoctorSignTime" }; - for (int i = 0; i < (int)Math.Ceiling((double)exportVisitDatas.Count() / 3); i++) + + var forCount = (int)Math.Ceiling((double)exportVisitDatas.Count() / 3); + for (int i = 0; i < forCount; i++) { ExportTumorEvaluationInfo export = new ExportTumorEvaluationInfo { @@ -228,14 +229,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } + if (i >= forCount - 1) + { + export.IsLastPage = true; + } resultdata.Add(export); } - + var value = new { VisitTaskList = resultdata, + IsLastPage = false, };