Compare commits

..

No commits in common. "dfd4cd533ba0bb92b760df9b8a8ee03d8427540b" and "c418b7e474f57db439c4d7a87a38c1c535bfae1d" have entirely different histories.

2 changed files with 5 additions and 22 deletions

View File

@ -2055,12 +2055,11 @@ namespace IRaCIS.Application.Services
{ {
//重新算Id //重新算Id
Guid studyId = IdentifierHelper.CreateGuid(item.TrialId.ToString(), find.StudyInstanceUid); Guid studyId = IdentifierHelper.CreateGuid(item.TrialId.ToString(), find.StudyInstanceUid);
find.Id = studyId;
//find.Id = studyId;
var newStuty = _mapper.Map<DicomStudy>(find); var newStuty = _mapper.Map<DicomStudy>(find);
//await _repository.AddAsync(newStuty); await _repository.AddAsync(newStuty);
newStuty.Id = studyId; //newStuty.Id = NewId.NextSequentialGuid();
newStuty.SeqId = NewId.NextSequentialGuid(); newStuty.SeqId = NewId.NextSequentialGuid();
newStuty.Code = currentNextCodeInt; newStuty.Code = currentNextCodeInt;
@ -2085,9 +2084,7 @@ namespace IRaCIS.Application.Services
series.SubjectVisitId = item.SubjectVisitId; series.SubjectVisitId = item.SubjectVisitId;
} }
newStuty.SeriesList = newSeriesList; await _repository.AddRangeAsync(newSeriesList);
//await _repository.AddRangeAsync(newSeriesList);
var newInstanceList = _mapper.Map<List<DicomInstance>>(find.InstanceList); var newInstanceList = _mapper.Map<List<DicomInstance>>(find.InstanceList);
@ -2105,13 +2102,7 @@ namespace IRaCIS.Application.Services
instance.SubjectId = item.SubjectId; instance.SubjectId = item.SubjectId;
instance.SubjectVisitId = item.SubjectVisitId; instance.SubjectVisitId = item.SubjectVisitId;
} }
await _repository.AddRangeAsync(newInstanceList);
var aa = newInstanceList.Where(t => t.SeqId == Guid.Parse("08dde5f4-2134-31e8-0242-c0a801000000")).ToList();
newStuty.InstanceList = newInstanceList;
await _repository.AddAsync(newStuty);
//await _repository.AddRangeAsync(newInstanceList);
} }
currentNextCodeInt++; currentNextCodeInt++;

View File

@ -162,14 +162,6 @@ public class AuditEntityInterceptor(IUserInfo _userInfo,
if (entities.Count > 0) if (entities.Count > 0)
{ {
var a1= entities.Where(t=> typeof(DicomStudy).IsAssignableFrom(t.Entity.GetType())).ToList();
var a2 = entities.Where(t => typeof(DicomSeries).IsAssignableFrom(t.Entity.GetType())).ToList();
var a3 = entities.Where(t => typeof(DicomInstance).IsAssignableFrom(t.Entity.GetType())).ToList();
var list = a3
.Where(t => ((DicomInstance)t.Entity).SeqId == Guid.Parse("08dde5f4-2134-31e8-0242-c0a801000000"))
.ToList();
auditingData.InsertAddEntitys(entities).GetAwaiter().GetResult(); auditingData.InsertAddEntitys(entities).GetAwaiter().GetResult();
} }