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

Merge branch 'Test_IRC_Net8' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test_IRC_Net8

IRC_NewDev
hang 2024-03-04 16:36:18 +08:00
parent 352bd23766 398344854b
commit c3b62137d8
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Reading/Dto/ReadingMedicineQuestionViewModel.cs
View File

@ -92,12 +92,15 @@ namespace IRaCIS.Core.Application.ViewModel
public Guid SystemQuestionId { get; set; } public Guid SystemQuestionId { get; set; }
} }
public class AddDefaultQuestionsInDto public class AddDefaultQuestionsInDto
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
[NotDefault] [NotDefault]
public Guid TrialReadingCriterionId { get; set; } public Guid TrialReadingCriterionId { get; set; }
public bool IsEnglish { get; set; }
} }
public class AddTrialDataFromSystemInDto public class AddTrialDataFromSystemInDto

4
IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs
View File

@ -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(); 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
.WhereIf(_userInfo.IsEn_Us, x => x.LanguageType == LanguageType.English) .WhereIf(inDto.IsEnglish, x => x.LanguageType == LanguageType.English)
.WhereIf(!_userInfo.IsEn_Us, x => x.LanguageType == LanguageType.Chinese) .WhereIf(!inDto.IsEnglish, x => x.LanguageType == LanguageType.Chinese)
.Where(x => x.CriterionTypeEnum == criterionInfo.CriterionType && needAddCategory.Contains(x.ReadingCategory)) .Where(x => x.CriterionTypeEnum == criterionInfo.CriterionType && needAddCategory.Contains(x.ReadingCategory))
.Select(x => new TrialDataFromSystem() .Select(x => new TrialDataFromSystem()
{ {