From e181c3cc82cffe3c70fae8b907303afd34b0a00f Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Mon, 4 Mar 2024 16:01:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs | 5 ++++- .../Reading/MedicalAudit/ReadingMedicineQuestionService.cs | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs index 730a1fec2..763e4b7f9 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs @@ -92,12 +92,15 @@ namespace IRaCIS.Core.Application.ViewModel public Guid SystemQuestionId { get; set; } } - public class AddDefaultQuestionsInDto + + public class AddDefaultQuestionsInDto { public Guid TrialId { get; set; } [NotDefault] public Guid TrialReadingCriterionId { get; set; } + + public bool IsEnglish { get; set; } } public class AddTrialDataFromSystemInDto diff --git a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs index 31252ff65..4432c0499 100644 --- a/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs @@ -522,8 +522,8 @@ 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(); List needList = await _readingMedicineSystemQuestionRepository - .WhereIf(_userInfo.IsEn_Us, x => x.LanguageType == LanguageType.English) - .WhereIf(!_userInfo.IsEn_Us, x => x.LanguageType == LanguageType.Chinese) + .WhereIf(inDto.IsEnglish, x => x.LanguageType == LanguageType.English) + .WhereIf(!inDto.IsEnglish, x => x.LanguageType == LanguageType.Chinese) .Where(x => x.CriterionTypeEnum == criterionInfo.CriterionType && needAddCategory.Contains(x.ReadingCategory)) .Select(x => new TrialDataFromSystem() {