复制修改
parent
bdeb7c464e
commit
f79a8b4cfb
|
@ -793,6 +793,7 @@ 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 &&
|
||||||
|
@ -806,16 +807,18 @@ 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 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 &&
|
||||||
|
@ -828,6 +831,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
|
||||||
{
|
{
|
||||||
rowInfo.OrganInfoId = newOrgan.Id;
|
rowInfo.OrganInfoId = newOrgan.Id;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
rowInfo.VisitTaskId = visitTaskId;
|
rowInfo.VisitTaskId = visitTaskId;
|
||||||
rowInfo.IsCurrentTaskAdd = true;
|
rowInfo.IsCurrentTaskAdd = true;
|
||||||
rowInfo.Id = NewId.NextGuid();
|
rowInfo.Id = NewId.NextGuid();
|
||||||
|
@ -854,12 +858,11 @@ 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,
|
||||||
|
|
Loading…
Reference in New Issue