IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -104,10 +104,8 @@ namespace IRaCIS.Core.Application.Contracts
     {
         [NotDefault]
         public Guid TrialId { get; set; }
-        [NotDefault]
+
         public Guid SubjectId { get; set; }
-        [NotDefault]
-        public Guid SubjectVisitId { get; set; }
     }
 
     public class GetNextIQCQualityOutDto

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -1257,20 +1257,14 @@ namespace IRaCIS.Core.Application.Image.QA
         public async Task<GetNextIQCQualityOutDto> GetNextIQCQuality(GetNextIQCQualityInDto inDto)
         {
             var trialConfig = await _trialRepository
-                 .Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification, t.IsIQCAutoNextTask, t.IsIQCAutoTaskDistinguishType })
+                 .Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification })
                  .FirstOrDefaultAsync(t => t.TrialId == inDto.TrialId)
                  .IfNullThrowException();
 
-            //当前任务类型 是复核还是普通任务
 
-            var isDistinguishType = trialConfig.IsIQCAutoNextTask && trialConfig.IsIQCAutoTaskDistinguishType;
-
-            //当前是否是复核任务，复核任务，那么下一个任务也是复核的任务
-            var isSecondReview = _subjectVisitRepository.Any(t => t.Id == inDto.SubjectVisitId && t.SecondReviewState == SecondReviewState.AuditPassed);
 
             var currentActionList = await _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId && x.CurrentActionUserId == _userInfo.UserRoleId)
-                .WhereIf(isDistinguishType, t => isSecondReview == false ? t.SecondReviewState == SecondReviewState.None : t.SecondReviewState == SecondReviewState.WaitAudit)
+                .Where(t => t.SecondReviewState == SecondReviewState.None).OrderByDescending(x => x.IsUrgent)
-                .OrderByDescending(x => x.IsUrgent)
                 .ThenBy(x => x.Subject.Code).ThenBy(x => x.VisitNum).ToListAsync();
 
             if (currentActionList.Count() > 0)
@@ -1293,7 +1287,7 @@ namespace IRaCIS.Core.Application.Image.QA
                     break;
                 case TrialQCProcess.SingleAudit:
                     visitList = await _subjectVisitRepository
-                        .WhereIf(isDistinguishType, t => isSecondReview == false ? t.SecondReviewState == SecondReviewState.None : t.SecondReviewState == SecondReviewState.WaitAudit)
+                        .Where(t => t.SecondReviewState == SecondReviewState.None)
                         .Where(x => !x.SubjectVisitImageBackRecordList.Any(t => t.ImageBackState == ImageBackStateEnum.None))
                         .Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.SecondReviewState == SecondReviewState.None
                     && x.TrialId == inDto.TrialId && x.PreliminaryAuditUserId != _userInfo.UserRoleId && (x.CurrentActionUserId == _userInfo.UserRoleId || (x.AuditState != AuditStateEnum.PrimaryQCPassed && !x.IsTake)))
@@ -1330,7 +1324,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 case TrialQCProcess.DoubleAudit:
 
                     visitList = await _subjectVisitRepository
-                              .WhereIf(isDistinguishType, t => isSecondReview == false ? t.SecondReviewState == SecondReviewState.None : t.SecondReviewState == SecondReviewState.WaitAudit)
+                              .Where(t => t.SecondReviewState == SecondReviewState.None)
                               .Where(x => !x.SubjectVisitImageBackRecordList.Any(t => t.ImageBackState == ImageBackStateEnum.None))
                         .Where(x => x.SubmitState == SubmitStateEnum.Submitted && x.TrialId == inDto.TrialId &&
                     ((x.CurrentActionUserId == _userInfo.UserRoleId) || (!x.IsTake && x.AuditState != AuditStateEnum.QCPassed && (x.PreliminaryAuditUserId != _userInfo.UserRoleId)))