Compare commits
No commits in common. "95fbe6085a86a2c6250839db9306a3edb53d19b4" and "8021d6a860c67e47f3de485b2985c3090078c989" have entirely different histories.
95fbe6085a
...
8021d6a860
|
@ -275,8 +275,7 @@ namespace IRaCIS.Application.Services
|
||||||
Path = x.ClinicalDataTrialSet.Path,
|
Path = x.ClinicalDataTrialSet.Path,
|
||||||
IsBlind = x.IsBlind,
|
IsBlind = x.IsBlind,
|
||||||
IsComplete = x.IsComplete,
|
IsComplete = x.IsComplete,
|
||||||
ClinicalFromList = x.Subject.ClinicalFormList.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
ClinicalFromList=x.Subject.ClinicalFormList.Where(y=>y.ReadingId==x.ReadingId&&y.ClinicalDataTrialSetId==x.ClinicalDataTrialSetId).Select(y=> new ClinicalFromData() {
|
||||||
{
|
|
||||||
CheckDate=y.CheckDate,
|
CheckDate=y.CheckDate,
|
||||||
ClinicalFormId=y.Id
|
ClinicalFormId=y.Id
|
||||||
}).ToList(),
|
}).ToList(),
|
||||||
|
@ -821,8 +820,7 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
var readingIds = result.Select(x => x.ReadingId).ToList();
|
var readingIds = result.Select(x => x.ReadingId).ToList();
|
||||||
var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId??default(Guid))).ToListAsync();
|
var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId??default(Guid))).ToListAsync();
|
||||||
result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x =>
|
result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
|
||||||
{
|
|
||||||
|
|
||||||
x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId&&y.ClinicalDataTrialSetId==x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId&&y.ClinicalDataTrialSetId==x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
||||||
{
|
{
|
||||||
|
@ -842,8 +840,7 @@ namespace IRaCIS.Application.Services
|
||||||
{
|
{
|
||||||
var moduleCriterionFromList = await _readModuleCriterionFromRepository
|
var moduleCriterionFromList = await _readModuleCriterionFromRepository
|
||||||
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.ClinicalDataTrialSetId)
|
||||||
.Where(x => x.ReadModuleId == readModule.Id).Select(x => new
|
.Where(x => x.ReadModuleId == readModule.Id).Select(x => new{
|
||||||
{
|
|
||||||
ClinicalFormId= x.ClinicalFormId,
|
ClinicalFormId= x.ClinicalFormId,
|
||||||
CheckDate= x.ClinicalForm.CheckDate,
|
CheckDate= x.ClinicalForm.CheckDate,
|
||||||
ClinicalDataTrialSetId= x.ClinicalForm.ClinicalDataTrialSetId
|
ClinicalDataTrialSetId= x.ClinicalForm.ClinicalDataTrialSetId
|
||||||
|
@ -997,8 +994,7 @@ namespace IRaCIS.Application.Services
|
||||||
|
|
||||||
var readingIds = result.Select(x => x.ReadingId).ToList();
|
var readingIds = result.Select(x => x.ReadingId).ToList();
|
||||||
var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
|
var clinical = await _clinicalFormRepository.Where(x => readingIds.Contains(x.ReadingId ?? default(Guid))).ToListAsync();
|
||||||
result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x =>
|
result.Where(x => x.ClinicalUploadType == ClinicalUploadType.Structuring).ForEach(x => {
|
||||||
{
|
|
||||||
|
|
||||||
x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
x.ClinicalFromList = clinical.Where(y => y.ReadingId == x.ReadingId && y.ClinicalDataTrialSetId == x.ClinicalDataTrialSetId).Select(y => new ClinicalFromData()
|
||||||
{
|
{
|
||||||
|
@ -1016,8 +1012,7 @@ namespace IRaCIS.Application.Services
|
||||||
var moduleCriterionFromList = await _readModuleCriterionFromRepository.Where(x => x.ReadModuleId == readModule.Id)
|
var moduleCriterionFromList = await _readModuleCriterionFromRepository.Where(x => x.ReadModuleId == readModule.Id)
|
||||||
|
|
||||||
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.TrialReadingCriterionId)
|
.WhereIf(inDto.ClinicalDataTrialSetId != null, x => x.ClinicalForm.ClinicalDataTrialSetId == inDto.TrialReadingCriterionId)
|
||||||
.Select(x => new
|
.Select(x => new {
|
||||||
{
|
|
||||||
ClinicalFormId = x.ClinicalFormId,
|
ClinicalFormId = x.ClinicalFormId,
|
||||||
CheckDate = x.ClinicalForm.CheckDate,
|
CheckDate = x.ClinicalForm.CheckDate,
|
||||||
ClinicalDataTrialSetId = x.ClinicalForm.ClinicalDataTrialSetId
|
ClinicalDataTrialSetId = x.ClinicalForm.ClinicalDataTrialSetId
|
||||||
|
|
Loading…
Reference in New Issue