XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Uat_Study
he 2022-11-02 18:00:59 +08:00
parent dafec6e18f
commit 871e9d4a21
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
View File

@ -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<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
IEnumerable<string> 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)