diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs index ad18b3319..67766fe86 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs @@ -593,6 +593,16 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public Guid SubjectId { get; set; } + /// + /// 肿瘤学结果 + /// + public string OncologyEvaluationResult { get; set; } = string.Empty; + + /// + /// 肿瘤学原因 + /// + public string OncologyEvaluationReason { get; set; } = string.Empty; + public List JudgeQuestionAnswerInfoList { get; set; } } diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index 3d7cd12ef..8749a8744 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -171,18 +171,19 @@ namespace IRaCIS.Core.Application.Service }).ToListAsync()); // 肿瘤学没有问题 - //visitTaskAnswer.AddRange(await _readingOncologyTaskInfoRepository.Where(x => taskIds.Contains(x.OncologyTaskId)).Select(x => new JudgeQuestionAnswerInfo - //{ - // Answer = x.SubjectId, - // VisitTaskId = x.OncologyTaskId, - // DictionaryCode = x.TrialReadingQuestion.DictionaryCode, - // ShowOrder = x.TrialReadingQuestion.ShowOrder, - // QuestionGenre = x.TrialReadingQuestion.QuestionGenre, - // QuestionName = x.TrialReadingQuestion.QuestionName - //}).ToListAsync()); + var oncologyInfoList= await _readingOncologyTaskInfoRepository.Where(x => taskIds.Contains(x.OncologyTaskId)).ToListAsync(); + + + 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(); }); }