diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
index bd5780b54..efa81ead8 100644
--- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
+++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
@@ -113,7 +113,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var criterionId = visitTaskInfo.TrialReadingCriterionId;
var questionList = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == criterionId)
- .Where(x => x.LesionType != LesionType.BaselineLesions)
+ //.Where(x => x.LesionType != LesionType.BaselineLesions)
+ .Where(x=>x.QuestionType!=QuestionType.TherapeuticEffectEvaluationGroup)
.ToListAsync();
// 新病灶
@@ -627,7 +628,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
///
public async Task GetBaseLineLesionsCount(ReadingCalculateDto inDto)
{
- return inDto.QuestionInfo.Where(x => x.LesionType == LesionType.BaselineLesions).SelectMany(x => x.TableRowInfoList).Count();
+ return inDto.QuestionInfo.Where(x => x.LesionType == LesionType.BaselineLesions).SelectMany(x => x.TableRowInfoList)
+ .Where(x => x.TableQuestionList.Any(y => y.QuestionMark == QuestionMark.State && y.Answer == EvaluationOfState.Exists.GetEnumInt())).Count();
}
#endregion