+11
-10
@@ -1,11 +1,11 @@
|
||||
using IRaCIS.Core.Domain.Share;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using IRaCIS.Core.Application.Contracts;
|
||||
using IRaCIS.Core.Application.Service.Reading.Dto;
|
||||
using IRaCIS.Core.Domain.Share;
|
||||
using IRaCIS.Core.Infra.EFCore.Common;
|
||||
using IRaCIS.Core.Application.Contracts;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Panda.DynamicWebApi.Attributes;
|
||||
|
||||
namespace IRaCIS.Application.Services
|
||||
namespace IRaCIS.Core.Application.Service
|
||||
{
|
||||
|
||||
/// <summary>
|
||||
@@ -63,7 +63,7 @@ namespace IRaCIS.Application.Services
|
||||
|
||||
var organIds = tableAnsweRowInfos.Where(x => x.OrganInfoId != null).Select(x => x.OrganInfoId).Distinct().ToList();
|
||||
var organList = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync();
|
||||
var result=await GetReadingTableQuestion(new GetReadingTableQuestionOrAnswerInDto()
|
||||
var result = await GetReadingTableQuestion(new GetReadingTableQuestionOrAnswerInDto()
|
||||
{
|
||||
|
||||
TrialReadingCriterionId = inDto.ReadingQuestionCriterionTrialId,
|
||||
@@ -114,7 +114,7 @@ namespace IRaCIS.Application.Services
|
||||
LesionType = data.LesionType,
|
||||
QuestionGenre = data.QuestionGenre,
|
||||
DictionaryCode = data.DictionaryCode,
|
||||
GroupId=data.GroupId,
|
||||
GroupId = data.GroupId,
|
||||
ShowOrder = data.ShowOrder,
|
||||
RelevanceId = data.RelevanceId,
|
||||
IsShowInDicom = data.IsShowInDicom,
|
||||
@@ -232,15 +232,16 @@ namespace IRaCIS.Application.Services
|
||||
|
||||
var questionIds = qusetionList.Select(x => x.Id).ToList();
|
||||
var tableQuestionList = await _readingTableQuestionSystemRepository.Where(x => questionIds.Contains(x.ReadingQuestionId))
|
||||
.ProjectTo<TableQuestionDataInfo>(_mapper.ConfigurationProvider,new {
|
||||
isEn_Us=_userInfo.IsEn_Us,
|
||||
.ProjectTo<TableQuestionDataInfo>(_mapper.ConfigurationProvider, new
|
||||
{
|
||||
isEn_Us = _userInfo.IsEn_Us,
|
||||
}).OrderBy(x => x.ShowOrder).ToListAsync();
|
||||
|
||||
var groupList = new List<GetSystemReadingQuestionOutDto>();
|
||||
|
||||
//qusetionList = qusetionList.Where(x => x.ParentId == null).ToList();
|
||||
|
||||
groupList = qusetionList.Where(x => x.Type == ReadingQestionType.Group ).ToList();
|
||||
groupList = qusetionList.Where(x => x.Type == ReadingQestionType.Group).ToList();
|
||||
groupList.ForEach(x =>
|
||||
{
|
||||
this.FindSystemChildQuestion(x, qusetionList, tableQuestionList);
|
||||
@@ -270,7 +271,7 @@ namespace IRaCIS.Application.Services
|
||||
Childrens = new List<GetSystemReadingQuestionOutDto>(),
|
||||
ShowOrder = x.ShowOrder,
|
||||
GroupName = string.Empty,
|
||||
|
||||
|
||||
Id = x.Id,
|
||||
Type = x.Type,
|
||||
DictionaryCode = x.DictionaryCode,
|
||||
|
||||
Reference in New Issue
Block a user