From 2fbd0b09f69bacacc15f58ebe7d9bf1302f25872 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Mon, 8 May 2023 17:04:36 +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 --- .../IRaCIS.Core.Application.xml | 16 ++++++-- .../Reading/Dto/ReadingImageTaskViewModel.cs | 4 +- .../Reading/Dto/UserWLTemplateViewModel.cs | 23 ++++++----- .../ReadingImageTaskService.cs | 13 +++++-- .../ShortcutKey/UserWLTemplateService.cs | 38 ++++++++++++++++++- IRaCIS.Core.Domain/Management/User.cs | 7 +++- .../Reading/ShortcutKey/UserWLTemplate.cs | 7 ---- 7 files changed, 82 insertions(+), 26 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index cead395d6..1082f8c01 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -6947,6 +6947,19 @@ + + + 获取自动切换任务配置 + + + + + + 设置自动切换任务 + + + + 项目外部人员 录入流程相关 @@ -8051,9 +8064,6 @@ UserWLTemplateQuery 列表查询参数模型 - - TemplateName - UserWLTemplateAddOrEdit 列表查询参数模型 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 8429775bc..889ec216d 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1359,7 +1359,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string SubjectCode { get; set; }=String.Empty; - public ReadingCategory ReadingCategory { get; set; } + public bool AutoCutNextTask { get; set; } = false; + + public ReadingCategory ReadingCategory { get; set; } public decimal VisitNum { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/UserWLTemplateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/UserWLTemplateViewModel.cs index 2d1ed1f49..7e85dbd38 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/UserWLTemplateViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/UserWLTemplateViewModel.cs @@ -20,18 +20,23 @@ namespace IRaCIS.Core.Application.ViewModel public int WL { get; set; } public int ShowOrder { get; set; } = 0; public bool IsPitchOn { get; set; } - } + } - ///UserWLTemplateQuery 列表查询参数模型 - public class UserWLTemplateQuery - { - /// TemplateName - + ///UserWLTemplateQuery 列表查询参数模型 + public class UserWLTemplateQuery + { + /// TemplateName - } - /// UserWLTemplateAddOrEdit 列表查询参数模型 - public class UserWLTemplateAddOrEdit + } + + public class SetAutoCutNextTaskInDto + { + public bool AutoCutNextTask { get; set; } + } + + /// UserWLTemplateAddOrEdit 列表查询参数模型 + public class UserWLTemplateAddOrEdit { public Guid? Id { get; set; } public string TemplateName { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 2de0babbd..922eacda5 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -42,7 +42,8 @@ namespace IRaCIS.Application.Services private readonly IRepository _readModuleRepository; private readonly IRepository _dicomInstanceRepository; private readonly IRepository _organInfoRepository; - private readonly IRepository _readingCriterionDictionaryRepository; + private readonly IRepository _userRepository; + private readonly IRepository _readingCriterionDictionaryRepository; private readonly IRepository _readingTrialCriterionDictionaryRepository; private readonly IRepository _tumorAssessmentRepository; private readonly IRepository _readingTableAnswerRowInfoRepository; @@ -79,7 +80,8 @@ namespace IRaCIS.Application.Services IRepository readModuleRepository, IRepository dicomInstanceRepository, IRepository organInfoRepository, - IMemoryCache cache, + IRepository userRepository, + IMemoryCache cache, IRepository readingCriterionDictionaryRepository, IRepository readingTrialCriterionDictionaryRepository, IRepository tumorAssessmentRepository, @@ -114,7 +116,8 @@ namespace IRaCIS.Application.Services this._readModuleRepository = readModuleRepository; this._dicomInstanceRepository = dicomInstanceRepository; this._organInfoRepository = organInfoRepository; - this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository; + this._userRepository = userRepository; + this._readingCriterionDictionaryRepository = readingCriterionDictionaryRepository; this._tumorAssessmentRepository = tumorAssessmentRepository; this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository; this._readingTableQuestionSystemRepository = readingTableQuestionSystemRepository; @@ -2330,7 +2333,9 @@ namespace IRaCIS.Application.Services task.IsConvertedTask = visitTaskInfo.IsConvertedTask; var blindSubjectCode = await _visitTaskRepository.Where(x => x.Id == task.VisitTaskId).Select(x => x.BlindSubjectCode).FirstNotNullAsync(); task.SubjectCode = blindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : blindSubjectCode; - return task; + task.AutoCutNextTask =await _userRepository.Where(x => x.Id == _userInfo.Id).Select(x => x.AutoCutNextTask).FirstOrDefaultAsync(); + + return task; } /// diff --git a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs index bec717886..ae00dc0e0 100644 --- a/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs @@ -18,10 +18,14 @@ namespace IRaCIS.Core.Application.Service { private readonly IRepository _userWLTemplateRepository; + private readonly IRepository _userRepository; - public UserWLTemplateService(IRepository userWLTemplateRepository) + public UserWLTemplateService(IRepository userWLTemplateRepository, + IRepository userRepository + ) { _userWLTemplateRepository = userWLTemplateRepository; + this._userRepository = userRepository; } /// @@ -61,6 +65,38 @@ namespace IRaCIS.Core.Application.Service return ResponseOutput.Ok(); } + /// + /// 获取自动切换任务配置 + /// + /// + [HttpPost] + public async Task GetAutoCutNextTask() + { + return await _userRepository.Where(x=>x.Id==_userInfo.Id).Select(x => new + { + AutoCutNextTask = x.AutoCutNextTask + }).FirstNotNullAsync(); + } + + + /// + /// 设置自动切换任务 + /// + /// + /// + [HttpPost] + public async Task SetAutoCutNextTask(SetAutoCutNextTaskInDto inDto) + { + await _userRepository.UpdatePartialNowNoQueryAsync(_userInfo.Id, x => new User() + { + + AutoCutNextTask = inDto.AutoCutNextTask + }); + + await _userRepository.SaveChangesAsync (); + + return ResponseOutput.Ok(); + } } } diff --git a/IRaCIS.Core.Domain/Management/User.cs b/IRaCIS.Core.Domain/Management/User.cs index ede2ff587..ade0229e1 100644 --- a/IRaCIS.Core.Domain/Management/User.cs +++ b/IRaCIS.Core.Domain/Management/User.cs @@ -88,7 +88,12 @@ namespace IRaCIS.Core.Domain.Models public bool IsTestUser { get; set; } - [Projectable] public string FullName => LastName + " / " + FirstName; + /// + /// Զлһ + /// + public bool AutoCutNextTask { get; set; } = false; + + [Projectable] public string FullName => LastName + " / " + FirstName; //[Projectable] public string FullName => $"{LastName} / {FirstName}"; } diff --git a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs index d867b4524..c89452ee2 100644 --- a/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs +++ b/IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs @@ -15,13 +15,6 @@ namespace IRaCIS.Core.Domain.Models [Table("UserWLTemplate")] public class UserWLTemplate : Entity, IAuditAdd { - - /// - /// Id - /// - [Key] - [Required] - public Guid Id { get; set; } /// /// TemplateName