From 608fee950bc5bc2f5f0401fdec0e6672497a5521 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 1 Dec 2022 17:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MedicalAudit/ReadingMedicalReviewService.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index ec7ba192a..dcf5307d8 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -80,9 +80,9 @@ namespace IRaCIS.Core.Application.Service MedicalReviewInfo reviewInfo= await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId) .ProjectTo(_mapper.ConfigurationProvider).FirstNotNullAsync(); - var visitTaskfInfo = await _visitTaskRepository.Where(x => x.Id == reviewInfo.VisitTaskId).FirstNotNullAsync(); + var taskInfo = await _visitTaskRepository.Where(x => x.Id == reviewInfo.VisitTaskId).Include(x => x.Subject).FirstNotNullAsync(); - var medicalReviewInfo = await _readingQuestionCriterionTrial.Where(x => x.Id == visitTaskfInfo.TrialReadingCriterionId).Select(x => new GetMedicalReviewReadingTaskOutDto() + var medicalReviewInfo = await _readingQuestionCriterionTrial.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => new GetMedicalReviewReadingTaskOutDto() { ReadingType=x.ReadingType, IsReadingTaskViewInOrder=x.IsReadingTaskViewInOrder, @@ -91,12 +91,12 @@ namespace IRaCIS.Core.Application.Service medicalReviewInfo.MedicalReviewInfo = reviewInfo; - var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReviewInfo.MedicalReviewInfo.VisitTaskId).Include(x=>x.Subject).FirstNotNullAsync(); + medicalReviewInfo.VisitTaskId = taskInfo.Id; medicalReviewInfo.ArmEnum = taskInfo.ArmEnum; - medicalReviewInfo.SubjectCode = visitTaskfInfo.Subject.Code; - medicalReviewInfo.TaskBlindName = visitTaskfInfo.TaskBlindName; + medicalReviewInfo.SubjectCode = taskInfo.Subject.Code; + medicalReviewInfo.TaskBlindName = taskInfo.TaskBlindName; medicalReviewInfo.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog; medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState; medicalReviewInfo.IsSendMessage = medicalReviewInfo.MedicalReviewInfo.IsSendMessage; @@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Service // 先判断是否是肿瘤学任务 if (taskInfo.ReadingCategory == ReadingCategory.Oncology) { - var oncologyList = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == visitTaskfInfo.Id).ToListAsync(); + var oncologyList = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == taskInfo.Id).ToListAsync(); var taskIds= oncologyList.Select(x=>x.VisitTaskId).ToList();