From f5a93d5699cd5dee68e3664bdc1567d9135f3aa3 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Wed, 11 May 2022 17:37:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AB=E6=AC=A1=E8=AE=BF=E8=A7=86=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9SUbject=E7=9A=84=E6=9C=AB=E6=AC=A1=E8=AE=BF?= =?UTF-8?q?=E8=A7=86Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Triggers/SubjectVisitFinalVisitTrigger.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs index 6d6f467f7..efbcce8e5 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs @@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Triggers // 修改了IsFinalVisit if (context.UnmodifiedEntity?.IsFinalVisit != subjectVisit.IsFinalVisit) { - if (context.Entity.IsFinalVisit) + if (subjectVisit.IsFinalVisit) { if (await _subjectVisitRepository.AnyAsync(t => t.SubjectId == subjectVisit.SubjectId && t.VisitNum > subjectVisit.VisitNum && (t.SubmitState == SubmitStateEnum.ToSubmit|| t.SubmitState==SubmitStateEnum.Submitted))) @@ -39,7 +39,7 @@ namespace IRaCIS.Core.Application.Triggers } await _subjectRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisit.SubjectId, - u => new Subject() { Status = SubjectStatus.OutOfVisit }); + u => new Subject() { Status = SubjectStatus.OutOfVisit,FinalSubjectVisitId=subjectVisit.Id }); //末次访视后的 访视设置为不可用 @@ -51,7 +51,7 @@ namespace IRaCIS.Core.Application.Triggers //回退 await _subjectRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisit.SubjectId, - u => new Subject() { Status = SubjectStatus.OnVisit }); + u => new Subject() { Status = SubjectStatus.OnVisit, FinalSubjectVisitId =null }); await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.SubjectId == subjectVisit.SubjectId && t.VisitExecuted == VisitExecutedEnum.Unavailable, u => new SubjectVisit() { VisitExecuted = VisitExecutedEnum.UnExecuted }); }