Merge branch 'master' of http://192.168.1.2:8033/IRaCIS_Core_Api
						commit
						7447b30892
					
				| 
						 | 
				
			
			@ -278,6 +278,7 @@ namespace IRaCIS.Core.Application.Contracts
 | 
			
		|||
        public string AcquisitionNumber { get; set; } = string.Empty;
 | 
			
		||||
        public string TriggerTime { get; set; } = string.Empty;
 | 
			
		||||
 | 
			
		||||
        public string IamgeResizePath { get; set; }
 | 
			
		||||
        public List<AddInstanceDto> InstanceList { get; set; }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -259,6 +259,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 | 
			
		|||
                        dicomSeries.InstanceCount += seriesItem.InstanceCount;                      
 | 
			
		||||
                    }
 | 
			
		||||
 | 
			
		||||
                    dicomSeries.IamgeResizePath = seriesItem.IamgeResizePath;
 | 
			
		||||
 | 
			
		||||
                    foreach (var instanceItem in seriesItem.InstanceList)
 | 
			
		||||
                    {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -791,23 +791,6 @@ namespace IRaCIS.Core.Application.Image.QA
 | 
			
		|||
                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 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();
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -61,5 +61,7 @@ namespace IRaCIS.Core.Domain.Models
 | 
			
		|||
        public bool IsDeleted {get;set;}
 | 
			
		||||
        public bool IsReading { get; set; } = true;
 | 
			
		||||
 | 
			
		||||
        public string IamgeResizePath { get; set; }
 | 
			
		||||
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue