diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs index aef9d951..c95a3c63 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalDataSetService.cs @@ -130,7 +130,7 @@ namespace IRaCIS.Application.Services private async Task AddTrialClinicalDataTrialSet(Guid trialId) { var syncClinicalDataTime = await _trialRepository.Where(x => x.Id == trialId).Select(x => x.SyncClinicalDataTime).FirstOrDefaultAsync(); - if (syncClinicalDataTime != null) + if (syncClinicalDataTime == null) { var systemClinicalDataList = await _clinicalDataSystemSetRepository.AsQueryable().ToListAsync(); var systemIds = systemClinicalDataList.Select(x => x.Id).ToList(); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs index 98dacfc8..edfdb6a1 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTaskService.cs @@ -315,12 +315,33 @@ namespace IRaCIS.Application.Services Answer= leftquestionAnswer.Answer }; + + var qusetionList =await query.OrderBy(x=>x.ShowOrder).ToListAsync(); - List groupList = qusetionList.Where(x => x.ParentId == null).ToList(); + + var groupList = qusetionList.Where(x => x.Type == "group").ToList(); + groupList.ForEach(x => { - this.FindChildQuestion(x, qusetionList); + x.Childrens = qusetionList.Where(y => y.GroupName == x.QuestionName && y.ParentId == null).ToList(); + + x.Childrens.ForEach(z => + { + this.FindChildQuestion(z, qusetionList); + }); + }); + + + + //List groupList = qusetionList.Where(x => x.ParentId == null).ToList(); + + + + //groupList.ForEach(x => + //{ + // this.FindChildQuestion(x, qusetionList); + //}); return (groupList, new { readingTaskState = readingTaskState diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs index f695157b..e84c71e6 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialConfigDTO.cs @@ -285,7 +285,16 @@ namespace IRaCIS.Core.Application.Contracts public string SignCode { get; set; } = string.Empty; } + public class GetReadingInfoOutDto + { + + } + public class GetReadingInfoInDto + { + [NotDefault] + public Guid TrialId { get; set; } + } public class SignConfirmDTO {