@@ -1111,12 +1111,12 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||
|
||||
var visit = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId);
|
||||
|
||||
var isExistStudyClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(t => t.TrialId == visit.TrialId && t.ClinicalDataLevel == ClinicalLevel.Study&&t.IsConfirm&&t.IsApply);
|
||||
if(isExistStudyClinicalData)
|
||||
var isExistStudyClinicalData = await _clinicalDataTrialSetRepository.AnyAsync(t => t.TrialId == visit.TrialId && t.ClinicalDataLevel == ClinicalLevel.Study && t.IsConfirm && t.IsApply);
|
||||
if (isExistStudyClinicalData)
|
||||
{
|
||||
List<string> modalitieTypes = new List<string>() { "PT、CT", "CT、PT", "PET-CT" };
|
||||
|
||||
var studyList=await _dicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId&& modalitieTypes.Contains(t.Modalities)).ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).ToListAsync();
|
||||
var studyList = await _dicomStudyRepository.Where(t => t.SubjectVisitId == subjectVisitId && modalitieTypes.Contains(t.Modalities)).ProjectTo<QAStudyInfoDTO>(_mapper.ConfigurationProvider).ToListAsync();
|
||||
if (studyList.Any(x => x.IsHasEmptyPatientInfo))
|
||||
{
|
||||
return ResponseOutput.NotOk(_localizer["QCOperation_IsHasEmptyPatientInfo"]);
|
||||
@@ -1189,7 +1189,7 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||
|
||||
await _scpStudyRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, u => new SCPStudy() { SubjectVisitId = null });
|
||||
|
||||
if (fisrtPath.IsNotNullOrEmpty())
|
||||
if (fisrtPath.IsNotNullOrEmpty() && study.IsFromPACS == false)
|
||||
{
|
||||
var prefix = fisrtPath.Substring(1, fisrtPath.LastIndexOf('/') - 1);
|
||||
|
||||
@@ -1230,7 +1230,7 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||
|
||||
string cacheKey = CacheKeys.UserQCSkipTask(_userInfo.UserRoleId);
|
||||
|
||||
|
||||
|
||||
await _fusionCache.SetAsync(cacheKey, new List<Guid>(), TimeSpan.FromMinutes(60));
|
||||
|
||||
return ResponseOutput.Ok();
|
||||
@@ -1393,12 +1393,12 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||
|
||||
|
||||
// 获取当前缓存中的访视Id集合(如果没有则创建空集合)
|
||||
var skippedVisits = await _fusionCache.GetOrDefaultAsync<List<Guid>>(CacheKeys.UserQCSkipTask(_userInfo.UserRoleId), new List<Guid>() { });
|
||||
var skippedVisits = await _fusionCache.GetOrDefaultAsync<List<Guid>>(CacheKeys.UserQCSkipTask(_userInfo.UserRoleId), new List<Guid>() { });
|
||||
//跳过当前访视
|
||||
if (inDto.IsSkipCurrentVisit)
|
||||
{
|
||||
skippedVisits.Add(inDto.SubjectVisitId);
|
||||
|
||||
|
||||
currentActionList = currentActionList.Where(t => !skippedVisits.Contains(t.SubjectVisitId)).ToList();
|
||||
}
|
||||
|
||||
@@ -1449,7 +1449,7 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||
|
||||
//跳过当前访视
|
||||
if (inDto.IsSkipCurrentVisit)
|
||||
{
|
||||
{
|
||||
visitList = visitList.Where(t => !skippedVisits.Contains(t.SubjectVisitId)).ToList();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user