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

修改

Browse Source
This commit is contained in:
he
2022-07-14 11:35:33 +08:00
parent db23c918cf
commit f09b2ade75
4 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
+4 -2
View File
@@ -338,7 +338,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public int ShowOrder { get; set; }
public int PageShowOrder { get; set; }
public int? PageShowOrder { get; set; }
/// <summary>
/// 父问题ID
@@ -359,9 +359,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// <summary>
/// 分页名称
/// </summary>
public string PageName { get; set; }
public string? PageName { get; set; }
public bool IsPublicPage { get; set; } = false;
/// <summary>
/// 标准分页Id
/// </summary>
IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs
+10 -3
View File
@@ -34,6 +34,7 @@ namespace IRaCIS.Application.Services
private readonly IReadingClinicalDataService _readingClinicalDataService;
private readonly IRepository<SubjectVisit> _subjectVisitRepository;
private readonly IRepository<Subject> _subjectRepository;
private readonly IRepository<ReadingCriterionPage> _readingCriterionPageRepository;
private readonly IRepository<ReadingJudgeInfo> _readingJudgeInfoRepository;
private readonly IRepository<ReadModule> _readModuleRepository;
private readonly IRepository<ReadingTaskQuestionAnswer> _readingTaskQuestionAnswerRepository;
@@ -50,6 +51,7 @@ namespace IRaCIS.Application.Services
IReadingClinicalDataService readingClinicalDataService,
IRepository<SubjectVisit> subjectVisitRepository,
IRepository<Subject> subjectRepository,
IRepository<ReadingCriterionPage> readingCriterionPageRepository,
IRepository<ReadingJudgeInfo> readingJudgeInfoRepository,
IRepository<ReadModule> readModuleRepository,
IRepository<ReadingTaskQuestionAnswer> readingTaskQuestionAnswerRepository,
@@ -65,6 +67,7 @@ namespace IRaCIS.Application.Services
this._readingClinicalDataService = readingClinicalDataService;
this._subjectVisitRepository = subjectVisitRepository;
this._subjectRepository = subjectRepository;
this._readingCriterionPageRepository = readingCriterionPageRepository;
this._readingJudgeInfoRepository = readingJudgeInfoRepository;
this._readModuleRepository = readModuleRepository;
this._readingTaskQuestionAnswerRepository = readingTaskQuestionAnswerRepository;
@@ -297,7 +300,10 @@ namespace IRaCIS.Application.Services
var readingTaskState = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.ReadingTaskState).FirstOrDefaultAsync();
var query= from data in _readingQuestionTrialRepository.Where(x => x.ReadingQuestionCriterionTrialId==inDto.ReadingQuestionCriterionTrialId)
join page in _readingCriterionPageRepository.AsQueryable() on data.ReadingCriterionPageId??default(Guid) equals page.Id into pageTemp
from leftpage in pageTemp.DefaultIfEmpty()
join questionAnswer in _readingTaskQuestionAnswerRepository.Where(x=>x.VisitTaskId==inDto.VisitTaskId) on data.Id equals questionAnswer.ReadingQuestionTrialId into questionAnswerTemp
from leftquestionAnswer in questionAnswerTemp.DefaultIfEmpty()
select new GetTrialReadingQuestionOutDto()
@@ -315,8 +321,9 @@ namespace IRaCIS.Application.Services
TypeValue=data.TypeValue,
Answer= leftquestionAnswer.Answer,
ReadingCriterionPageId=data.ReadingCriterionPageId,
PageName= data.ReadingCriterionPage.PageName,
PageShowOrder = data.ReadingCriterionPage.ShowOrder,
PageName= leftpage.PageName,
PageShowOrder = leftpage.ShowOrder,
IsPublicPage=leftpage.IsPublicPage,
};