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

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

Test_HIR_Net8
he 2025-09-26 15:53:02 +08:00
parent 2ba9e6e2d4
commit d72b28afc2
7 changed files with 85 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/ReportTemplate_IRECIST_CN_V1.docx
View File

Binary file not shown.

20
IRaCIS.Core.Application/Service/ReadingCalculate/General/GeneralCalculateService.cs
View File

@ -530,7 +530,25 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
if (item2.Value.ToString() == string.Empty || item.Value == null)
{
column[item2.Key] = "-";
bool isOrgan = false;
try
{
if (item2.Key == "Organ" && column["RowMark"] == string.Empty || column["RowMark"] == "-")
{
column[item2.Key] = string.Empty;
isOrgan = true;
}
}
catch (Exception)
{
}
if (!isOrgan)
{
column[item2.Key] = "-";
}
};
}

54
IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs
View File

@ -411,6 +411,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
taskIds.Add(relatedVisitTask.Item1[count - 1].VisitTaskId);
}
var isConvertedTaskList = await _visitTaskRepository.Where(x => taskIds.Contains(x.Id)).Select(x => new { x.Id, x.IsConvertedTask }).ToListAsync();
relatedVisitTask.Item1 = relatedVisitTask.Item1.Where(x => taskIds.Contains(x.VisitTaskId)).ToList();
// 所有访视问题的答案
var answerList = await _readingTaskQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).ToListAsync();
@ -455,11 +458,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
Dictionary<string, object> target = new Dictionary<string, object>()
{
{ "RowMark","-"},
{ "Organ","-"},
{ "FirstVisit","-" },
{ "SecondVisit", "-" },
{ "ThirdlyVisit", "-" },
{ "RowMark",string.Empty},
{ "Organ",string.Empty},
{ "FirstVisit",string.Empty },
{ "SecondVisit", string.Empty },
{ "ThirdlyVisit", string.Empty },
};
targetInfo.Add(target);
}
@ -509,18 +512,53 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
foreach (var item in exports)
{
item.QuestionName = _generalCalculateService.GetTrialQuestionName(trialQuestion, item.QuestionType);
Dictionary<string, object> questionAnswer = new Dictionary<string, object>()
{
{"Name", item.QuestionName},
{"FirstVisit", _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[0],item.QuestionType)},
{"SecondVisit", relatedCount>=2? _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[1],item.QuestionType):string.Empty },
{"ThirdlyVisit", relatedCount>=3? _generalCalculateService.GetTaskanswer(answerList,dictionList,unitDictionary,taskIds[2],item.QuestionType):string.Empty },
{"FirstVisit", GetAnswerWithFallback(taskIds[0],item) },
{"SecondVisit", relatedCount>=2? GetAnswerWithFallback(taskIds[1],item):string.Empty },
{"ThirdlyVisit", relatedCount>=3? GetAnswerWithFallback(taskIds[2],item):string.Empty },
};
questionAnswerList.Add(questionAnswer);
}
return questionAnswerList;
}
string GetAnswerWithFallback(Guid taskId, ExportReportQuestion item)
{
var answer=string.Empty;
List<QuestionType> questionTypes = new List<QuestionType>() {
QuestionType.ComparedTriggeringSODChange,
QuestionType.ISOD,
QuestionType.ComparedTriggeringiSODChange,
QuestionType.NewTargetLesion,
QuestionType.NewNoTargetLesion,
QuestionType.OtherNewTargetLesion,
QuestionType.IRECISTNewTargetLesion,
QuestionType.NewLesionEvaluation,
};
if (questionTypes.Contains(item.QuestionType) && !isConvertedTaskList.Any(x => x.IsConvertedTask && x.Id == taskId))
{
answer= "NA";
}
else
{
answer = _generalCalculateService.GetTaskanswer(answerList, dictionList, unitDictionary, taskId, item.QuestionType);
}
return answer;
}
#endregion
var studyInfo = (await _dicomStudyRepository.Where(x => x.SubjectVisitId == taskinfo.SourceSubjectVisitId).Select(x => new

10
IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs
View File

@ -376,11 +376,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
Dictionary<string, object> target = new Dictionary<string, object>()
{
{ "RowMark","-"},
{ "Organ","-"},
{ "FirstVisit","-" },
{ "SecondVisit", "-" },
{ "ThirdlyVisit", "-" },
{ "RowMark",string.Empty},
{ "Organ",string.Empty},
{ "FirstVisit",string.Empty },
{ "SecondVisit", string.Empty },
{ "ThirdlyVisit", string.Empty },
};
targetInfo.Add(target);
}

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

@ -170,11 +170,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
Dictionary<string, object> target = new Dictionary<string, object>()
{
{ "RowMark","-"},
{ "Organ","-"},
{ "FirstVisit","-" },
{ "SecondVisit", "-" },
{ "ThirdlyVisit", "-" },
{ "RowMark",string.Empty},
{ "Organ",string.Empty},
{ "FirstVisit",string.Empty },
{ "SecondVisit", string.Empty },
{ "ThirdlyVisit", string.Empty },
};
targetInfo.Add(target);
}

10
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -373,11 +373,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
Dictionary<string, object> target = new Dictionary<string, object>()
{
{ "RowMark","-"},
{ "Organ","-"},
{ "FirstVisit","-" },
{ "SecondVisit", "-" },
{ "ThirdlyVisit", "-" },
{ "RowMark",string.Empty},
{ "Organ",string.Empty},
{ "FirstVisit",string.Empty },
{ "SecondVisit", string.Empty },
{ "ThirdlyVisit", string.Empty },
};
targetInfo.Add(target);
}

10
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs
View File

@ -366,11 +366,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
Dictionary<string, object> target = new Dictionary<string, object>()
{
{ "RowMark","-"},
{ "Organ","-"},
{ "FirstVisit","-" },
{ "SecondVisit", "-" },
{ "ThirdlyVisit", "-" },
{ "RowMark",string.Empty},
{ "Organ",string.Empty},
{ "FirstVisit",string.Empty },
{ "SecondVisit", string.Empty },
{ "ThirdlyVisit", string.Empty },
};
targetInfo.Add(target);
}