From 871e9d4a21b25d734acc841be9abaa36d182af8d Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 2 Nov 2022 18:00:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/PCWG3CalculateService.cs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index 65c97ebd4..c8d42b02a 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -632,28 +632,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate string errorMassage = string.Empty; - //var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null)) - // .Select(x => new - // { - // x.ReadingQuestionTrial.OrderMark, - // x.RowIndex, - // x.Id, - // }).ToListAsync(); + var rowAnswerList = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.MeasureData == string.Empty || x.MeasureData == null)) + .Select(x => new + { + x.ReadingQuestionTrial.OrderMark, + x.RowIndex, + x.Id, + }).ToListAsync(); - //var unableEvaluateRowIds = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.Answer == TargetState.UnableEvaluate.GetEnumInt() - // && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State - //) - // .Select(x => x.RowId).Distinct().ToListAsync(); + var unableEvaluateRowIds = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.Answer == EvaluationOfState.Benign.GetEnumInt() + && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State + ) + .Select(x => x.RowId).Distinct().ToListAsync(); - //IEnumerable measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList(); + IEnumerable measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList(); - //if (measureDataList.Count() > 0) - //{ - // errorMassage += $" 病灶{ string.Join(',', measureDataList)}不存在标记,"; - //} + if (measureDataList.Count() > 0) + { + errorMassage += $" 病灶{ string.Join(',', measureDataList)}不存在标记,"; + } if (tableAnswerList.Count > 0)