修改复核-退回-003

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

@@ -2587,7 +2587,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
         sv.CurrentActionUserId = null;
         sv.PreliminaryAuditUserId = null;
         sv.ReviewAuditUserId = null;
-
+        sv.SecondReviewState = SecondReviewState.None;
 
         if (sv.IsBaseLine)
         {

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

@@ -384,6 +384,7 @@ namespace IRaCIS.Core.Application.Image.QA
                 sv.CurrentActionUserId = null;
                 sv.PreliminaryAuditUserId = null;
                 sv.ReviewAuditUserId = null;
+                sv.SecondReviewState = SecondReviewState.None;
 
 
                 if (sv.IsBaseLine)
@@ -691,6 +692,7 @@ namespace IRaCIS.Core.Application.Image.QA
             sv.CurrentActionUserId = null;
             sv.PreliminaryAuditUserId = null;
             sv.ReviewAuditUserId = null;
+            sv.SecondReviewState = SecondReviewState.None;
 
             //var success1 = _studyRepository.Delete(t => t.SubjectVisitId == subjectVisitId);
             //var succeess2 = _instanceRepository.Delete(t => t.SubjectVisitId == subjectVisitId);

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -871,12 +871,18 @@ namespace IRaCIS.Core.Application
             {
                 var trialConfirmTime = _trialRepository.Where(t => t.Id == signConfirmDTO.TrialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault();
 
-                //重复二次复核签名
+                if (trialConfirmTime != null)
-                await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == signConfirmDTO.TrialId && t.AuditState == AuditStateEnum.QCPassed 
+                {
-                && !t.TrialQCQuestionAnswerList.Any(t => t.SecondReviewTime == trialConfirmTime), u => new SubjectVisit() { SecondReviewState = SecondReviewState.WaitAudit });
+                    //删除复审中间临时数据
+                    await _qcQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisit.TrialId == signConfirmDTO.TrialId && t.SubjectVisit.SecondReviewState != SecondReviewState.AuditPassed && t.CurrentQCEnum == CurrentQC.SecondReview);
+
+                    //重复二次复核签名
+                    await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.TrialId == signConfirmDTO.TrialId && t.AuditState == AuditStateEnum.QCPassed
+                    && !t.TrialQCQuestionAnswerList.Any(t => t.SecondReviewTime == trialConfirmTime), u => new SubjectVisit() { SecondReviewState = SecondReviewState.WaitAudit });
+
+                   
+                }
 
-                //删除复审中间临时数据
-                await _qcQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisit.TrialId == signConfirmDTO.TrialId && t.SubjectVisit.SecondReviewState != SecondReviewState.AuditPassed && t.CurrentQCEnum == CurrentQC.SecondReview);
             }
             else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialQCQuestionConfirm).ToString())
             {