From 182f47bbca1e82935944129551e93a1ca02bdf52 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Thu, 21 Jul 2022 16:50:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Allocation/VisitTaskHelpeService.cs | 2 +- .../Reading/Dto/ReadingImageTaskViewModel.cs | 24 ++++++++--- .../Reading/ReadingImageTaskService.cs | 43 +++++++++++++------ .../Reading/ReadingMedicalReviewService.cs | 5 +++ 4 files changed, 54 insertions(+), 20 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs index 5e79252e4..ce267b4d4 100644 --- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs +++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskHelpeService.cs @@ -703,7 +703,7 @@ namespace IRaCIS.Core.Application.Service SouceReadModuleId = firstTask.SouceReadModuleId, TaskCode = AppSettings.GetCodeStr(currentMaxCodeInt + 1, nameof(VisitTask)), TaskState = TaskState.Effect, - DoctorUserId = subjectUser == null ? null : subjectUser.Id, + DoctorUserId = subjectUser == null ? null : subjectUser.DoctorUserId, TaskAllocationState = subjectUser == null ? TaskAllocationState.NotAllocate : TaskAllocationState.Allocated, AllocateTime = subjectUser == null ? null : DateTime.Now, diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 79d5c8702..aaa596243 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -261,8 +261,6 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public List VisitTaskInfoList { get; set; } - - public ReadingTaskState ReadingTaskState { get; set; } /// @@ -312,14 +310,30 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public class JudgeReadingInfoDto { + public string VisitName { get; set; } + + public Guid VisitId { get; set; } + public Guid VisitTaskId { get; set; } public Arm ArmEnum { get; set; } - public List JudgeQuestionAnswerInfoList { get; set; } + public List JudgeQuestionList { get; set; } + } + + + public class JudgeQuestion + { + public Guid QuestionId { get; set; } + + + public string QuestionName { get; set; } + + public string Answer { get; set; } + + + } - public List TaskReadingQuestionList { get; set; } -} public class GetTrialReadingQuestionInDto { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 04613fa15..2aa19ff11 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -632,27 +632,42 @@ namespace IRaCIS.Application.Services JudgeResultImagePath = visitTask.JudgeResultImagePath, VisitTaskInfoList = new List() }; + var firstTask = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).FirstNotNullAsync(); var visitIds = await _visitTaskRepository.Where(x => x.JudgeVisitTaskId == inDto.VisitTaskId).Select(x => new { x.Id, x.ArmEnum, }).ToListAsync(); - foreach (var item in visitIds) + + switch (firstTask.ReadingCategory) { - var taskReadingQuestionList = await this.GetTaskAndAnswer(item.Id); - judgeInfo.VisitTaskInfoList.Add( - new JudgeReadingInfoDto() - { - JudgeQuestionAnswerInfoList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == item.Id && x.ReadingQuestionTrial.IsJudgeQuestion).Select(x => new JudgeQuestionAnswerInfo - { - Answer = x.Answer, - QuestionName = x.ReadingQuestionTrial.QuestionName, - }).ToListAsync(), - VisitTaskId = item.Id, - ArmEnum = item.ArmEnum, - TaskReadingQuestionList = taskReadingQuestionList, - }); + case ReadingCategory.Visit: + JudgeReadingInfoDto judgeReadingInfoDto = new JudgeReadingInfoDto() { + VisitId= firstTask.SourceSubjectVisitId.Value, + VisitName= firstTask.TaskBlindName, + }; + + + + break; } + + //foreach (var item in visitIds) + //{ + // var taskReadingQuestionList = await this.GetTaskAndAnswer(item.Id); + // judgeInfo.VisitTaskInfoList.Add( + // new JudgeReadingInfoDto() + // { + // JudgeQuestionAnswerInfoList = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == item.Id && x.ReadingQuestionTrial.IsJudgeQuestion).Select(x => new JudgeQuestionAnswerInfo + // { + // Answer = x.Answer, + // QuestionName = x.ReadingQuestionTrial.QuestionName, + // }).ToListAsync(), + // VisitTaskId = item.Id, + // ArmEnum = item.ArmEnum, + // TaskReadingQuestionList = taskReadingQuestionList, + // }); + //} return judgeInfo; } #endregion diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs index f9cf7a013..76818f88e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingMedicalReviewService.cs @@ -405,6 +405,11 @@ namespace IRaCIS.Core.Application.Service MedicalDialogCloseEnum = MedicalDialogClose.IRApplyReReading, }); } + + await _taskMedicalReviewRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.TaskMedicalReviewId, x => new TaskMedicalReview() + { + DoctorUserIdeaEnum = inDto.DoctorUserIdeaEnum, + }); ReadingMedicalReviewDialog dialog = new ReadingMedicalReviewDialog() { TaskMedicalReviewId = inDto.TaskMedicalReviewId,