Merge branch 'Test.Study' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.Study

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -358,6 +358,9 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid TrialId { get; set; }
 
+
+		public Guid? SubjectId { get; set; }
+
 		public Guid TrialReadingCriterionId { get; set; }
 
         public string? SubjectCode { get; set; } = null;

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -661,7 +661,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var visitQuery = _visitTaskRepository
                 .Where(x => x.TrialId == inDto.TrialId && x.TaskState == TaskState.Effect)
-
+				.WhereIf(inDto.SubjectId!=null,t=>t.SubjectId==inDto.SubjectId)
 				//PI 读基线的时候，subject 如果PI基线没阅片完，SR就不能看
 				.WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.SR && piReadingScopenEnum == PIReadingScopenEnum.AllBaseline && readingDivisionEnum == ReadingDivisionEnum.PIandSR,
                 t => t.Subject.SubjectVisitTaskList.Any(c => c.SourceSubjectVisit.IsBaseLine == true && c.ReadingTaskState == ReadingTaskState.HaveSigned && c.TaskState == TaskState.Effect && c.TrialReadingCriterionId == trialReadingCriterionId))

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

@@ -2329,6 +2329,7 @@ namespace IRaCIS.Application.Services
                 var subjectTaskList = (await _visitTaskService.GetOrderReadingIQueryable(new GetOrderReadingIQueryableInDto()
                 {
                     TrialId = inDto.TrialId,
+                    SubjectId=inDto.SubjectId,
                     TrialReadingCriterionId = trialReadingCriterionId!.Value,
                     Page = new PageInput()
                     {
@@ -2350,7 +2351,7 @@ namespace IRaCIS.Application.Services
 
                 if (currentSubject == null)
                 {
-                    throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]);
+                    throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
                 }
 
                 task = currentSubject.UnReadCanReadTaskList.Select(x => new GetReadingTaskDto()
@@ -2423,7 +2424,7 @@ namespace IRaCIS.Application.Services
 
             if (task == null)
             {
-                throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"]);
+                throw new BusinessValidationFailedException(_localizer["ReadingImage_TaskFinish"], ApiResponseCodeEnum.CloseCurrentWindows);
             }
 
             if (task.SubjectCode.IsNullOrEmpty())

IRaCIS.Core.Infrastructure/_IRaCIS/Exception/BusinessValidationFailedException.cs

@@ -1,17 +1,22 @@
-using System;
+using IRaCIS.Core.Infrastructure.Extention;
+using System;
 
 namespace IRaCIS.Core.Infrastructure
 {
     public class BusinessValidationFailedException : Exception
     {
+		public ApiResponseCodeEnum Code { get; set; }
 
 		public BusinessValidationFailedException()
         {
 
         }
 
-        public BusinessValidationFailedException( string message) : base(message)
+		public BusinessValidationFailedException(string message, ApiResponseCodeEnum code = ApiResponseCodeEnum.BusinessValidationFailed) : base(message)
 		{
-        }
+			Code = code;
+
+		}
+
     }
 }

IRaCIS.Core.Infrastructure/_IRaCIS/Output/ApiResponseCodeEnum.cs

@@ -26,6 +26,10 @@ namespace IRaCIS.Core.Infrastructure.Extention
         //需要提示 ,需要提示  从Result 取数据       （  0  可以继续处理提交 ,1  不能进行继续处理提交 ,2  刷新列表    )
         NeedTips = 5,
 
+        /// <summary>
+        /// 关闭当前页面
+        /// </summary>
+		CloseCurrentWindows=6,
 
 		//在其他地方登陆，被迫下线
 		LoginInOtherPlace = -1,