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

修改dicom 上传为0 提示

IRC_NewDev
hang 2024-09-11 17:39:39 +08:00
parent 0f495a4568
commit c7e3403cae
3 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
View File

@ -238,33 +238,7 @@ namespace IRaCIS.Core.API.Controllers
[HttpPost, Route("Study/PreArchiveStudy")]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
[FromServices] IStudyService _studyService,
[FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
{
var savedInfo = _studyService.GetSaveToDicomInfo(preArchiveStudyCommand.SubjectVisitId);
var studyMonitor = new StudyMonitor()
{
TrialId = savedInfo.TrialId,
SubjectId = savedInfo.SubjectId,
SubjectVisitId = savedInfo.SubjectVisitId,
IsSuccess = false,
UploadStartTime = DateTime.Now,
IsDicom = preArchiveStudyCommand.IsDicom,
IP = _userInfo.IP
};
var addEntity = await _studyMonitorRepository.AddAsync(studyMonitor, true);
return ResponseOutput.Ok(addEntity.Id);
}
/// <summary>Dicom 归档</summary> /// <summary>Dicom 归档</summary>
@ -446,7 +420,33 @@ namespace IRaCIS.Core.API.Controllers
public string FileType { get; set; } public string FileType { get; set; }
} }
} }
[HttpPost, Route("Study/PreArchiveStudy")]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
[FromServices] IStudyService _studyService,
[FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
{
var savedInfo = _studyService.GetSaveToDicomInfo(preArchiveStudyCommand.SubjectVisitId);
var studyMonitor = new StudyMonitor()
{
TrialId = savedInfo.TrialId,
SubjectId = savedInfo.SubjectId,
SubjectVisitId = savedInfo.SubjectVisitId,
IsSuccess = false,
UploadStartTime = DateTime.Now,
IsDicom = preArchiveStudyCommand.IsDicom,
IP = _userInfo.IP
};
var addEntity = await _studyMonitorRepository.AddAsync(studyMonitor, true);
return ResponseOutput.Ok(addEntity.Id);
}
/// <summary> /// <summary>
/// 上传非Dicom 文件 支持压缩包 多文件上传 /// 上传非Dicom 文件 支持压缩包 多文件上传
/// </summary> /// </summary>

110
IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs
View File

@ -103,12 +103,12 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
} }
[HttpGet] [HttpGet]
public async Task<IResponseOutput> DicomUploadInProgress(Guid trialId, string studyInstanceUid,Guid? visitTaskId) public async Task<IResponseOutput> DicomUploadInProgress(Guid trialId, string studyInstanceUid, Guid? visitTaskId)
{ {
if(visitTaskId != null) if (visitTaskId != null)
{ {
var cacheValue = _fusionCache.GetOrDefault<Guid>(CacheKeys.TrialTaskStudyUidUploading(trialId, visitTaskId.Value, studyInstanceUid)); var cacheValue = _fusionCache.GetOrDefault<Guid>(CacheKeys.TrialTaskStudyUidUploading(trialId, visitTaskId.Value, studyInstanceUid));
if (cacheValue != Guid.Empty && cacheValue !=_userInfo.Id) if (cacheValue != Guid.Empty && cacheValue != _userInfo.Id)
{ {
//---当前已有人正在上传和归档该检查! //---当前已有人正在上传和归档该检查!
return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_ArchiveInProgress")); return ResponseOutput.NotOk(StaticData.International("UploadDownLoad_ArchiveInProgress"));
@ -134,11 +134,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand) public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand)
{ {
//总数为0的检查不允许提交
if (incommand.Study.SeriesList.SelectMany(t => t.InstanceList).Count() == 0)
{
return ResponseOutput.NotOk("Study_InstanceCountZero");
}
var @uploadLock = _distributedLockProvider.CreateLock($"UploadDicom"); var @uploadLock = _distributedLockProvider.CreateLock($"UploadDicom");
@ -163,7 +159,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{ {
var trialId = incommand.TrialId; var trialId = incommand.TrialId;
var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == incommand.StudyMonitorId); var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == incommand.StudyMonitorId);
studyMonitor.UploadFinishedTime = DateTime.Now; studyMonitor.UploadFinishedTime = DateTime.Now;
studyMonitor.ArchiveFinishedTime = DateTime.Now; studyMonitor.ArchiveFinishedTime = DateTime.Now;
@ -171,10 +166,36 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
studyMonitor.IsSuccess = incommand.FailedFileCount == 0; studyMonitor.IsSuccess = incommand.FailedFileCount == 0;
studyMonitor.RecordPath = incommand.RecordPath; studyMonitor.RecordPath = incommand.RecordPath;
var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString());
var findStudy = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
studyMonitor.StudyId = studyId;
studyMonitor.StudyCode = findStudy?.StudyCode??"";
if (incommand.Study.SeriesList.SelectMany(t => t.InstanceList).Count() == 0)
{
await _studyMonitorRepository.SaveChangesAsync();
return ResponseOutput.Ok();
}
//上传 //上传
if (studyMonitor.IsDicomReUpload == false) if (studyMonitor.IsDicomReUpload == false)
{ {
var study = _mapper.Map<DicomStudy>(incommand.Study);
//如果因为意外情况，连续点击两次，导致第一次插入了，第二次进来也会插入，在此判断一下
if (findStudy != null)
{
await _studyMonitorRepository.SaveChangesAsync();
//直接返回
return ResponseOutput.Ok();
}
var addStudy = _mapper.Map<DicomStudy>(incommand.Study);
var @lock = _distributedLockProvider.CreateLock($"StudyCode"); var @lock = _distributedLockProvider.CreateLock($"StudyCode");
@ -188,42 +209,34 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
int currentNextCodeInt = cacheMaxCodeInt > dbStudyCodeIntMax ? cacheMaxCodeInt + 1 : dbStudyCodeIntMax + 1; int currentNextCodeInt = cacheMaxCodeInt > dbStudyCodeIntMax ? cacheMaxCodeInt + 1 : dbStudyCodeIntMax + 1;
study.Code = currentNextCodeInt; addStudy.Code = currentNextCodeInt;
study.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy)); addStudy.StudyCode = AppSettings.GetCodeStr(currentNextCodeInt, nameof(DicomStudy));
await _fusionCache.SetAsync<int>(CacheKeys.TrialStudyMaxCode(trialId), study.Code, TimeSpan.FromMinutes(30)); await _fusionCache.SetAsync<int>(CacheKeys.TrialStudyMaxCode(trialId), addStudy.Code, TimeSpan.FromMinutes(30));
} }
study.Id = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString()); addStudy.Id = studyId;
study.TrialId = incommand.TrialId; addStudy.TrialId = incommand.TrialId;
study.SubjectId = incommand.SubjectId; addStudy.SubjectId = incommand.SubjectId;
study.SubjectVisitId = incommand.SubjectVisitId; addStudy.SubjectVisitId = incommand.SubjectVisitId;
study.IsFromPACS = false; addStudy.IsFromPACS = false;
//如果因为意外情况，连续点击两次，导致第一次插入了，第二次进来也会插入，在此判断一下
var findStudy = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == study.Id);
if (findStudy != null)
{
//直接返回
return ResponseOutput.Ok();
}
//特殊处理逻辑 //特殊处理逻辑
study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Distinct()); addStudy.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Distinct());
SpecialArchiveStudyDeal(study); SpecialArchiveStudyDeal(addStudy);
modalitys = study.Modalities; modalitys = addStudy.Modalities;
await _dicomstudyRepository.AddAsync(study); await _dicomstudyRepository.AddAsync(addStudy);
studyMonitor.StudyId = study.Id;
studyMonitor.StudyCode = study.StudyCode; studyMonitor.StudyCode = addStudy.StudyCode;
foreach (var seriesItem in incommand.Study.SeriesList) foreach (var seriesItem in incommand.Study.SeriesList)
@ -231,7 +244,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var series = _mapper.Map<DicomSeries>(seriesItem); var series = _mapper.Map<DicomSeries>(seriesItem);
series.Id = IdentifierHelper.CreateGuid(seriesItem.StudyInstanceUid, seriesItem.SeriesInstanceUid, incommand.TrialId.ToString()); series.Id = IdentifierHelper.CreateGuid(seriesItem.StudyInstanceUid, seriesItem.SeriesInstanceUid, incommand.TrialId.ToString());
series.StudyId = study.Id; series.StudyId = addStudy.Id;
series.TrialId = incommand.TrialId; series.TrialId = incommand.TrialId;
series.SubjectId = incommand.SubjectId; series.SubjectId = incommand.SubjectId;
@ -246,10 +259,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{ {
var isntance = _mapper.Map<DicomInstance>(instanceItem); var isntance = _mapper.Map<DicomInstance>(instanceItem);
Guid instanceId = IdentifierHelper.CreateGuid(study.StudyInstanceUid, series.SeriesInstanceUid, isntance.SopInstanceUid, study.TrialId.ToString()); Guid instanceId = IdentifierHelper.CreateGuid(addStudy.StudyInstanceUid, series.SeriesInstanceUid, isntance.SopInstanceUid, addStudy.TrialId.ToString());
isntance.Id = instanceId; isntance.Id = instanceId;
isntance.StudyId = study.Id; isntance.StudyId = addStudy.Id;
isntance.SeriesId = series.Id; isntance.SeriesId = series.Id;
isntance.TrialId = incommand.TrialId; isntance.TrialId = incommand.TrialId;
@ -260,26 +273,15 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
} }
} }
} }
else else
{ {
var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString()); ;
var study = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId);
//重传的时候也要赋值检查Id
studyMonitor.StudyId = study.Id;
studyMonitor.StudyCode = study.StudyCode;
//特殊处理逻辑 //特殊处理逻辑
study.IsFromPACS = false; findStudy.IsFromPACS = false;
study.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Union(study.Modalities.Split("、", StringSplitOptions.RemoveEmptyEntries)).Distinct()); findStudy.Modalities = string.Join("、", incommand.Study.SeriesList.Select(t => t.Modality).Union(findStudy.Modalities.Split("、", StringSplitOptions.RemoveEmptyEntries)).Distinct());
SpecialArchiveStudyDeal(study); SpecialArchiveStudyDeal(findStudy);
modalitys = study.Modalities; modalitys = findStudy.Modalities;
// 少了整个序列 // 少了整个序列
@ -297,7 +299,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
var series = _mapper.Map<DicomSeries>(seriesItem); var series = _mapper.Map<DicomSeries>(seriesItem);
series.Id = seriesId; series.Id = seriesId;
series.StudyId = study.Id; series.StudyId = findStudy.Id;
series.TrialId = incommand.TrialId; series.TrialId = incommand.TrialId;
series.SubjectId = incommand.SubjectId; series.SubjectId = incommand.SubjectId;
@ -307,7 +309,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
dicomSeries = await _dicomSeriesRepository.AddAsync(series); dicomSeries = await _dicomSeriesRepository.AddAsync(series);
//新的序列 那么 检查的序列数量+1 //新的序列 那么 检查的序列数量+1
study.SeriesCount += 1; findStudy.SeriesCount += 1;
} }
else else
{ {
@ -319,7 +321,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
{ {
var insntance = _mapper.Map<DicomInstance>(instanceItem); var insntance = _mapper.Map<DicomInstance>(instanceItem);
insntance.Id = IdentifierHelper.CreateGuid(insntance.StudyInstanceUid, insntance.SeriesInstanceUid, insntance.SopInstanceUid, trialId.ToString()); insntance.Id = IdentifierHelper.CreateGuid(insntance.StudyInstanceUid, insntance.SeriesInstanceUid, insntance.SopInstanceUid, trialId.ToString());
insntance.StudyId = study.Id; insntance.StudyId = findStudy.Id;
insntance.SeriesId = dicomSeries.Id; insntance.SeriesId = dicomSeries.Id;
insntance.TrialId = incommand.TrialId; insntance.TrialId = incommand.TrialId;
@ -331,7 +333,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
// 不管是新的序列 还是 该序列 掉了Instance 重传的时候 检查的instance 数量都会增加 // 不管是新的序列 还是 该序列 掉了Instance 重传的时候 检查的instance 数量都会增加
study.InstanceCount += seriesItem.InstanceList.Count; findStudy.InstanceCount += seriesItem.InstanceList.Count;
} }

2
IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs
View File

@ -251,10 +251,8 @@ namespace IRaCIS.Core.Application.Services
HtmlPath = k.HtmlPath, HtmlPath = k.HtmlPath,
Path = k.Path, Path = k.Path,
InstanceNumber = k.InstanceNumber, InstanceNumber = k.InstanceNumber,
}).ToList(); }).ToList();
} }
); );
//设置为阅片与否 不更改数据库检查 的instance数量 和 SeriesCount 所以这里要实时统计 //设置为阅片与否 不更改数据库检查 的instance数量 和 SeriesCount 所以这里要实时统计