Compare commits

..

No commits in common. "3e4026e8994c26cd48f4682b16b1c98b658967a4" and "67a5f1c32cf86dc26968310ecf15b2b1270d9f36" have entirely different histories.

3 changed files with 6 additions and 14 deletions

View File

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

View File

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

View File

@ -871,18 +871,12 @@ namespace IRaCIS.Core.Application
{ {
var trialConfirmTime = _trialRepository.Where(t => t.Id == signConfirmDTO.TrialId).Select(t => t.QCQuestionConfirmedTime).FirstOrDefault(); 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()) else if (signConfirmDTO.SignCode == ((int)SignEnum.TrialQCQuestionConfirm).ToString())
{ {