修改

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -6947,6 +6947,19 @@
             <param name="userWLTemplateId"></param>
             <returns></returns>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.UserWLTemplateService.GetAutoCutNextTask">
+            <summary>
+            获取自动切换任务配置
+            </summary>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.UserWLTemplateService.SetAutoCutNextTask(IRaCIS.Core.Application.ViewModel.SetAutoCutNextTaskInDto)">
+            <summary>
+            设置自动切换任务
+            </summary>
+            <param name="inDto"></param>
+            <returns></returns>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.TrialExternalUserService">
             <summary>
             项目外部人员  录入流程相关
@@ -8051,9 +8064,6 @@
         <member name="T:IRaCIS.Core.Application.ViewModel.UserWLTemplateQuery">
             <summary>UserWLTemplateQuery  列表查询参数模型</summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.ViewModel.UserWLTemplateQuery.TemplateName">
-            <summary> TemplateName</summary>
-        </member>
         <member name="T:IRaCIS.Core.Application.ViewModel.UserWLTemplateAddOrEdit">
             <summary> UserWLTemplateAddOrEdit  列表查询参数模型</summary>
         </member>

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; }
 

IRaCIS.Core.Application/Service/Reading/Dto/UserWLTemplateViewModel.cs

@@ -22,16 +22,21 @@ namespace IRaCIS.Core.Application.ViewModel
 	 		public bool IsPitchOn { get; set; }
 	      }
 
-	 ///<summary>UserWLTemplateQuery  列表查询参数模型</summary>
+	///<summary>UserWLTemplateQuery  列表查询参数模型</summary>
-	 public class UserWLTemplateQuery
+	public class UserWLTemplateQuery
-	 { 
+	{
-	 	 	 ///<summary> TemplateName</summary>
+		///<summary> TemplateName</summary>
 
 
-	 	 	 	 	 	 	 	 	 	 } 
+	}
 
-	 ///<summary> UserWLTemplateAddOrEdit  列表查询参数模型</summary>
+	public class SetAutoCutNextTaskInDto
-	 public class  UserWLTemplateAddOrEdit
+	{
+		public bool AutoCutNextTask { get; set; }
+	}
+
+	///<summary> UserWLTemplateAddOrEdit  列表查询参数模型</summary>
+	public class  UserWLTemplateAddOrEdit
 	 {
 	 		public Guid? Id { get; set; }
 	 		public string TemplateName { get; set; }

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -42,7 +42,8 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ReadModule> _readModuleRepository;
         private readonly IRepository<DicomInstance> _dicomInstanceRepository;
         private readonly IRepository<OrganInfo> _organInfoRepository;
-        private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
+		private readonly IRepository<User> _userRepository;
+		private readonly IRepository<ReadingSystemCriterionDictionary> _readingCriterionDictionaryRepository;
 		private readonly IRepository<ReadingTrialCriterionDictionary> _readingTrialCriterionDictionaryRepository;
 		private readonly IRepository<TumorAssessment_RECIST1Point1> _tumorAssessmentRepository;
         private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
@@ -79,7 +80,8 @@ namespace IRaCIS.Application.Services
                   IRepository<ReadModule> readModuleRepository,
                   IRepository<DicomInstance> dicomInstanceRepository,
                    IRepository<OrganInfo> organInfoRepository,
-                  IMemoryCache cache,
+					 IRepository<User> userRepository,
+				  IMemoryCache cache,
                   IRepository<ReadingSystemCriterionDictionary> readingCriterionDictionaryRepository,
 				  IRepository<ReadingTrialCriterionDictionary> readingTrialCriterionDictionaryRepository,
 				  IRepository<TumorAssessment_RECIST1Point1> 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;
         }
 
         /// <summary>

IRaCIS.Core.Application/Service/Reading/ShortcutKey/UserWLTemplateService.cs

@@ -18,10 +18,14 @@ namespace IRaCIS.Core.Application.Service
 	{
 
 		private readonly IRepository<UserWLTemplate> _userWLTemplateRepository;
+		private readonly IRepository<User> _userRepository;
 
-		public UserWLTemplateService(IRepository<UserWLTemplate> userWLTemplateRepository)
+		public UserWLTemplateService(IRepository<UserWLTemplate> userWLTemplateRepository,
+			IRepository<User> userRepository
+			)
 		{
 			_userWLTemplateRepository = userWLTemplateRepository;
+			this._userRepository = userRepository;
 		}
 
 		/// <summary>
@@ -61,6 +65,38 @@ namespace IRaCIS.Core.Application.Service
 			return ResponseOutput.Ok();
 		}
 
+		/// <summary>
+		/// 获取自动切换任务配置
+		/// </summary>
+		/// <returns></returns>
+		[HttpPost]
+		public async Task<object> GetAutoCutNextTask() 
+		{
 
+			return await _userRepository.Where(x=>x.Id==_userInfo.Id).Select(x => new
+			{
+				AutoCutNextTask = x.AutoCutNextTask
+			}).FirstNotNullAsync();
+		}
+
+
+		/// <summary>
+		/// 设置自动切换任务
+		/// </summary>
+		/// <param name="inDto"></param>
+		/// <returns></returns>
+		[HttpPost]
+		public async Task<IResponseOutput> SetAutoCutNextTask(SetAutoCutNextTaskInDto inDto)
+		{
+			await _userRepository.UpdatePartialNowNoQueryAsync(_userInfo.Id, x => new User()
+			{
+
+				AutoCutNextTask = inDto.AutoCutNextTask
+			});
+
+			await _userRepository.SaveChangesAsync ();
+
+			return ResponseOutput.Ok();
+		}
 	}
 }

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;
+        /// <summary>
+        /// 自动切换下一个任务
+        /// </summary>
+        public bool AutoCutNextTask { get; set; } = false;
+
+		[Projectable] public string FullName => LastName + " / " + FirstName;
 
         //[Projectable] public string FullName => $"{LastName} / {FirstName}";
     }

IRaCIS.Core.Domain/Reading/ShortcutKey/UserWLTemplate.cs

@@ -16,13 +16,6 @@ namespace IRaCIS.Core.Domain.Models
 	 public class UserWLTemplate : Entity, IAuditAdd
 	 {
 	
-		/// <summary>
-        /// Id
-        /// </summary>
-		[Key]
-		[Required]
-		public Guid Id { get; set; }
-	
 		/// <summary>
         /// TemplateName
         /// </summary>