diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 91bb7e521..9008dd605 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -909,13 +909,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate if (stateQuestion != null) { - // 找到主病灶的状态 - var state = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == (int)Math.Floor(inDto.RowNumber) && x.TableQuestionId == stateQuestion.Id).Select(x => x.Answer).FirstOrDefaultAsync(); + //// 找到主病灶的状态 + //var state = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.RowIndex == (int)Math.Floor(inDto.RowNumber) && x.TableQuestionId == stateQuestion.Id).Select(x => x.Answer).FirstOrDefaultAsync(); // 长径 var majorAxis = (await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && - x.RowIndex == (int)Math.Floor(inDto.RowNumber) && + x.RowIndex == inDto.RowNumber && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.MajorAxis && x.QuestionId == targetQuestion.Id ).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0(); @@ -923,7 +923,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 短径 var shortAxis = (await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && - x.RowIndex == (int)Math.Floor(inDto.RowNumber) && + x.RowIndex == inDto.RowNumber && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.ShortAxis && x.QuestionId == targetQuestion.Id ).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0(); @@ -946,7 +946,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var lowPPDInfo = await GetLowPPDInfo(new GetPPDInfoInDto() { - RowIndex = (int)Math.Floor(inDto.RowNumber), + RowIndex = inDto.RowNumber, VisitTaskId = inDto.VisitTaskId, QuestionId = inDto.QuestionId, }); @@ -977,18 +977,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } ); } - else if (state == TargetState.DiseaseProgression.GetEnumInt()) - { - //await _readingTableQuestionAnswerRepository.UpdatePartialFromQueryAsync(x => - // x.VisitTaskId == inDto.VisitTaskId && - // x.RowIndex == inDto.RowNumber && - // x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && - // x.QuestionId == targetQuestion.Id, x => new ReadingTableQuestionAnswer() - // { - // Answer = TargetState.Exist.GetEnumInt() - // } - // ); - } + //else if (state == TargetState.DiseaseProgression.GetEnumInt()) + //{ + // //await _readingTableQuestionAnswerRepository.UpdatePartialFromQueryAsync(x => + // // x.VisitTaskId == inDto.VisitTaskId && + // // x.RowIndex == inDto.RowNumber && + // // x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State && + // // x.QuestionId == targetQuestion.Id, x => new ReadingTableQuestionAnswer() + // // { + // // Answer = TargetState.Exist.GetEnumInt() + // // } + // // ); + //} }