diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index c25be1f22..14dda6423 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -4849,7 +4849,7 @@ - 获取肿瘤评估 逻辑抽离 + 获取肿瘤评估 逻辑抽离 这里还要返回上一次的结果 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index a44b7c1fe..76b639edf 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -1335,11 +1335,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { if (lastTask != null) { - // 如果不是PD 需要把上一次的PD改为NoPD 这里去掉临时答案就是原始答案 - await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == lastTask.VisitTaskId&&x.ReadingQuestionTrial.QuestionType== QuestionType.SiteVisitForTumorEvaluation, x => new ReadingTaskQuestionAnswer + if (numOfDaysBetween == null) { - PCWGInterimAnswer = string.Empty, - }); + // 如果不是PD 需要把上一次的PD改为NoPD 这里去掉临时答案就是原始答案 + await _readingTaskQuestionAnswerRepository.BatchUpdateNoTrackingAsync(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation, x => new ReadingTaskQuestionAnswer + { + PCWGInterimAnswer = string.Empty, + }); + } var lastTaskResult = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrial.QuestionType == QuestionType.SiteVisitForTumorEvaluation).Select(x => x.Answer).FirstOrDefaultAsync(); result.LastTaskResult = lastTaskResult;