修改scp 服务缩略图

IRC.Core.SCP/Service/CStoreSCPService.cs

@@ -315,7 +315,7 @@ namespace IRaCIS.Core.SCP.Service
                         _SCPStudyIdList.Add(scpStudyId);
                     }
 
-                    var series = await _seriesRepository.FindAsync(seriesId);
+                    var series = await _seriesRepository.FirstOrDefaultAsync(t => t.Id == seriesId);
 
                     //没有缩略图
                     if (series != null && string.IsNullOrEmpty(series.ImageResizePath))

IRC.Core.SCP/Service/DicomArchiveService.cs

@@ -75,9 +75,9 @@ namespace IRaCIS.Core.SCP.Service
             //using (@lock.Acquire())
             {
                 var findPatient = await _patientRepository.FirstOrDefaultAsync(t => t.PatientIdStr == patientIdStr && t.TrialSiteId==trialSiteId );
-                var findStudy = await _studyRepository.FindAsync(studyId);
+                var findStudy = await _studyRepository.FirstOrDefaultAsync(t=>t.Id== studyId);
-                var findSerice = await _seriesRepository.FindAsync(seriesId);
+                var findSerice = await _seriesRepository.FirstOrDefaultAsync(t => t.Id ==   seriesId);
-                var findInstance = await _instanceRepository.FindAsync(instanceId);
+                var findInstance = await _instanceRepository.FirstOrDefaultAsync(t => t.Id == instanceId);
 
                 DateTime? studyTime = dataset.GetSingleValueOrDefault(DicomTag.StudyDate, string.Empty) == string.Empty ? null : dataset.GetSingleValue<DateTime>(DicomTag.StudyDate).Add(dataset.GetSingleValueOrDefault(DicomTag.StudyTime, string.Empty) == string.Empty ? TimeSpan.Zero : dataset.GetSingleValue<DateTime>(DicomTag.StudyTime).TimeOfDay);
 
@@ -307,7 +307,7 @@ namespace IRaCIS.Core.SCP.Service
                     await _instanceRepository.BatchUpdateNoTrackingAsync(t => t.Id == instanceId, u => new SCPInstance() { Path = fileRelativePath,FileSize=fileSize });
                 }
 
-                //await _studyRepository.SaveChangesAsync();
+                await _studyRepository.SaveChangesAsync();
 
                 return findStudy.Id;
             }

IRaCIS.Core.API/_PipelineExtensions/Serilog/SerilogConfig.cs

@@ -20,7 +20,7 @@ namespace IRaCIS.Core.API
               =>
             {
 
-                opts.MessageTemplate = "{TokenUserRealName} {TokenUserTypeShortName}  {ClientIp} {LocalIP} {Host} {Protocol} {RequestMethod} {RequestPath} {RequestBody} responded {StatusCode} in {Elapsed:0.0000} ms";
+                opts.MessageTemplate = "{TokenUserRealName} {TokenUserTypeShortName}  {ClientIp} {LocalIP} {Host} {RequestMethod} {RequestPath} {RequestBody} responded {StatusCode} in {Elapsed:0.0000} ms";
 
                 opts.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>
                 {
@@ -30,20 +30,8 @@ namespace IRaCIS.Core.API
                     // Set all the common properties available for every request
                     diagnosticContext.Set("Host", request.Host);
 
-                    diagnosticContext.Set("Protocol", request.Protocol);
+                    //diagnosticContext.Set("Protocol", request.Protocol);
-                    diagnosticContext.Set("Scheme", request.Scheme);
+                    //diagnosticContext.Set("Scheme", request.Scheme);
-
-                    #region old 未用
-                    //这种获取的Ip不准 配置服务才行
-                    //diagnosticContext.Set("RequestIP", httpContext.Connection.RemoteIpAddress.ToString());
-
-                    //这种方式可以，但是serilog提供了 就不用了
-                    //diagnosticContext.Set("TestIP", httpContext.GetUserIp());
-
-                    //这种方式不行 读取的body为空字符串  必须在中间件中读取
-                    //diagnosticContext.Set("RequestBody", await ReadRequestBody(httpContext.Request));
-                    //diagnosticContext.Set("RequestBody", RequestPayload);
-                    #endregion
 
                     // Only set it if available. You're not sending sensitive data in a querystring right?!
                     if (request.QueryString.HasValue)
@@ -64,6 +52,20 @@ namespace IRaCIS.Core.API
                     {
                         diagnosticContext.Set("EndpointName", endpoint.DisplayName);
                     }
+
+                    #region old 未用
+                    //这种获取的Ip不准 配置服务才行
+                    //diagnosticContext.Set("RequestIP", httpContext.Connection.RemoteIpAddress.ToString());
+
+                    //这种方式可以，但是serilog提供了 就不用了
+                    //diagnosticContext.Set("TestIP", httpContext.GetUserIp());
+
+                    //这种方式不行 读取的body为空字符串  必须在中间件中读取
+                    //diagnosticContext.Set("RequestBody", await ReadRequestBody(httpContext.Request));
+                    //diagnosticContext.Set("RequestBody", RequestPayload);
+                    #endregion
+
+
                 };
             });
 

IRaCIS.Core.API/_ServiceExtensions/Serilog/SerilogSetup.cs

@@ -31,6 +31,7 @@ namespace IRaCIS.Core.API
        //https://github.com/serilog/serilog-formatting-compact
        // 控制台输出 JSON 格式
        .WriteTo.Console(restrictedToMinimumLevel: LogEventLevel.Warning,
+      
                         formatter: new CompactJsonFormatter())
 
        // 文件输出 JSON 格式