uat-标注-8
parent
050a0875fe
commit
03d61347ca
|
|
@ -269,8 +269,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
|
|
||||||
public AddOrUpdateStudyDto Study { get; set; }
|
public AddOrUpdateStudyDto Study { get; set; }
|
||||||
|
|
||||||
[NotDefault]
|
public Guid? VisitTaskId { get; set; }
|
||||||
public Guid VisitTaskId { get; set; }
|
|
||||||
|
|
||||||
public bool? IsImageSegmentLabel { get; set; }
|
public bool? IsImageSegmentLabel { get; set; }
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -548,9 +548,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
|
|
||||||
var @uploadLock = _distributedLockProvider.CreateLock($"UploadTaskDicom");
|
var @uploadLock = _distributedLockProvider.CreateLock($"UploadTaskDicom");
|
||||||
|
|
||||||
|
var visiTaskId = incommand.VisitTaskId.Value;
|
||||||
|
|
||||||
using (await @uploadLock.AcquireAsync())
|
using (await @uploadLock.AcquireAsync())
|
||||||
{
|
{
|
||||||
if (_fusionCache.GetOrDefault<Guid>(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid)) != Guid.Empty)
|
if (_fusionCache.GetOrDefault<Guid>(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, visiTaskId, incommand.Study.StudyInstanceUid)) != Guid.Empty)
|
||||||
{
|
{
|
||||||
//---当前已有人正在上传和归档该检查!
|
//---当前已有人正在上传和归档该检查!
|
||||||
return ResponseOutput.NotOk(I18n.T("UploadDownLoad_ArchiveInProgress"));
|
return ResponseOutput.NotOk(I18n.T("UploadDownLoad_ArchiveInProgress"));
|
||||||
|
|
@ -558,7 +560,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//在事务未完成前 防止前端重复提交
|
//在事务未完成前 防止前端重复提交
|
||||||
await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, incommand.VisitTaskId, incommand.Study.StudyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromMinutes(1));
|
await _fusionCache.SetAsync(CacheKeys.TrialTaskStudyUidDBLock(incommand.TrialId, visiTaskId, incommand.Study.StudyInstanceUid), _userInfo.UserRoleId, TimeSpan.FromMinutes(1));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -570,7 +572,6 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
svId = _dicomStudyRepository.Where(t => t.TrialId == incommand.TrialId && t.StudyInstanceUid == incommand.Study.StudyInstanceUid).Select(t => t.SubjectVisitId).FirstOrDefault();
|
svId = _dicomStudyRepository.Where(t => t.TrialId == incommand.TrialId && t.StudyInstanceUid == incommand.Study.StudyInstanceUid).Select(t => t.SubjectVisitId).FirstOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
var visiTaskId = incommand.VisitTaskId;
|
|
||||||
|
|
||||||
var modalitys = string.Empty;
|
var modalitys = string.Empty;
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue