diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
index 87320cdee..b5476d799 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
@@ -2379,11 +2379,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
///
public async Task GetTargetLesionEvaluate(ReadingCalculateDto inDto)
{
+
+
+
var rowInfo = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
- //if (inDto.IsBaseLine)
- //{
- // return TargetAssessment.NA.GetEnumInt();
- //}
+ if (inDto.IsBaseLine)
+ {
+ return TargetAssessment.NA.GetEnumInt();
+ }
var tableQuestions = rowInfo.SelectMany(x => x.TableQuestionList).ToList();
TargetAssessment result = TargetAssessment.SD;
@@ -2486,10 +2489,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
NoTargetAssessment result = NoTargetAssessment.PD;
- //if (inDto.IsBaseLine)
- //{
- // return NoTargetAssessment.NA.GetEnumInt();
- //}
+ if (inDto.IsBaseLine)
+ {
+ return NoTargetAssessment.NA.GetEnumInt();
+ }
var tableRows = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NonTargetLesions).SelectMany(x => x.TableRowInfoList).ToList();