Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -286,6 +286,8 @@ namespace IRaCIS.Core.Application.Service
         public async Task<List<ReadingCustomTagDto>> GetCustomTag(GetCustomTagInDto inQuery)
         {
             var result = await _readingCustomTagRepository.Where(x => x.VisitTaskId == inQuery.VisitTaskId).ProjectTo<ReadingCustomTagDto>(_mapper.ConfigurationProvider).ToListAsync();
+
+             result.AddRange(await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inQuery.VisitTaskId).ProjectTo<ReadingCustomTagDto>(_mapper.ConfigurationProvider).ToListAsync());
             return result;
         }
 

IRaCIS.Core.Application/Service/Reading/_MapConfig.cs

@@ -79,6 +79,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<TrialDataFromSystem, ReadingMedicineTrialQuestion>().ForMember(dest => dest.CreateUserRole, opt => opt.Ignore());
 
             CreateMap<ReadingCustomTag, ReadingCustomTagDto>();
+            CreateMap<ReadingTaskQuestionMark, ReadingCustomTagDto>();
             CreateMap<ReadingCustomTagDto, ReadingCustomTag>().ForMember(dest => dest.CreateUserRole, opt => opt.Ignore());
 
             CreateMap<UserWLTemplate, UserWLTemplateView>();