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

修改一版

Uat_Study
he 2022-06-28 17:57:38 +08:00
parent 84049af89d
commit 8f0f46194c
2 changed files with 58 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs
View File

@ -24,12 +24,14 @@ namespace IRaCIS.Application.Services
private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
private readonly IRepository<PreviousPDF> _previousPDFRepository;
private readonly IRepository<Trial> _trialRepository;
public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
IRepository<PreviousPDF> previousPDFRepository
IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
IRepository<PreviousPDF> previousPDFRepository,
IRepository<Trial> trialRepository
)
{
_subjectVisitRepository = subjectVisitRepository;
@ -37,6 +39,7 @@ namespace IRaCIS.Application.Services
_clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
_clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
this._previousPDFRepository = previousPDFRepository;
this._trialRepository = trialRepository;
}
@ -107,49 +110,57 @@ namespace IRaCIS.Application.Services
/// <param name="trialId"></param>
/// <returns></returns>
private async Task<IResponseOutput> AddTrialClinicalDataTrialSet(Guid trialId)
private async Task AddTrialClinicalDataTrialSet(Guid trialId)
{
var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().ToListAsync();
var systemIds = systemClinicalDataList.Select(x => x.Id).ToList();
var trialSystemIds =await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
//var needUpdateIds = systemIds.Intersect(trialSystemIds).ToList();
var needAddids = systemIds.Except(trialSystemIds).ToList();
var systemDataList = systemClinicalDataList.Where(x => needAddids.Contains(x.Id)).ToList();
List<ClinicalDataTrialSet> dataSets = systemDataList.Select(x => new ClinicalDataTrialSet()
var syncClinicalDataTime = await _trialRepository.Where(x => x.Id == trialId).Select(x => x.SyncClinicalDataTime).FirstOrDefaultAsync();
if (syncClinicalDataTime != null)
{
Id= NewId.NextGuid(),
SystemClinicalDataSetId=x.Id,
ClinicalDataSetName=x.ClinicalDataSetName,
ClinicalDataLevel=x.ClinicalDataLevel,
ClinicalUploadType=x.ClinicalUploadType,
UploadRole=x.UploadRole,
FileName=x.FileName,
Path=x.Path,
TrialId= trialId,
var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().ToListAsync();
var systemIds = systemClinicalDataList.Select(x => x.Id).ToList();
var trialSystemIds = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && x.SystemClinicalDataSetId != null).Select(x => x.SystemClinicalDataSetId.Value).ToListAsync();
//var needUpdateIds = systemIds.Intersect(trialSystemIds).ToList();
var needAddids = systemIds.Except(trialSystemIds).ToList();
var systemDataList = systemClinicalDataList.Where(x => needAddids.Contains(x.Id)).ToList();
List<ClinicalDataTrialSet> dataSets = systemDataList.Select(x => new ClinicalDataTrialSet()
{
Id = NewId.NextGuid(),
SystemClinicalDataSetId = x.Id,
ClinicalDataSetName = x.ClinicalDataSetName,
ClinicalDataLevel = x.ClinicalDataLevel,
ClinicalUploadType = x.ClinicalUploadType,
UploadRole = x.UploadRole,
FileName = x.FileName,
Path = x.Path,
TrialId = trialId,
}).ToList();
await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets);
//var needUpdateitemList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && needUpdateIds.Contains(x.SystemClinicalDataSetId.Value)).ToListAsync();
//foreach (var item in needUpdateitemList)
//{
// var systemData = systemClinicalDataList.FirstOrDefault(x => x.Id == item.SystemClinicalDataSetId);
// await _clinicalDataTrialSetRepository.UpdatePartialNoQueryAsync(item.Id,x=>new ClinicalDataTrialSet() {
// ClinicalDataSetName = systemData.ClinicalDataSetName,
// ClinicalDataLevel = systemData.ClinicalDataLevel,
// ClinicalUploadType = systemData.ClinicalUploadType,
// UploadRole = systemData.UploadRole,
// FileName = systemData.FileName,
// Path = systemData.Path,
// });
//}
await _trialRepository.BatchUpdateNoTrackingAsync(x => x.Id == trialId, x => new Trial()
{
SyncClinicalDataTime = DateTime.Now,
});
var result = await _clinicalDataTrialSetRepository.SaveChangesAsync();
}).ToList();
}
await _clinicalDataTrialSetRepository.AddRangeAsync(dataSets);
//var needUpdateitemList = await _clinicalDataTrialSetRepository.Where(x => x.TrialId == trialId && needUpdateIds.Contains(x.SystemClinicalDataSetId.Value)).ToListAsync();
//foreach (var item in needUpdateitemList)
//{
// var systemData = systemClinicalDataList.FirstOrDefault(x => x.Id == item.SystemClinicalDataSetId);
// await _clinicalDataTrialSetRepository.UpdatePartialNoQueryAsync(item.Id,x=>new ClinicalDataTrialSet() {
// ClinicalDataSetName = systemData.ClinicalDataSetName,
// ClinicalDataLevel = systemData.ClinicalDataLevel,
// ClinicalUploadType = systemData.ClinicalUploadType,
// UploadRole = systemData.UploadRole,
// FileName = systemData.FileName,
// Path = systemData.Path,
// });
//}
var result= await _clinicalDataTrialSetRepository.SaveChangesAsync();
return ResponseOutput.Ok(result);
}
/// <summary>

6
IRaCIS.Core.Domain/Trial/Trial.cs
View File

@ -356,6 +356,12 @@ namespace IRaCIS.Core.Domain.Models
public bool IsReadingShowPreviousResults { get; set; } = false;
/// <summary>
/// 同步临床数据时间
/// </summary>
public DateTime? SyncClinicalDataTime { get; set; }
//public Guid? ReviewTypeId { get; set; } = Guid.Empty;
//[ForeignKey("ReviewTypeId")]