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

修改稽查

Uat_Study
hang 2022-08-25 15:33:53 +08:00
parent 691ab5cf77
commit 15e1b4ac87
2 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
IRaCIS.Core.Application/Service/Reading/ReadingClinicalDataService.cs
View File

@ -100,6 +100,7 @@ namespace IRaCIS.Application.Services
entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded; entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
entity.IsBlind = null; entity.IsBlind = null;
entity.IsComplete = null; entity.IsComplete = null;
entity.FileCount = entity.ReadingClinicalDataPDFList.Count();
await _readingClinicalDataRepository.AddAsync(entity, true); await _readingClinicalDataRepository.AddAsync(entity, true);
var success = await _readingClinicalDataRepository.SaveChangesAsync(); var success = await _readingClinicalDataRepository.SaveChangesAsync();
return ResponseOutput.Ok(entity.Id); return ResponseOutput.Ok(entity.Id);
@ -108,8 +109,8 @@ namespace IRaCIS.Application.Services
{ {
var entity = (await _readingClinicalDataRepository.Where(t => t.Id == indto.Id, true).FirstOrDefaultAsync()).IfNullThrowException(); var entity = (await _readingClinicalDataRepository.Where(t => t.Id == indto.Id, true).FirstOrDefaultAsync()).IfNullThrowException();
_mapper.Map(indto, entity); _mapper.Map(indto, entity);
await _readingClinicalDataPDFRepository.DeleteFromQueryAsync(x => indto.DeleteFileIds.Contains(x.Id)); await _readingClinicalDataPDFRepository.BatchDeleteNoTrackingAsync(x => indto.DeleteFileIds.Contains(x.Id));
await _readingClinicalDataRepository.SaveChangesAsync();
var addFileList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF() var addFileList = indto.AddFileList.Select(x => new ReadingClinicalDataPDF()
{ {
TrialId = entity.TrialId, TrialId = entity.TrialId,
@ -122,8 +123,13 @@ namespace IRaCIS.Application.Services
ReadingId = indto.ReadingId, ReadingId = indto.ReadingId,
ReadingClinicalDataId = entity.Id, ReadingClinicalDataId = entity.Id,
}).ToList(); }).ToList();
entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
await _readingClinicalDataPDFRepository.AddRangeAsync(addFileList); await _readingClinicalDataPDFRepository.AddRangeAsync(addFileList);
await _readingClinicalDataPDFRepository.SaveChangesAsync();
var fileCount = await _readingClinicalDataPDFRepository.Where(t => t.ReadingClinicalDataId == indto.Id).CountAsync();
entity.ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded;
entity.FileCount = fileCount;
var success = await _readingClinicalDataRepository.SaveChangesAsync(); var success = await _readingClinicalDataRepository.SaveChangesAsync();
return ResponseOutput.Ok(entity.Id); return ResponseOutput.Ok(entity.Id);

31
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -795,7 +795,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
entity.ClinicalDataTrialSet = await _dbContext.ClinicalDataTrialSet.FindAsync(entity.ClinicalDataTrialSetId); entity.ClinicalDataTrialSet = await _dbContext.ClinicalDataTrialSet.FindAsync(entity.ClinicalDataTrialSetId);
} }
var fileCount = await _dbContext.ReadingClinicalDataPDF.Where(x => x.ReadingClinicalDataId == entity.Id).CountAsync();
await InsertInspection<ReadingClinicalData>(item.Entity as ReadingClinicalData, type, x => new InspectionConvertDTO() await InsertInspection<ReadingClinicalData>(item.Entity as ReadingClinicalData, type, x => new InspectionConvertDTO()
{ {
@ -810,25 +809,21 @@ namespace IRaCIS.Core.Infra.EFCore.Common
}); });
} }
foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingClinicalDataPDF))) //foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(ReadingClinicalDataPDF)))
{ //{
var entity = item.Entity as ReadingClinicalDataPDF; // var entity = item.Entity as ReadingClinicalDataPDF;
var fileCount = await _dbContext.ReadingClinicalDataPDF.Where(x => x.ReadingClinicalDataId == entity.Id).CountAsync();
await InsertInspection<ReadingClinicalDataPDF>(item.Entity as ReadingClinicalDataPDF, type, x => new InspectionConvertDTO()
{
SubjectId = x.SubjectId,
IsDistinctionInterface = false,
// await InsertInspection<ReadingClinicalDataPDF>(item.Entity as ReadingClinicalDataPDF, type, x => new InspectionConvertDTO()
ObjectRelationParentId = entity.ReadingClinicalDataId // {
}, new // SubjectId = x.SubjectId,
{ // IsDistinctionInterface = false,
IsCRCUpload = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator // ObjectRelationParentId = entity.ReadingClinicalDataId
}); // }, new
} // {
// IsCRCUpload = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator
// });
//}
#endregion #endregion