diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs index 1d0929520..98b07fd7f 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs @@ -1374,8 +1374,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate foreach (var item in recistTableAnswers) { + var rowinfo = tableRowAnswers.Where(y => y.OriginalId == item.RowId).FirstOrDefault(); + if (rowinfo != null) + { + item.QuestionId = rowinfo.QuestionId; - item.QuestionId = tableRowAnswers.Where(y => y.OriginalId == item.RowId).Select(x => x.QuestionId).FirstOrDefault(); + var IslymphNode= recistTableAnswers.Where(x=>x.RowId== rowinfo.Id&&x.QuestionMark==QuestionMark.IsLymph).Select(x=>x.Answer).FirstIsNullReturnEmpty().EqEnum(YesOrNoOrNa.Yes); + var minorAxis= recistTableAnswers.Where(x => x.RowId == rowinfo.Id && x.QuestionMark == QuestionMark.ShortAxis).Select(x => x.Answer).FirstIsNullReturnEmpty().IsNullOrEmptyReturn0(); + + var iSbetween15and20= minorAxis >= 15 && minorAxis < 20; + if (item.QuestionMark == QuestionMark.State && IslymphNode && iSbetween15and20 && rowinfo.LesionType == LesionType.TargetLesion) + { + item.Answer = string.Empty; + } + } + item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault(); } @@ -1386,6 +1399,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { }; + var tableAnswers = recistTableAnswers.Select(x => new ReadingTableQuestionAnswer { Id = NewId.NextGuid(),