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

Ivus 计算修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-12-17 10:17:29 +08:00
parent 3f1d07727b
commit f199d18c4b
2 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,7 +481,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List<int> nums=new List<int>() { 1,2,3}; List<int> nums=new List<int>() { 1,2,3};
if(measuredValueList.Any(x=> !nums.Contains(x.PlaqueNum))) if(measuredValueList.Any(x=> !nums.Contains(x.PlaqueNum)))
{ {
throw new BusinessValidationFailedException(_localizer["IVUS_EmmBiggerThenLumen"]); throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]);
} }
measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList(); measuredValueList = measuredValueList.OrderBy(x => x.PlaqueNum).ToList();
@ -740,6 +740,21 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
TableQuestionId = pAvTableQuestionList.Where(x => x.QuestionMark == QuestionMark.PAV).Select(x => x.Id).FirstOrDefault(), TableQuestionId = pAvTableQuestionList.Where(x => x.QuestionMark == QuestionMark.PAV).Select(x => x.Id).FirstOrDefault(),
}); });
// 添加PAV其他问题答案
foreach (var otherQuestion in pAvTableQuestionList.Where(x => !tableAnswers.Any(y => y.TableQuestionId == x.Id && y.RowId == newPAVRowId)))
{
tableAnswers.Add(new ReadingTableQuestionAnswer()
{
Answer = string.Empty,
QuestionId = pAVquestionInfo!.QuestionId,
TrialId = inDto.TrialId,
VisitTaskId = inDto.VisitTaskId,
RowId = newPAVRowId,
RowIndex = item,
TableQuestionId = otherQuestion.Id,
});
}
#endregion #endregion
@ -783,20 +798,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}); });
} }
// 添加PAV其他问题答案
foreach (var otherQuestion in pAvTableQuestionList.Where(x => !tableAnswers.Any(y => y.TableQuestionId == x.Id && y.RowId == newRowId)))
{
tableAnswers.Add(new ReadingTableQuestionAnswer()
{
Answer = string.Empty,
QuestionId = pAVquestionInfo!.QuestionId,
TrialId = inDto.TrialId,
VisitTaskId = inDto.VisitTaskId,
RowId = newRowId,
RowIndex = item,
TableQuestionId = otherQuestion.Id,
});
}
} }
await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => (x.QuestionId == questionInfo.QuestionId || x.QuestionId == pAVquestionInfo.QuestionId) && x.VisitTaskId == inDto.VisitTaskId); await _readingTableAnswerRowInfoRepository.BatchDeleteNoTrackingAsync(x => (x.QuestionId == questionInfo.QuestionId || x.QuestionId == pAVquestionInfo.QuestionId) && x.VisitTaskId == inDto.VisitTaskId);

4
IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs
View File

@ -339,7 +339,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List<int> nums = new List<int>() { 1, 2, 3 }; List<int> nums = new List<int>() { 1, 2, 3 };
if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum))) if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum)))
{ {
throw new BusinessValidationFailedException(_localizer["IVUS_EmmBiggerThenLumen"]); throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]);
} }
} }
catch (Exception) catch (Exception)
@ -649,7 +649,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
List<int> nums = new List<int>() { 1, 2, 3 }; List<int> nums = new List<int>() { 1, 2, 3 };
if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum))) if (measuredValueList.Any(x => !nums.Contains(x.PlaqueNum)))
{ {
throw new BusinessValidationFailedException(_localizer["IVUS_EmmBiggerThenLumen"]); throw new BusinessValidationFailedException(_localizer["IVUSOCT_PlaqueNum123"]);
} }
} }
catch (Exception) catch (Exception)