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

复制修改

Test_IRC_Net8
he 2025-04-23 13:56:36 +08:00
parent bdeb7c464e
commit f79a8b4cfb
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -793,6 +793,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}
else
{
// 基线任务
// 如果是基线 要把res1.1的病灶复制过来
var recistTask = await _visitTaskRepository.Where(x =>
x.TrialId == taskinfo.TrialId &&
@ -806,17 +807,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{
var trialReadingCriterion=await _readingQuestionCriterionTrialRepository.Where(x => x.Id == recistTask.TrialReadingCriterionId).FirstOrDefaultAsync();
var trialReadingCriterion=await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).FirstOrDefaultAsync();
var tableRowAnswers = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == recistTask.Id).ProjectTo<CopyTableAnswerRowInfo>(_mapper.ConfigurationProvider).ToListAsync();
var tableQuestionList = await _readingTableQuestionTrialRepository.Where(x => x.TrialCriterionId == taskinfo.TrialReadingCriterionId).ToListAsync();
foreach (var rowInfo in tableRowAnswers)
{
var question= await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId && x.LesionType == x.LesionType).FirstOrDefaultAsync();
var organ = await _organInfoRepository.Where(x => x.Id == rowInfo.OrganInfoId).FirstOrDefaultAsync();
var question = await _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId == taskinfo.TrialReadingCriterionId && x.LesionType == x.LesionType).FirstOrDefaultAsync();
var newOrgan = await _organInfoRepository.Where(x => x.SystemCriterionId == trialReadingCriterion.ReadingQuestionCriterionSystemId &&
var organ = await _organInfoRepository.Where(x => x.Id == rowInfo.OrganInfoId).FirstOrDefaultAsync();
if (organ != null)
{
var newOrgan = await _organInfoRepository.Where(x => x.SystemCriterionId == trialReadingCriterion.ReadingQuestionCriterionSystemId &&
x.Classification == organ.TULOC &&
x.Part == organ.Part &&
x.TULOC == organ.TULOC &&
@ -824,9 +827,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
x.IsLymphNodes == organ.IsLymphNodes
).FirstOrDefaultAsync();
if (newOrgan != null)
{
rowInfo.OrganInfoId = newOrgan.Id;
if (newOrgan != null)
{
rowInfo.OrganInfoId = newOrgan.Id;
}
}
rowInfo.VisitTaskId = visitTaskId;
rowInfo.IsCurrentTaskAdd = true;
@ -854,12 +858,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
foreach (var item in recistTableAnswers)
{
item.QuestionId = tableRowAnswers.Where(y => y.OriginalId == item.RowId).Select(x => x.QuestionId).FirstOrDefault();
item.TableQuestionId = tableQuestionList.Where(x => x.ReadingQuestionId == item.QuestionId && x.QuestionMark == item.QuestionMark).Select(x => x.Id).FirstOrDefault();
}
List<QuestionMark?> notNeedCopyMarks = new List<QuestionMark?>()
{
QuestionMark.MajorAxis,