diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs index 2ddd4c272..26693ce86 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/OrganInfoViewModel.cs @@ -131,6 +131,16 @@ namespace IRaCIS.Core.Application.ViewModel public bool IsEnable { get; set; } + /// + /// 病灶类型 + /// + public string NidusType { get; set; } + + /// + /// 病灶类型 + /// + public string NidusTypeCN { get; set; } + /// /// 备注 /// diff --git a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs index 04d9367ef..ae9ec5b58 100644 --- a/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs +++ b/IRaCIS.Core.Application/Service/Reading/OrganInfoService.cs @@ -174,6 +174,11 @@ namespace IRaCIS.Core.Application.Service join trialData in _organTrialInfoRepository.WhereIf(inDto.IsEnable != null, x => x.IsEnable == inDto.IsEnable) .Where(x => x.TrialId == inDto.TrialId) on data.Id equals trialData.OrganInfoId + + join criterionNidus in _criterionNidusRepository.AsQueryable() on trialData.CriterionNidusId equals criterionNidus.Id into criterionNidustemp + from leftcriterionNidus in criterionNidustemp.DefaultIfEmpty() + + select new GetTrialOrganListOutDto() { Id = trialData.Id, @@ -183,6 +188,8 @@ namespace IRaCIS.Core.Application.Service Remark= data.Remark, CriterionNidusId = data.CriterionNidusId, IsEnable= trialData.IsEnable, + NidusType= leftcriterionNidus.NidusType, + NidusTypeCN= leftcriterionNidus.NidusTypeCN, }; diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs index f4924cbc7..9606096cd 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingQuestionService.cs @@ -327,7 +327,7 @@ namespace IRaCIS.Application.Services }); - //var list + //var trial await _readingQuestionTrialRepository.SaveChangesAsync(); } }