diff --git a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs index 625a9663..e76e0651 100644 --- a/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs +++ b/IRaCIS.Core.Application/Service/QC/NoneDicomStudyService.cs @@ -66,7 +66,8 @@ namespace IRaCIS.Core.Application.Contracts { if (addOrEditNoneDicomStudy.Id == Guid.Empty|| addOrEditNoneDicomStudy.Id==null) { - addOrEditNoneDicomStudy.Code =(await _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).MaxAsync(x=>x.Code)) + 1; + var code = _noneDicomStudyRepository.Where(t => t.TrialId == addOrEditNoneDicomStudy.TrialId).MaxOrDefault(x=>x.Code); + addOrEditNoneDicomStudy.Code = code + 1; } addOrEditNoneDicomStudy.Code = addOrEditNoneDicomStudy.Code ?? 0; diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 85758035..50306bdb 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1475,11 +1475,20 @@ namespace IRaCIS.Core.Application.Image.QA /// /// /// - [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{signId:guid}/{auditState:int}")] + [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{auditState:int}")] [TypeFilter(typeof(TrialResourceFilter))] public async Task QCPassedOrFailed(Guid trialId, Guid subjectVisitId, [FromRoute] AuditStateEnum auditState) { + var DicomSeriesdatac = await _repository.GetQueryable().Where(x => x.SubjectVisitId == subjectVisitId).Select(x => new { + StudyCode = x.DicomStudy.StudyCode, + Modalities = x.DicomStudy.Modalities, + SeriesNumber = x.SeriesNumber, + InstanceCount = x.InstanceCount, + SeriesTime = x.SeriesTime, + IsReading = x.IsReading, + IsDeleted = x.IsDeleted, + }).ToListAsync(); if (!await _repository.AnyAsync(t => t.TrialId == trialId && t.UserId == _userInfo.Id)) { @@ -1625,7 +1634,16 @@ namespace IRaCIS.Core.Application.Image.QA var instanceIdList = await _repository.Where(t => t.DicomSerie.IsDeleted && t.SubjectVisitId == subjectVisitId) .Select(t => new { InstanceId = t.Id, t.SeriesId, t.StudyId, t.SubjectId, t.SiteId }).ToListAsync(); - + List datas = new List(); + var DicomSeriesdata = await _repository.GetQueryable().Where(x=>x.SubjectVisitId== subjectVisitId&&x.IsDeleted).Select(x => new { + StudyCode=x.DicomStudy.Code, + Modalities=x.DicomStudy.Modalities, + SeriesNumber=x.SeriesNumber, + InstanceCount=x.InstanceCount, + SeriesTime=x.SeriesTime, + IsReading=x.IsReading, + IsDeleted=x.IsDeleted, + }).ToListAsync(); instanceIdList.ForEach(t => {