From 5144a2e2b3fde2b0edc1c91b9ee264bca1685fc4 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 1 Dec 2022 17:16:14 +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 --- .../Service/Reading/Dto/ReadingMedicalReviewDto.cs | 5 +++++ .../Reading/MedicalAudit/ReadingMedicalReviewService.cs | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs index 354f82fa5..3ce4b7eb8 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicalReviewDto.cs @@ -365,6 +365,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto //阅片类型 public ReadingMethod ReadingType { get; set; } + public string SubjectCode { get; set; } + + + public string TaskBlindName { get; set; } + public bool IsReadingTaskViewInOrder { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs index 08e88f2c4..ec7ba192a 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs @@ -91,15 +91,17 @@ namespace IRaCIS.Core.Application.Service medicalReviewInfo.MedicalReviewInfo = reviewInfo; - var taskInfo = await _visitTaskRepository.Where(x => x.Id == medicalReviewInfo.MedicalReviewInfo.VisitTaskId).FirstNotNullAsync(); + 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.IsClosedDialog = medicalReviewInfo.MedicalReviewInfo.IsClosedDialog; medicalReviewInfo.AuditState = medicalReviewInfo.MedicalReviewInfo.AuditState; medicalReviewInfo.IsSendMessage = medicalReviewInfo.MedicalReviewInfo.IsSendMessage; - + medicalReviewInfo.QuestionAnswerList = await this.GetMedicalQuestionAnswer(inDto);