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

代码修改
continuous-integration/drone/push Build is failing Details

IRC_NewDev
he 2024-08-01 10:39:21 +08:00
parent 8ec86017f0
commit 13acd950ad
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs
View File

@ -1147,7 +1147,7 @@ namespace IRaCIS.Application.Services
[HttpPost] [HttpPost]
public async Task<IResponseOutput> AddOrUpdateConsistencyAnalysisReadingClinicalData(AddOrUpdateReadingClinicalDataDto indto) public async Task<IResponseOutput> AddOrUpdateConsistencyAnalysisReadingClinicalData(AddOrUpdateReadingClinicalDataDto indto)
{ {
var existsQuery = _readingClinicalDataRepository var existsQuery = _readingConsistentClinicalDataRepository
.WhereIf(indto.Id != null, x => x.Id != indto.Id) .WhereIf(indto.Id != null, x => x.Id != indto.Id)
.Where(x => x.ClinicalDataTrialSetId == indto.ClinicalDataTrialSetId && x.ReadingId == indto.ReadingId && x.StudyId == indto.StudyId); .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) if (indto.Id == null)
{ {
var entity = _mapper.Map<ReadingClinicalData>(indto); var entity = _mapper.Map<ReadingConsistentClinicalData>(indto);
entity.ReadingClinicalDataPDFList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF() entity.ReadingClinicalDataPDFList = indto.AddFileList.Select(x => new ReadingConsistentClinicalDataPDF()
{ {
FileName = x.FileName, FileName = x.FileName,
Path = x.Path, Path = x.Path,
@ -1176,23 +1176,23 @@ namespace IRaCIS.Application.Services
entity.IsBlind = null; entity.IsBlind = null;
entity.IsComplete = null; entity.IsComplete = null;
entity.FileCount = entity.ReadingClinicalDataPDFList.Count; entity.FileCount = entity.ReadingClinicalDataPDFList.Count;
await _readingClinicalDataRepository.AddAsync(entity, true); await _readingConsistentClinicalDataRepository.AddAsync(entity, true);
var success = await _readingClinicalDataRepository.SaveChangesAsync(); var success = await _readingConsistentClinicalDataRepository.SaveChangesAsync();
return ResponseOutput.Ok(entity.Id); return ResponseOutput.Ok(entity.Id);
} }
else else
{ {
var entity = (await _readingClinicalDataRepository.Where(t => t.Id == indto.Id, true).FirstOrDefaultAsync()).IfNullThrowException(); var entity = (await _readingConsistentClinicalDataRepository.Where(t => t.Id == indto.Id, true).FirstOrDefaultAsync()).IfNullThrowException();
await _readingClinicalDataPDFRepository.BatchDeleteNoTrackingAsync(x => indto.DeleteFileIds.Contains(x.Id)); 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, FileName = x.FileName,
Path = x.Path, Path = x.Path,
Size = x.Size, Size = x.Size,
Type = x.Type, Type = x.Type,
ReadingClinicalDataId = entity.Id, ReadingConsistentClinicalDataId = entity.Id,
}).ToList(); }).ToList();
@ -1207,15 +1207,15 @@ namespace IRaCIS.Application.Services
entity.IsBlind = null; 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.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
entity.IsSign = false; entity.IsSign = false;
entity.FileCount = fileCount; entity.FileCount = fileCount;
var success = await _readingClinicalDataRepository.SaveChangesAsync(); var success = await _readingConsistentClinicalDataRepository.SaveChangesAsync();
return ResponseOutput.Ok(entity.Id); return ResponseOutput.Ok(entity.Id);
} }

1
IRaCIS.Core.Application/Service/Reading/_MapConfig.cs
View File

@ -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())); //.ForMember(d => d.SiteNames, u => u.MapFrom(s => s.ReadingPeriodSites.SelectMany(x => x.Site.SiteName).ToList()));
CreateMap<ReadingClinicalData, AddOrUpdateReadingClinicalDataDto>().ReverseMap(); CreateMap<ReadingClinicalData, AddOrUpdateReadingClinicalDataDto>().ReverseMap();
CreateMap<ReadingConsistentClinicalData, AddOrUpdateReadingClinicalDataDto>().ReverseMap();
CreateMap<ReadingClinicalDataPDF, AddOrUpdateReadingClinicalDataPDFDto>().ReverseMap(); CreateMap<ReadingClinicalDataPDF, AddOrUpdateReadingClinicalDataPDFDto>().ReverseMap();