diff --git a/IRaCIS.Core.Application/Service/QC/QCListService.cs b/IRaCIS.Core.Application/Service/QC/QCListService.cs index 041ac3ff0..3d67a34e2 100644 --- a/IRaCIS.Core.Application/Service/QC/QCListService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs @@ -485,12 +485,15 @@ 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; + if ((sv.AuditState == AuditStateEnum.QCPassed && inDto.CurrentQCEnum != CurrentQC.SecondReview)||(inDto.CurrentQCEnum == CurrentQC.SecondReview && sv.SecondReviewState!=SecondReviewState.WaitAudit)) { - //现在之前历史质控的展示要从答案为主表取数据,添加和编辑按照之前方式 + //之前质控完的,+二次复核完的,都要从答案表中取 二次复核完的还需要加时间 questionAnswerlist = await _trialQCQuestionAnswerRepository.Where(x => x.SubjectVisitId == inDto.SubjectVisitId && x.QCProcessEnum == inDto.QCProcessEnum && x.CurrentQCEnum == inDto.CurrentQCEnum) + .Where(t => inDto.CurrentQCEnum == CurrentQC.SecondReview ? t.SecondReviewTime >= secondReviewTime && t.SecondReviewTime <= secondReviewTime.AddSeconds(1) : true) .Select(data => new QCQuestionAnswer() { AnswerId = data.Id, @@ -509,8 +512,6 @@ namespace IRaCIS.Core.Application.Image.QA else { - var secondReviewTime = inDto.SecondReviewTime != null ? (DateTime)inDto.SecondReviewTime : DateTime.Now; - #region 之前编辑和审核通过后展示都是通过这个接口 questionAnswerlist = await (from data in _trialQCQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.IsEnable)