XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改维护脚本
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-11-21 13:44:33 +08:00
parent 62352738e8
commit facb318180
2 changed files with 67 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -18826,7 +18826,7 @@
<param name="inQuery"></param> <param name="inQuery"></param>
<returns></returns> <returns></returns>
</member> </member>
<!-- Badly formed XML comment ignored for member "M:IRaCIS.Application.Services.PatientService.TrialImageAddExtralField(System.Guid,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Application.Helper.IOSSService)" --> <!-- Badly formed XML comment ignored for member "M:IRaCIS.Application.Services.PatientService.TrialImageAddExtralField(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Application.Helper.IOSSService)" -->
<member name="M:IRaCIS.Application.Services.PatientService.GetDownloadPatientStudyInfo(IRaCIS.Application.Contracts.PatientImageDownloadCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPPatient},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPStudy},IRaCIS.Core.Application.Helper.IOSSService)"> <member name="M:IRaCIS.Application.Services.PatientService.GetDownloadPatientStudyInfo(IRaCIS.Application.Contracts.PatientImageDownloadCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPPatient},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SCPStudy},IRaCIS.Core.Application.Helper.IOSSService)">
<summary> <summary>
影像库 和影像下载界面批量下载原始影像 患者列表只传递 患者Id数组 检查列表，把患者Id数组 和检查Id数组都传递 影像库 和影像下载界面批量下载原始影像 患者列表只传递 患者Id数组 检查列表，把患者Id数组 和检查Id数组都传递

28
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -3186,8 +3186,7 @@ namespace IRaCIS.Application.Services
/// <param name="_studyRepository"></param> /// <param name="_studyRepository"></param>
/// <param name="_seriesRepository"></param> /// <param name="_seriesRepository"></param>
/// <returns></returns> /// <returns></returns>
public async Task<IResponseOutput> TrialImageAddExtralField(Guid trialId, public async Task<IResponseOutput> TrialImageAddExtralField([FromServices] IRepository<SCPInstance> _scpInstanceRepository,
[FromServices] IRepository<SCPInstance> _scpInstanceRepository,
[FromServices] IRepository<DicomInstance> _instanceRepository, [FromServices] IRepository<DicomInstance> _instanceRepository,
[FromServices] IOSSService _oSSService) [FromServices] IOSSService _oSSService)
{ {
@ -3205,12 +3204,14 @@ namespace IRaCIS.Application.Services
.Select(g => new { g.Key.SeriesId, g.Key.NumberOfFrames, g.OrderBy(t => t.FileSize).First().Path }).ToList(); .Select(g => new { g.Key.SeriesId, g.Key.NumberOfFrames, g.OrderBy(t => t.FileSize).First().Path }).ToList();
foreach (var item in seriesList) foreach (var item in seriesList)
{
try
{ {
var stream = await _oSSService.GetStreamFromOSSAsync(item.Path); var stream = await _oSSService.GetStreamFromOSSAsync(item.Path);
var dicomFile = DicomFile.Open(stream); var dicomFile = DicomFile.Open(stream);
var pixelData = DicomPixelData.Create(dicomFile.Dataset); //var pixelData = DicomPixelData.Create(dicomFile.Dataset);
//获取像素是否为封装形式 //获取像素是否为封装形式
var syntax = dicomFile.Dataset.InternalTransferSyntax; var syntax = dicomFile.Dataset.InternalTransferSyntax;
@ -3229,6 +3230,15 @@ namespace IRaCIS.Application.Services
MediaStorageSOPClassUID = mediaStorageSOPClassUID, MediaStorageSOPClassUID = mediaStorageSOPClassUID,
SOPClassUID = sOPClassUID, SOPClassUID = sOPClassUID,
}); });
}
catch (Exception ex)
{
Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] SCP下载失败 SeriesId: {item.SeriesId} Path:{item.Path} Error: {ex.Message}\n" );
}
} }
@ -3240,12 +3250,14 @@ namespace IRaCIS.Application.Services
.Select(g => new { g.Key.SeriesId, g.Key.NumberOfFrames, g.OrderBy(t => t.FileSize).First().Path }).ToList(); .Select(g => new { g.Key.SeriesId, g.Key.NumberOfFrames, g.OrderBy(t => t.FileSize).First().Path }).ToList();
foreach (var item in seriesList2) foreach (var item in seriesList2)
{
try
{ {
var stream = await _oSSService.GetStreamFromOSSAsync(item.Path); var stream = await _oSSService.GetStreamFromOSSAsync(item.Path);
var dicomFile = DicomFile.Open(stream); var dicomFile = DicomFile.Open(stream);
var pixelData = DicomPixelData.Create(dicomFile.Dataset); //var pixelData = DicomPixelData.Create(dicomFile.Dataset);
//获取像素是否为封装形式 //获取像素是否为封装形式
var syntax = dicomFile.Dataset.InternalTransferSyntax; var syntax = dicomFile.Dataset.InternalTransferSyntax;
@ -3264,6 +3276,14 @@ namespace IRaCIS.Application.Services
MediaStorageSOPClassUID = mediaStorageSOPClassUID, MediaStorageSOPClassUID = mediaStorageSOPClassUID,
SOPClassUID = sOPClassUID, SOPClassUID = sOPClassUID,
}); });
}
catch (Exception ex)
{
Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] 下载失败 SeriesId: {item.SeriesId} Path:{item.Path} Error: {ex.Message}\n");
}
} }