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

Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-07-25 11:10:25 +08:00
parent cb25fa309f 1f8f3242b5
commit 3eb3478353
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
IRC.Core.SCP/Service/CStoreSCPService.cs
View File

@ -21,6 +21,7 @@ using FellowOakDicom.Imaging;
using SharpCompress.Common; using SharpCompress.Common;
using SixLabors.ImageSharp.Formats.Jpeg; using SixLabors.ImageSharp.Formats.Jpeg;
using IRaCIS.Core.Infrastructure; using IRaCIS.Core.Infrastructure;
using IRaCIS.Core.Infrastructure.Extention;
namespace IRaCIS.Core.SCP.Service namespace IRaCIS.Core.SCP.Service
{ {
@ -258,9 +259,16 @@ namespace IRaCIS.Core.SCP.Service
public async Task<DicomCStoreResponse> OnCStoreRequestAsync(DicomCStoreRequest request) public async Task<DicomCStoreResponse> OnCStoreRequestAsync(DicomCStoreRequest request)
{ {
string studyInstanceUid = request.Dataset.GetString(DicomTag.StudyInstanceUID); string studyInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.StudyInstanceUID,string.Empty);
string seriesInstanceUid = request.Dataset.GetString(DicomTag.SeriesInstanceUID); string seriesInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.SeriesInstanceUID, string.Empty);
string sopInstanceUid = request.Dataset.GetString(DicomTag.SOPInstanceUID); string sopInstanceUid = request.Dataset.GetSingleValueOrDefault(DicomTag.SOPInstanceUID, string.Empty);
if(studyInstanceUid.IsNullOrEmpty() || seriesInstanceUid.IsNullOrEmpty() || sopInstanceUid.IsNullOrEmpty())
{
Log.Logger.Error($"接收数据读取StudyInstanceUID：{studyInstanceUid}、SeriesInstanceUID：{seriesInstanceUid}、SOPInstanceUID：{sopInstanceUid}有空 ");
return new DicomCStoreResponse(request, DicomStatus.Success);
}
//Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid, trialId.ToString()); //Guid studyId = IdentifierHelper.CreateGuid(studyInstanceUid, trialId.ToString());
Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, _trialId.ToString()); Guid seriesId = IdentifierHelper.CreateGuid(studyInstanceUid, seriesInstanceUid, _trialId.ToString());

10
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
View File

@ -194,6 +194,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
InstanceCount = t.InstanceCount, InstanceCount = t.InstanceCount,
Modalities = t.Modalities, Modalities = t.Modalities,
SeriesCount = t.SeriesCount, SeriesCount = t.SeriesCount,
ReadingInstanceCount=t.InstanceList.Where(t=>t.IsReading && t.DicomSerie.IsReading).Count(),
ReadingSeriesCount= t.SeriesList.Where(t => t.IsReading).Count(),
}).ToList(), }).ToList(),
UploadStudyList = u.TaskStudyList.Select(t => new StudyBasicInfo() UploadStudyList = u.TaskStudyList.Select(t => new StudyBasicInfo()
@ -213,6 +216,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
SopInstanceUidList = t.InstanceList.Select(t => t.SopInstanceUid).ToList(), SopInstanceUidList = t.InstanceList.Select(t => t.SopInstanceUid).ToList(),
ReadingInstanceCount = t.InstanceCount,
ReadingSeriesCount = t.SeriesCount,
}).ToList() }).ToList()
}) })
; ;
@ -723,7 +729,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
FileName = t.FileName, FileName = t.FileName,
FileSize = t.FileSize, FileSize = t.FileSize,
Path = t.Path Path = t.Path
}).ToList() }).ToList(),
ReadingFileCount= ns.FileCount,
}; };