diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 3d67a34e2..75908af17 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -485,9 +485,11 @@ namespace IRaCIS.Core.Application.Image.QA var sv = await _subjectVisitRepository.Where(t => t.Id == subjectVisitId).FirstNotNullAsync(); - var secondReviewTime = inDto.SecondReviewTime != null ? (DateTime)inDto.SecondReviewTime : DateTime.Now; + var trialConfirmTime = _trialRepository.Where(t => t.Id == sv.TrialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault(); - if ((sv.AuditState == AuditStateEnum.QCPassed && inDto.CurrentQCEnum != CurrentQC.SecondReview)||(inDto.CurrentQCEnum == CurrentQC.SecondReview && sv.SecondReviewState!=SecondReviewState.WaitAudit)) + var secondReviewTime = inDto.SecondReviewTime != null ? (DateTime)inDto.SecondReviewTime : (DateTime)trialConfirmTime; + + if ((sv.AuditState == AuditStateEnum.QCPassed && inDto.CurrentQCEnum != CurrentQC.SecondReview)||(inDto.CurrentQCEnum == CurrentQC.SecondReview && secondReviewTime < trialConfirmTime)) { //之前质控完的,+二次复核完的,都要从答案表中取 二次复核完的还需要加时间