Compare commits

..

No commits in common. "e954ea8538d673aeb5c7c2e0001924d54710ddba" and "8fc01e25090d46a946d2494329e1a0619adb9831" have entirely different histories.

1 changed files with 9 additions and 12 deletions

View File

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