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

Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api

Uat_Study
he 2023-05-15 10:47:18 +08:00
parent 18d4ee0dfa f0be7d2e9e
commit 7447b30892
4 changed files with 7 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/UnionStudyViewDodel.cs
View File

@ -278,6 +278,7 @@ namespace IRaCIS.Core.Application.Contracts
public string AcquisitionNumber { get; set; } = string.Empty; public string AcquisitionNumber { get; set; } = string.Empty;
public string TriggerTime { get; set; } = string.Empty; public string TriggerTime { get; set; } = string.Empty;
public string IamgeResizePath { get; set; }
public List<AddInstanceDto> InstanceList { get; set; } public List<AddInstanceDto> InstanceList { get; set; }

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

@ -256,9 +256,10 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
else else
{ {
//该序列掉了instance //该序列掉了instance
dicomSeries.InstanceCount += seriesItem.InstanceCount; dicomSeries.InstanceCount += seriesItem.InstanceCount;
} }
dicomSeries.IamgeResizePath = seriesItem.IamgeResizePath;
foreach (var instanceItem in seriesItem.InstanceList) foreach (var instanceItem in seriesItem.InstanceList)
{ {

35
IRaCIS.Core.Application/Service/QC/QCOperationService.cs
View File

@ -790,24 +790,7 @@ namespace IRaCIS.Core.Application.Image.QA
await _dicomStudyRepository.DeleteAsync(study); await _dicomStudyRepository.DeleteAsync(study);
//var DicomSeriess = await _repository.GetQueryable<DicomSeries>().Where(t => t.StudyId == id).Select(x => new
//{
// x.StudyId,
// x.SubjectId,
// x.SiteId,
// x.TrialId,
// x.Id,
// x.SubjectVisitId,
// x.SeriesTime,
// x.IsReading,
// x.InstanceCount,
// x.SeriesNumber,
// StudyCode = x.DicomStudy.StudyCode,
// Modalities = x.DicomStudy.Modalities,
//}).ToListAsync();
var succeess2 = await _repository.BatchDeleteAsync<DicomInstance>(t => t.StudyId == id); var succeess2 = await _repository.BatchDeleteAsync<DicomInstance>(t => t.StudyId == id);
var success3 = await _dicomSeriesrepository.BatchDeleteNoTrackingAsync(t => t.StudyId == id); var success3 = await _dicomSeriesrepository.BatchDeleteNoTrackingAsync(t => t.StudyId == id);
@ -830,21 +813,7 @@ namespace IRaCIS.Core.Application.Image.QA
} }
}); });
//var instanceIdList = await _repository.Where<DicomInstance>(t => t.StudyId == id)
// .Select(t => new { InstanceId = t.Id, t.SeriesId, t.StudyId, t.SubjectId, t.SiteId }).ToListAsync();
//instanceIdList.ForEach(t =>
//{
// var dicomStudy = new DicomStudy() { Id = t.StudyId, SubjectId = t.SubjectId, TrialId = trialId, SiteId = t.SiteId, SubjectVisitId = subjectVisitId };
// var (physicalPath, relativePath) =
// FileStoreHelper.GetDicomInstanceFilePath(_hostEnvironment, dicomStudy.TrialId, dicomStudy.SiteId, dicomStudy.SubjectId, dicomStudy.SubjectVisitId, dicomStudy.Id, t.InstanceId);
// if (System.IO.File.Exists(physicalPath))
// {
// File.Delete(physicalPath);
// }
//});
} }
await _subjectVisitRepository.SaveChangesAsync(); await _subjectVisitRepository.SaveChangesAsync();

2
IRaCIS.Core.Domain/Image/DicomSeries.cs
View File

@ -61,5 +61,7 @@ namespace IRaCIS.Core.Domain.Models
public bool IsDeleted {get;set;} public bool IsDeleted {get;set;}
public bool IsReading { get; set; } = true; public bool IsReading { get; set; } = true;
public string IamgeResizePath { get; set; }
} }
} }