From fb498b3723fcabd059f0d2906c636596de60d585 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 29 Feb 2024 14:06:17 +0800 Subject: [PATCH] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E9=98=85=E7=89=87?= =?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/ReadingImageTaskViewModel.cs | 4 +++- .../ReadingImageTask/ReadingOncologyTaskService.cs | 11 +++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 3d6a8c9ea..bc8d32f50 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1317,7 +1317,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public bool IsBaseLine { get; set; } - public bool IsHaveChange { get; set; } + public decimal VisitNum { get; set; } + + public bool IsHaveChange { get; set; } public string VisitRemark { get; set; } = string.Empty; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs index 438de68c8..ca38c5187 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs @@ -215,7 +215,9 @@ namespace IRaCIS.Application.Services { VisitName = x.SourceSubjectVisit.VisitName, IsBaseLine = x.SourceSubjectVisit.IsBaseLine, - VisitTaskId = x.Id, + VisitNum=x.SourceSubjectVisit.VisitNum, + + VisitTaskId = x.Id, // QuestionList = x.ReadingTaskQuestionAnswerList.Where(y => y.ReadingQuestionTrial.IsJudgeQuestion).OrderBy(y => y.ReadingQuestionTrial.ShowOrder) //.Select(y => new OncologyQuestion() //{ @@ -225,7 +227,7 @@ namespace IRaCIS.Application.Services //}).ToList() }).ToListAsync(); - var oncologyReadingQuestions = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == inDto.VisitTaskId).ToListAsync(); + var oncologyReadingQuestions = await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == inDto.VisitTaskId).Include(x=>x.VisitTask).ToListAsync(); // 上一次肿瘤学阅片 var lastOncologyTask = await _visitTaskRepository.Where(x => @@ -241,7 +243,7 @@ namespace IRaCIS.Application.Services if (lastOncologyTask != null&& taskInfo.TaskState==TaskState.Effect&&taskInfo.ReadingTaskState!=ReadingTaskState.HaveSigned) { - lastOncologyAnswerList= await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == lastOncologyTask.Id).ToListAsync(); + lastOncologyAnswerList= await _readingOncologyTaskInfoRepository.Where(x => x.OncologyTaskId == lastOncologyTask.Id).Include(x => x.VisitTask).ToListAsync(); } @@ -249,7 +251,8 @@ namespace IRaCIS.Application.Services oncologyVisits.ForEach(x => { var oncologyData = oncologyReadingQuestions.Where(y => y.VisitTaskId == x.VisitTaskId).FirstOrDefault(); - var lastOncologyData = lastOncologyAnswerList.Where(y => y.VisitTaskId == x.VisitTaskId).FirstOrDefault(); + /// 根据任务编号匹配 不区分 r1 r2 + var lastOncologyData = lastOncologyAnswerList.Where(y => y.VisitTask.VisitTaskNum == x.VisitNum).FirstOrDefault(); var evaluationResult = string.Empty; var evaluationReason = string.Empty;