diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/Interface/IStudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/Interface/IStudyService.cs index ce4e2186d..1998c940b 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/Interface/IStudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/Interface/IStudyService.cs @@ -9,7 +9,7 @@ namespace IRaCIS.Core.Application.Contracts Task> GetDicomAndNoneDicomStudyMonitorList(StudyQuery studyQuery); (List SeriesInstanceUid, List SopInstanceUid) GetHasUploadSeriesAndInstance(Guid studyId); DicomTrialSiteSubjectInfo GetSaveToDicomInfo(Guid subjectVisitId); - IResponseOutput Item(Guid studyId); + IResponseOutput Item(Guid studyId,bool? isPacs); Task Preview(Guid studyId); //IResponseOutput> VerifyStudyAllowUpload(VerifyUploadOrReupload verifyInfo); } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs index ce62e1db1..8d9ff79d4 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs @@ -159,7 +159,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc studyMonitor.FileSize = incommand.Study.SeriesList.SelectMany(t => t.InstanceList).Sum(t => t.FileSize); var studyId = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString()); - var findStudy = await _dicomstudyRepository.FirstOrDefaultAsync(t => t.Id == studyId); + var findStudy = await _dicomStudyRepository.FirstOrDefaultAsync(t => t.Id == studyId); studyMonitor.StudyId = studyId; studyMonitor.StudyCode = findStudy?.StudyCode ?? ""; @@ -183,7 +183,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc using (await @lock.AcquireAsync()) { //查询数据库获取最大的Code 没有记录则为0 - var dbStudyCodeIntMax = _dicomstudyRepository.Where(s => s.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max(); + var dbStudyCodeIntMax = _dicomStudyRepository.Where(s => s.TrialId == trialId).Select(t => t.Code).DefaultIfEmpty().Max(); //获取缓存中的值 并发的时候,需要记录,已被占用的值 这样其他线程在此占用的最大的值上递增 var cacheMaxCodeInt = await _fusionCache.GetOrDefaultAsync(CacheKeys.TrialStudyMaxCode(trialId)); @@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc SpecialArchiveStudyDeal(addStudy); modalitys = addStudy.Modalities; - await _dicomstudyRepository.AddAsync(addStudy); + await _dicomStudyRepository.AddAsync(addStudy);