diff --git a/IRC.Core.SCP/Service/CStoreSCPService.cs b/IRC.Core.SCP/Service/CStoreSCPService.cs index 4a9f88579..4ea4a0afa 100644 --- a/IRC.Core.SCP/Service/CStoreSCPService.cs +++ b/IRC.Core.SCP/Service/CStoreSCPService.cs @@ -230,18 +230,18 @@ namespace IRaCIS.Core.SCP.Service public async Task OnCStoreRequestAsync(DicomCStoreRequest request) { - #region 测试接收课题组信息 + #region 测试接收课题组信息 这里无法获取 - var privateTag = new DicomTag(0x9999, 0x1001); - var groupIdsJson = request.Dataset.GetSingleValueOrDefault(privateTag, string.Empty); + //var privateTag = new DicomTag(0x9999, 0x1001); + //var groupIdsJsonStr = request.Dataset.GetSingleValueOrDefault(privateTag, string.Empty); - if (!string.IsNullOrEmpty(groupIdsJson)) - { - var projectGroupIds = JsonConvert.DeserializeObject>(groupIdsJson); + //if (!string.IsNullOrEmpty(groupIdsJsonStr)) + //{ + // var projectGroupIds = JsonConvert.DeserializeObject>(groupIdsJsonStr); - Log.Logger.Information("收到课题组信息: " + string.Join(", ", projectGroupIds)); + // Log.Logger.Information("收到课题组信息: " + string.Join(", ", projectGroupIds)); - } + //} #endregion diff --git a/IRaCIS.Core.Application/Service/Visit/PatientService.cs b/IRaCIS.Core.Application/Service/Visit/PatientService.cs index f5efc1ef9..110d1adf5 100644 --- a/IRaCIS.Core.Application/Service/Visit/PatientService.cs +++ b/IRaCIS.Core.Application/Service/Visit/PatientService.cs @@ -53,6 +53,7 @@ using System.Dynamic; using System.Threading.Channels; using NPOI.HSSF.Record.Chart; using IRaCIS.Core.Application.Helper.OtherTool; +using System.Drawing; namespace IRaCIS.Application.Services @@ -3410,16 +3411,14 @@ namespace IRaCIS.Application.Services cmoveRequest.OnResponseReceived += responseDelegate; #region 测试私有tag 传输信息 - // 声明私有Creator - //var privateCreator = new DicomTag(0x9999, 0x0010); - //cmoveRequest.Dataset.Add(new DicomLongString(privateCreator, "HIR")); + // DICOM 协议里,C - MOVE 请求的 Dataset 只会发给 C-MOVE SCP(调度方),而不是自动传到最终的 C-STORE SCP(接收影像方)的 Dataset 里。 // 添加私有Tag,元素号 >= 0x1000 - var privateTag = new DicomTag(0x9999, 0x1001); + //var privateTag = new DicomTag(0x9999, 0x1001); - var groupIdsJson = (new List { "KTGroup1", "KTGroup2" }).ToJsonStr(); + //var groupIdsJson = (new List { "KTGroup1", "KTGroup2" }).ToJsonStr(); - cmoveRequest.Dataset.Add(new DicomLongString(privateTag, groupIdsJson)); + //cmoveRequest.Dataset.Add(new DicomLongString(privateTag, groupIdsJson)); #endregion @@ -3427,7 +3426,7 @@ namespace IRaCIS.Application.Services cmoveRequestList.Add(cmoveRequest); - _logger.LogInformation($"执行C-Move StudyInstanceUID:{item},携带课题组信息:{groupIdsJson}"); + _logger.LogInformation($"执行C-Move StudyInstanceUID:{item}"); } else