From 88bdeff571d15d485afd5fcdc81dab45a41f1d99 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 19 Jul 2022 17:16:20 +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 --- .../Reading/Dto/ReadingImageTaskViewModel.cs | 14 ++++++++++++ .../Reading/ReadingImageTaskService.cs | 22 ++++++++++++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index cdc0128a..d85a3ad0 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -8,6 +8,20 @@ using System.Threading.Tasks; namespace IRaCIS.Core.Application.Service.Reading.Dto { + public class GetHistoryGlobalInfoOutDto + { + public Guid VisitTaskId { get; set; } + + public string TaskName { get; set; } + + public ReadingTaskState ReadingTaskState { get; set; } + } + + public class GetHistoryGlobalInfoInDto + { + public Guid VisitTaskId { get; set; } + } + public class SaveGlobalReadingInfoInDto { public Guid GlobalTaskId { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index ff089a81..c8103c75 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -78,7 +78,27 @@ namespace IRaCIS.Application.Services this._readingQuestionTrialRepository = readingQuestionTrialRepository; } - //public async Task<> + /// + /// 获取全局阅片历史记录 + /// + /// + /// + [HttpPost] + public async Task> GetHistoryGlobalInfo(GetHistoryGlobalInfoInDto inDto) + { + var taskInfo = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync(); + List result = await _visitTaskRepository.Where(x => x.SubjectId == taskInfo.SubjectId && x.ArmEnum == taskInfo.ArmEnum && x.ReadingCategory == ReadingCategory.Global && x.VisitTaskNum < taskInfo.VisitTaskNum) + .OrderBy(x => x.VisitTaskNum) + .Select(x => new GetHistoryGlobalInfoOutDto() + { + + ReadingTaskState = x.ReadingTaskState, + TaskName = x.TaskName, + VisitTaskId = x.Id, + }).ToListAsync(); + + return result; + } /// /// 保存全局阅片结果