Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

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

@@ -1599,6 +1599,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 return ResponseOutput.NotOk("重传 只允许QA 设置!");
             }
 
+
             //获取项目配置
             var trialConfig = await _repository.Where<Trial>(t => t.Id == trialId).Select(t => new { TrialId = t.Id, t.QCProcessEnum, t.IsImageConsistencyVerification })
                 .FirstOrDefaultAsync().IfNullThrowException();
@@ -1610,6 +1611,11 @@ namespace IRaCIS.Core.Application.Image.QA
 
             var qcChallenge = (await _qcChallengeRepository.FirstOrDefaultAsync(t => t.Id == qcChallengeId)).IfNullThrowException();
 
+            var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == qcChallenge.SubjectVisitId)).IfNullThrowException();
+
+            await VerifyIsCanQCAsync(sv);
+
+
             if (qcChallenge.ReuploadEnum != QCChanllengeReuploadEnum.CRCRequestReupload)
             {
                 throw new BusinessValidationFailedException("当前重传状态不为CRC申请重传，不允许设置同意重传");
@@ -1641,9 +1647,7 @@ namespace IRaCIS.Core.Application.Image.QA
             if (trialConfig.QCProcessEnum == TrialQCProcess.DoubleAudit && await _repository.AnyAsync<QCChallenge>(t => t.Id == qcChallengeId && t.SubjectVisit.AuditState == AuditStateEnum.InSecondaryQC))
             {
 
-                var sv = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == qcChallenge.SubjectVisitId);
-
-                if (sv == null) return Null404NotFound(sv);
+               
 
                 // //一致性核查质疑状态
                 // sv.CheckChallengeState = CheckChanllengeTypeEnum.None;
@@ -1654,7 +1658,8 @@ namespace IRaCIS.Core.Application.Image.QA
 
                 sv.CurrentActionUserExpireTime = DateTime.Now.AddHours(1);
                 sv.CurrentActionUserId = _userInfo.Id;
-                BackgroundJob.Schedule<IObtainTaskAutoCancelJob>(t => t.CancelQCObtaion(qcChallenge.SubjectVisitId, DateTime.Now), TimeSpan.FromHours(1));
+
+                //BackgroundJob.Schedule<IObtainTaskAutoCancelJob>(t => t.CancelQCObtaion(qcChallenge.SubjectVisitId, DateTime.Now), TimeSpan.FromHours(1));
                 sv.IsTake = true;
 
                 sv.PreliminaryAuditUserId = null;