diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_IRECIST1.1_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_IRECIST1.1_CN_V1.docx index 7c29d5e4b..f30ffe8e5 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_IRECIST1.1_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_IRECIST1.1_CN_V1.docx differ diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 09e3a70f2..eac77dd61 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -7367,7 +7367,7 @@ 新靶病灶信息 - + 新非靶病灶信息 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs index ab01bd991..0a783ab17 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs @@ -200,7 +200,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { get { - return GetTargetInfoList("NewVisitTargetInfoList"); ; + return GetTargetInfoList("NewNoVisitTargetInfoList"); ; } } } @@ -530,7 +530,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// /// 新非靶病灶信息 /// - public List NewVisitNoTargetInfoList { get; set; } = new List(); + public List NewNoVisitTargetInfoList { get; set; } = new List(); } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index ea9053b45..4a53cae18 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -105,7 +105,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate string getHavePreviousNewLesions(Guid visitId) { - var answer = answerList.Where(x => x.ReadingQuestionTrial.QuestionType == QuestionType.OtherNewTargetLesion && x.Id == visitId).Select(x => x.Answer).FirstIsNullReturnEmpty(); + var answer = answerList.Where(x => x.ReadingQuestionTrial.QuestionType == QuestionType.OtherNewTargetLesion && x.VisitTaskId == visitId).Select(x => x.Answer).FirstIsNullReturnEmpty(); if(answer==string.Empty) { return string.Empty; @@ -152,7 +152,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate VisitTargetInfoList = getLesionInfo(LesionType.TargetLesion, x.Id,5), VisitNoTargetInfoList = getLesionInfo(LesionType.NonTargetLesions, x.Id), NewVisitTargetInfoList = getLesionInfo(LesionType.NewTargetLesion, x.Id,5), - NewVisitNoTargetInfoList = getLesionInfo(LesionType.NewNonTargetLesion, x.Id), + NewNoVisitTargetInfoList = getLesionInfo(LesionType.NewNonTargetLesion, x.Id), }).OrderBy(x => x.VisitNum).ToList();