代码修改
parent
e19c03412d
commit
b102d23477
|
@ -530,6 +530,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
var maxOrder = await _readingMedicineTrialQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId).OrderByDescending(x => x.ShowOrder).Select(x => x.ShowOrder).FirstOrDefaultAsync();
|
var maxOrder = await _readingMedicineTrialQuestionRepository.Where(x => x.TrialId == inDto.TrialId && x.TrialReadingCriterionId == inDto.TrialReadingCriterionId).OrderByDescending(x => x.ShowOrder).Select(x => x.ShowOrder).FirstOrDefaultAsync();
|
||||||
List<TrialDataFromSystem> needList = await _readingMedicineSystemQuestionRepository
|
List<TrialDataFromSystem> needList = await _readingMedicineSystemQuestionRepository
|
||||||
|
.Where(x=>x.IsEnable)
|
||||||
.Where(x=>x.LanguageType==inDto.LanguageType)
|
.Where(x=>x.LanguageType==inDto.LanguageType)
|
||||||
.Where(x =>needAddCategory.Contains(x.ReadingCategory) && x.CriterionTypeEnum == criterionInfo.CriterionType)
|
.Where(x =>needAddCategory.Contains(x.ReadingCategory) && x.CriterionTypeEnum == criterionInfo.CriterionType)
|
||||||
.Select(x => new TrialDataFromSystem()
|
.Select(x => new TrialDataFromSystem()
|
||||||
|
@ -554,6 +555,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
if (!needList.Any(x => x.ReadingCategory == item))
|
if (!needList.Any(x => x.ReadingCategory == item))
|
||||||
{
|
{
|
||||||
needList.AddRange(await _readingMedicineSystemQuestionRepository
|
needList.AddRange(await _readingMedicineSystemQuestionRepository
|
||||||
|
.Where(x => x.IsEnable)
|
||||||
.Where(x => x.LanguageType == inDto.LanguageType)
|
.Where(x => x.LanguageType == inDto.LanguageType)
|
||||||
.Where(x => x.ReadingCategory == item && x.IsGeneral)
|
.Where(x => x.ReadingCategory == item && x.IsGeneral)
|
||||||
.Select(x => new TrialDataFromSystem()
|
.Select(x => new TrialDataFromSystem()
|
||||||
|
@ -561,6 +563,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
ShowOrder = x.ShowOrder,
|
ShowOrder = x.ShowOrder,
|
||||||
IsEnable = x.IsEnable,
|
IsEnable = x.IsEnable,
|
||||||
|
|
||||||
LanguageType = x.LanguageType,
|
LanguageType = x.LanguageType,
|
||||||
IsRequired = x.IsRequired,
|
IsRequired = x.IsRequired,
|
||||||
QuestionName = x.QuestionName,
|
QuestionName = x.QuestionName,
|
||||||
|
|
Loading…
Reference in New Issue