diff --git a/IRC.Core.SCP/Service/CStoreSCPService.cs b/IRC.Core.SCP/Service/CStoreSCPService.cs index 9da360e52..950b45946 100644 --- a/IRC.Core.SCP/Service/CStoreSCPService.cs +++ b/IRC.Core.SCP/Service/CStoreSCPService.cs @@ -166,17 +166,7 @@ namespace IRaCIS.Core.SCP.Service await DataMaintenanceAsaync(); - //记录监控 - - var _SCPImageUploadRepository = _serviceProvider.GetService>(); - - _upload.EndTime = DateTime.Now; - _upload.StudyCount = _ImageUploadList.Count; - - _upload.UploadJsonStr = (new SCPImageLog() { UploadList = _ImageUploadList }).ToJsonStr(); - - //可能是测试echo 导致记录了 - await _SCPImageUploadRepository.AddAsync(_upload, _upload.FileCount > 0 ? true : false); + await AddUploadLogAsync(); } @@ -184,6 +174,22 @@ namespace IRaCIS.Core.SCP.Service } + private async Task AddUploadLogAsync() + { + //记录监控 + + var _SCPImageUploadRepository = _serviceProvider.GetService>(); + + _upload.EndTime = DateTime.Now; + _upload.StudyCount = _ImageUploadList.Count; + + _upload.UploadJsonStr = (new SCPImageLog() { UploadList = _ImageUploadList }).ToJsonStr(); + + //可能是测试echo 导致记录了 + await _SCPImageUploadRepository.AddAsync(_upload, _upload.FileCount > 0 ? true : false); + } + + private async Task DataMaintenanceAsaync() { Log.Logger.Warning($"CallingAE:{Association.CallingAE} CalledAE:{Association.CalledAE}传输结束:开始维护数据,处理检查Modality 以及自动创建访视,绑定检查"); @@ -249,8 +255,15 @@ namespace IRaCIS.Core.SCP.Service //将检查设置为传输结束 await _studyRepository.BatchUpdateNoTrackingAsync(t => _SCPStudyIdList.Contains(t.Id), u => new SCPStudy() { IsUploadFinished = true }); - await _studyRepository.SaveChangesAndClearAllTrackingAsync(); + await _studyRepository.SaveChangesAndClearAllTrackingAsync(); } + else + { + //记录日志 + await AddUploadLogAsync(); + } + + Log.Logger.Warning($"连接关闭 {exception?.Message} {exception?.InnerException?.Message}"); }