Uat_Study
he 2022-11-30 15:55:52 +08:00
parent 6476b15832
commit cfd5387b77
2 changed files with 20 additions and 9 deletions

View File

@ -593,6 +593,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public Guid SubjectId { get; set; } public Guid SubjectId { get; set; }
/// <summary>
/// 肿瘤学结果
/// </summary>
public string OncologyEvaluationResult { get; set; } = string.Empty;
/// <summary>
/// 肿瘤学原因
/// </summary>
public string OncologyEvaluationReason { get; set; } = string.Empty;
public List<JudgeQuestionAnswerInfo> JudgeQuestionAnswerInfoList { get; set; } public List<JudgeQuestionAnswerInfo> JudgeQuestionAnswerInfoList { get; set; }
} }

View File

@ -171,18 +171,19 @@ namespace IRaCIS.Core.Application.Service
}).ToListAsync()); }).ToListAsync());
// 肿瘤学没有问题 // 肿瘤学没有问题
//visitTaskAnswer.AddRange(await _readingOncologyTaskInfoRepository.Where(x => taskIds.Contains(x.OncologyTaskId)).Select(x => new JudgeQuestionAnswerInfo var oncologyInfoList= await _readingOncologyTaskInfoRepository.Where(x => taskIds.Contains(x.OncologyTaskId)).ToListAsync();
//{
// Answer = x.SubjectId,
// VisitTaskId = x.OncologyTaskId,
// DictionaryCode = x.TrialReadingQuestion.DictionaryCode,
// ShowOrder = x.TrialReadingQuestion.ShowOrder,
// QuestionGenre = x.TrialReadingQuestion.QuestionGenre,
// QuestionName = x.TrialReadingQuestion.QuestionName
//}).ToListAsync());
medicalReviewInfo.TaskList.ForEach(x => medicalReviewInfo.TaskList.ForEach(x =>
{ {
var oncologyInfo = oncologyInfoList.Where(y => y.OncologyTaskId == x.TaskId).FirstOrDefault();
if (oncologyInfo != null)
{
x.OncologyEvaluationResult = oncologyInfo.EvaluationResult;
x.OncologyEvaluationReason = oncologyInfo.EvaluationResult;
}
x.JudgeQuestionAnswerInfoList = visitTaskAnswer.Where(y => y.VisitTaskId == x.TaskId).OrderBy(y => y.ShowOrder).ToList(); x.JudgeQuestionAnswerInfoList = visitTaskAnswer.Where(y => y.VisitTaskId == x.TaskId).OrderBy(y => y.ShowOrder).ToList();
}); });
} }