diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs index 61082c802..458d15cbd 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs @@ -1147,7 +1147,7 @@ namespace IRaCIS.Application.Services [HttpPost] public async Task AddOrUpdateConsistencyAnalysisReadingClinicalData(AddOrUpdateReadingClinicalDataDto indto) { - var existsQuery = _readingClinicalDataRepository + var existsQuery = _readingConsistentClinicalDataRepository .WhereIf(indto.Id != null, x => x.Id != indto.Id) .Where(x => x.ClinicalDataTrialSetId == indto.ClinicalDataTrialSetId && x.ReadingId == indto.ReadingId && x.StudyId == indto.StudyId); @@ -1163,8 +1163,8 @@ namespace IRaCIS.Application.Services if (indto.Id == null) { - var entity = _mapper.Map(indto); - entity.ReadingClinicalDataPDFList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF() + var entity = _mapper.Map(indto); + entity.ReadingClinicalDataPDFList = indto.AddFileList.Select(x => new ReadingConsistentClinicalDataPDF() { FileName = x.FileName, Path = x.Path, @@ -1176,23 +1176,23 @@ namespace IRaCIS.Application.Services entity.IsBlind = null; entity.IsComplete = null; entity.FileCount = entity.ReadingClinicalDataPDFList.Count; - await _readingClinicalDataRepository.AddAsync(entity, true); - var success = await _readingClinicalDataRepository.SaveChangesAsync(); + await _readingConsistentClinicalDataRepository.AddAsync(entity, true); + var success = await _readingConsistentClinicalDataRepository.SaveChangesAsync(); return ResponseOutput.Ok(entity.Id); } else { - var entity = (await _readingClinicalDataRepository.Where(t => t.Id == indto.Id, true).FirstOrDefaultAsync()).IfNullThrowException(); - await _readingClinicalDataPDFRepository.BatchDeleteNoTrackingAsync(x => indto.DeleteFileIds.Contains(x.Id)); + var entity = (await _readingConsistentClinicalDataRepository.Where(t => t.Id == indto.Id, true).FirstOrDefaultAsync()).IfNullThrowException(); + await _readingConsistentClinicalDataPDFRepository.BatchDeleteNoTrackingAsync(x => indto.DeleteFileIds.Contains(x.Id)); - var addFileList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF() + var addFileList = indto.AddFileList.Select(x => new ReadingConsistentClinicalDataPDF() { FileName = x.FileName, Path = x.Path, Size = x.Size, Type = x.Type, - ReadingClinicalDataId = entity.Id, + ReadingConsistentClinicalDataId = entity.Id, }).ToList(); @@ -1207,15 +1207,15 @@ namespace IRaCIS.Application.Services entity.IsBlind = null; } - await _readingClinicalDataPDFRepository.AddRangeAsync(addFileList); + await _readingConsistentClinicalDataPDFRepository.AddRangeAsync(addFileList); - await _readingClinicalDataPDFRepository.SaveChangesAsync(); + await _readingConsistentClinicalDataPDFRepository.SaveChangesAsync(); - var fileCount = await _readingClinicalDataPDFRepository.Where(t => t.ReadingClinicalDataId == indto.Id).CountAsync(); + var fileCount = await _readingConsistentClinicalDataPDFRepository.Where(t => t.ReadingConsistentClinicalDataId == indto.Id).CountAsync(); entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded; entity.IsSign = false; entity.FileCount = fileCount; - var success = await _readingClinicalDataRepository.SaveChangesAsync(); + var success = await _readingConsistentClinicalDataRepository.SaveChangesAsync(); return ResponseOutput.Ok(entity.Id); } diff --git a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs index e2a260e9f..fe279c652 100644 --- a/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs +++ b/IRaCIS.Core.Application/Service/Reading/_MapConfig.cs @@ -118,6 +118,7 @@ namespace IRaCIS.Core.Application.Service //.ForMember(d => d.SiteNames, u => u.MapFrom(s => s.ReadingPeriodSites.SelectMany(x => x.Site.SiteName).ToList())); CreateMap().ReverseMap(); + CreateMap().ReverseMap(); CreateMap().ReverseMap();