代码提交
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
he 2025-09-10 15:48:35 +08:00
parent 87709f0122
commit ad62ad7ae0
2 changed files with 9 additions and 1 deletions

View File

@ -117,12 +117,20 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
int num = 1;
foreach (var item in targetFocus)
{
// 以最后一个为准
var typicalIntrahepaticLesions = tableAnswerList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == lesionType && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.TypicalIntrahepaticLesion && x.RowIndex == item.RowIndex).Select(x => x.Answer).FirstIsNullReturnEmpty();
var typicalIntrahepaticLesionsText = string.Empty;
if (typicalIntrahepaticLesions == ((int)ReadingYesOrNo.Yes).ToString())
{
typicalIntrahepaticLesionsText = $"\n{_localizer["CriterionCalculateExport_TIL"]}";
}
VisitLesionInfo target = new VisitLesionInfo
{
RowMark = rowinfoList.Where(x => x.VisitTaskId == Visittaskid && x.RowIndex == item.RowIndex && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowMark).FirstIsNullReturnEmpty(),
Organ = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Organ, item.RowIndex),
Part = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Part, item.RowIndex),
Part = _generalCalculateService.GetTaskTableAnswer(tableAnswerList, dictionList, unitDictionary, Visittaskid, lesionType, QuestionMark.Part, item.RowIndex)+ typicalIntrahepaticLesionsText,
Number = num,
StudyIdStr = instanceList.Where(x => x.Id == item.InstanceId).Select(x => x.DicomSerie.DicomStudy.StudyId).FirstIsNullReturnEmpty(),
RowId = item.Id,