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 1bd4a5718..9b8c6293a 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.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_EN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_EN_V1.docx index d60dc69bc..b6c3a7c93 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_EN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_RECIST1.1_EN_V1.docx differ diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs index 91fbbb0dd..16631e2eb 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs @@ -181,6 +181,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string OneDoctorSignTime { get; set; } = string.Empty; + public string OneDoctorSign { get; set; } = string.Empty; + public string TwoVisitName { get; set; } = string.Empty; public string TwoCheckDate { get; set; } = string.Empty; @@ -200,6 +202,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string TwoDoctorSignTime { get; set; } = string.Empty; + public string TwoDoctorSign { get; set; } = string.Empty; + public string ThreeVisitName { get; set; } = string.Empty; public string ThreeCheckDate { get; set; } = string.Empty; @@ -217,6 +221,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string ThreeOverallResult { get; set; } = string.Empty; public string ThreeDoctorSignTime { get; set; } = string.Empty; + + public string ThreeDoctorSign { get; set; } = string.Empty; } public class ExportVisitData diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 7ca57a266..e7f1899a9 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -233,11 +233,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (i >= forCount - 1) { export.IsLastPage = true; + // 之后最后一个任务需要签名 + var thisVisitListNum = export.VisitList.Count(); + switch (thisVisitListNum) + { + case 1: + export.Lesion.OneDoctorSign = "签字:"; + break; + case 2: + export.Lesion.TwoDoctorSign = "签字:"; + break; + case 3: + export.Lesion.ThreeDoctorSign = "签字:"; + break; + } + } resultdata.Add(export); } + + var value = new {