diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs
index 977643b74..2da80e41a 100644
--- a/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs
@@ -25,10 +25,6 @@ namespace IRaCIS.Core.Application.Triggers
{
await UpdateSubjectVisitImageDateAsync(context.Entity.SubjectVisitId);
- await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
- {
- VisitExecuted = VisitExecutedEnum.Executed
- });
await UpdateSubjectVisitSubmitStateAsync(subjectVisitId);
}
@@ -56,11 +52,6 @@ namespace IRaCIS.Core.Application.Triggers
context.Entity.Modalities = ModaliyStr;
- await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
- {
- VisitExecuted = VisitExecutedEnum.Executed
- });
-
await UpdateSubjectVisitSubmitStateAsync(subjectVisitId);
//添加检查级别临床数据
@@ -122,7 +113,7 @@ namespace IRaCIS.Core.Application.Triggers
{
await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit,
- u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true);
+ u => new SubjectVisit() { VisitExecuted = VisitExecutedEnum.UnExecuted, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true);
}
else
{
@@ -131,11 +122,11 @@ namespace IRaCIS.Core.Application.Triggers
}
}
- ///
- /// 处理访视拍片日期
- ///
- ///
- ///
+ ///
+ /// 处理访视拍片日期
+ ///
+ ///
+ ///
private async Task UpdateSubjectVisitImageDateAsync(Guid subjectVisitId)
{
var svTime = _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new
@@ -157,6 +148,23 @@ namespace IRaCIS.Core.Application.Triggers
LatestScanDate = maxArray.Max()
});
+
+ if (minArray.Min() == null && maxArray.Max() == null)
+ {
+ await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
+ {
+ VisitExecuted = VisitExecutedEnum.UnExecuted
+ });
+ }
+ else
+ {
+
+
+ await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.Id == subjectVisitId, u => new SubjectVisit()
+ {
+ VisitExecuted = VisitExecutedEnum.Executed
+ });
+ }
}
}
}
\ No newline at end of file