IRaCIS.Core.Application/Triggers/SubjectVisitScanDateTrigger.cs

@@ -25,6 +25,10 @@ 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);
             }
 
@@ -52,6 +56,11 @@ 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);
 
                 //添加检查级别临床数据
@@ -113,7 +122,7 @@ namespace IRaCIS.Core.Application.Triggers
             {
 
                 await _subjectVisitRepository.UpdatePartialFromQueryAsync(t => t.Id == subjectVisitId && t.SubmitState == SubmitStateEnum.ToSubmit,
-                    u => new SubjectVisit() { VisitExecuted = VisitExecutedEnum.UnExecuted, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true);
+                    u => new SubjectVisit() { VisitExecuted = 0, SVENDTC = null, SVSTDTC = null, SubmitState = SubmitStateEnum.None }, true);
             }
             else
             {
@@ -122,11 +131,11 @@ namespace IRaCIS.Core.Application.Triggers
             }
         }
 
-        /// <summary>
-        /// 处理访视拍片日期
-        /// </summary>
-        /// <param name="subjectVisitId"></param>
-        /// <returns></returns>
+       /// <summary>
+       /// 处理访视拍片日期
+       /// </summary>
+       /// <param name="subjectVisitId"></param>
+       /// <returns></returns>
         private async Task UpdateSubjectVisitImageDateAsync(Guid subjectVisitId)
         {
             var svTime = _subjectVisitRepository.Where(t => t.Id == subjectVisitId).Select(t => new
@@ -148,23 +157,6 @@ 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
-                });
-            }
         }
     }
 }