Compare commits

..

No commits in common. "690c759fa1cc865139270bc0f567ecfe52bc3260" and "589e9868a86fb26fb9345a3038fe3580e1850686" have entirely different histories.

1 changed files with 25 additions and 38 deletions

View File

@ -557,25 +557,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
//新的序列 那么 检查的序列数量+1 //新的序列 那么 检查的序列数量+1
findStudy.SeriesCount += 1; findStudy.SeriesCount += 1;
} }
//else else
//{ {
// //该序列掉了instance //该序列掉了instance
// dicomSeries.InstanceCount += seriesItem.InstanceList.Count; dicomSeries.InstanceCount += seriesItem.InstanceList.Count;
//} }
//找到该序列已经存在的instanceId
var existInstanceIdList = _taskInstanceRepository.Where(t => t.SeriesId == dicomSeries.Id).Select(t => t.Id).ToList();
foreach (var instanceItem in seriesItem.InstanceList) foreach (var instanceItem in seriesItem.InstanceList)
{ {
var insntance = _mapper.Map<TaskInstance>(instanceItem); var insntance = _mapper.Map<TaskInstance>(instanceItem);
insntance.Id = IdentifierHelper.CreateGuid(insntance.StudyInstanceUid, insntance.SeriesInstanceUid, insntance.SopInstanceUid, trialId.ToString(), visiTaskId.ToString());
var instanceId = IdentifierHelper.CreateGuid(insntance.StudyInstanceUid, insntance.SeriesInstanceUid, insntance.SopInstanceUid, trialId.ToString(), visiTaskId.ToString());
if (!existInstanceIdList.Any(t => t == instanceId))
{
insntance.Id = instanceId;
insntance.StudyId = findStudy.Id; insntance.StudyId = findStudy.Id;
insntance.SeriesId = dicomSeries.Id; insntance.SeriesId = dicomSeries.Id;
@ -584,15 +575,11 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
insntance.VisitTaskId = visiTaskId; insntance.VisitTaskId = visiTaskId;
await _taskInstanceRepository.AddAsync(insntance); await _taskInstanceRepository.AddAsync(insntance);
dicomSeries.InstanceCount++;
findStudy.InstanceCount++;
} }
}
//// 不管是新的序列 还是 该序列 掉了Instance 重传的时候 检查的instance 数量都会增加 // 不管是新的序列 还是 该序列 掉了Instance 重传的时候 检查的instance 数量都会增加
//findStudy.InstanceCount += seriesItem.InstanceList.Count; findStudy.InstanceCount += seriesItem.InstanceList.Count;
} }