Uat_Study
parent
f0612246f0
commit
4524e3eb87
|
@ -177,7 +177,7 @@ namespace IRaCIS.Core.Application.ViewModel
|
||||||
}
|
}
|
||||||
public class GetTrialOrganListInDto
|
public class GetTrialOrganListInDto
|
||||||
{
|
{
|
||||||
public Guid TrialId { get; set; }
|
public Guid TrialReadingCriterionId { get; set; }
|
||||||
|
|
||||||
|
|
||||||
public OrganType? OrganType { get; set; }
|
public OrganType? OrganType { get; set; }
|
||||||
|
|
|
@ -234,7 +234,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
if (inDto.LesionType != null)
|
if (inDto.LesionType != null)
|
||||||
{
|
{
|
||||||
var criterion = await _readingQuestionCriterionTrial.Where(x => x.TrialId == inDto.TrialId && x.IsConfirm).FirstOrDefaultAsync();
|
var criterion = await _readingQuestionCriterionTrial.Where(x => x.Id==inDto.TrialReadingCriterionId).FirstOrDefaultAsync();
|
||||||
organs = await _criterionNidusRepository.Where(x => x.CriterionId == (criterion==null?default(Guid): criterion.Id) && x.LesionType == inDto.LesionType)
|
organs = await _criterionNidusRepository.Where(x => x.CriterionId == (criterion==null?default(Guid): criterion.Id) && x.LesionType == inDto.LesionType)
|
||||||
.Select(x => x.OrganType).ToListAsync();
|
.Select(x => x.OrganType).ToListAsync();
|
||||||
}
|
}
|
||||||
|
@ -246,7 +246,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
|
join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
|
||||||
|
|
||||||
.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
|
.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable)
|
||||||
.Where(x => x.TrialId == inDto.TrialId)
|
.Where(x => x.TrialCriterionId == inDto.TrialReadingCriterionId)
|
||||||
on data.Id equals trialData.OrganInfoId
|
on data.Id equals trialData.OrganInfoId
|
||||||
select new GetTrialOrganListOutDto()
|
select new GetTrialOrganListOutDto()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue