This commit is contained in:
@@ -869,8 +869,22 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||||||
|
|
||||||
foreach (var item in recistTableAnswers)
|
foreach (var item in recistTableAnswers)
|
||||||
{
|
{
|
||||||
|
var rowinfo = tableRowAnswers.Where(y => y.OriginalId == item.RowId).FirstOrDefault();
|
||||||
|
if (rowinfo != null)
|
||||||
|
{
|
||||||
|
item.QuestionId = rowinfo.QuestionId;
|
||||||
|
|
||||||
|
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.QuestionId = tableRowAnswers.Where(y => y.OriginalId == item.RowId).Select(x => x.QuestionId).FirstOrDefault();
|
|
||||||
item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault();
|
item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -880,6 +894,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
|||||||
{
|
{
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
var tableAnswers = recistTableAnswers.Select(x => new ReadingTableQuestionAnswer
|
var tableAnswers = recistTableAnswers.Select(x => new ReadingTableQuestionAnswer
|
||||||
{
|
{
|
||||||
Id = NewId.NextGuid(),
|
Id = NewId.NextGuid(),
|
||||||
|
|||||||
Reference in New Issue
Block a user