From d8eb8f6982f00a4e640a88ecea8943a3ada11556 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 8 Feb 2023 13:14:00 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 7 +++++++ .../Service/Common/DictionaryService.cs | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 14457fbe..1e2ad3d4 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -9216,6 +9216,13 @@ 阅片问题.标准 + + + 测试获取 + + + + 获取自定义表格问题预览 diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index 553e0f35..08698469 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -236,7 +236,7 @@ namespace IRaCIS.Application.Services /// public async Task> GetBasicConfigSelect(string searchKey) { - var searchList = await _dicRepository.Where(t => t.ConfigDictionary.Code == searchKey && t.ParentId == null && t.IsEnable).ProjectTo(_mapper.ConfigurationProvider).OrderBy(x=>x.Code).ToListAsync(); + var searchList = await _dicRepository.Where(t => t.ConfigDictionary.Code == searchKey && t.ParentId == null && t.IsEnable).ProjectTo(_mapper.ConfigurationProvider).OrderBy(x=>x.ShowOrder).ToListAsync(); return searchList; } From eb72ae82e7015c9d34f79af5e360fc03a1f305d7 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 8 Feb 2023 14:25:07 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IRaCIS.Core.Application/IRaCIS.Core.Application.xml | 7 ------- .../Service/Common/DTO/DictionaryModel.cs | 3 +++ .../Service/Common/DictionaryService.cs | 11 ++++++++--- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 1e2ad3d4..14457fbe 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -9216,13 +9216,6 @@ 阅片问题.标准 - - - 测试获取 - - - - 获取自定义表格问题预览 diff --git a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs index 7b44a644..b4932a69 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/DictionaryModel.cs @@ -100,6 +100,9 @@ namespace IRaCIS.Application.Contracts public Guid Id { get; set; } public string Code { get; set; } = string.Empty; + public int Count { get; set; } + public int ShowOrder { get; set; } + public string Description { get; set; } = string.Empty; } diff --git a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs index 08698469..fd536c00 100644 --- a/IRaCIS.Core.Application/Service/Common/DictionaryService.cs +++ b/IRaCIS.Core.Application/Service/Common/DictionaryService.cs @@ -248,17 +248,22 @@ namespace IRaCIS.Application.Services public async Task> GetCriterionDictionaryList(GetCriterionDictionaryListInDto inDto) { var criterionCodes= await _systemCriterionDictionaryCodeRepository.Where(x => x.SystemCriterionId == inDto.SystemCriterionId).ToListAsync(); + + var parentCodes = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId== inDto.SystemCriterionId).Select(x => x.ParentCode).ToListAsync(); + + var codes = criterionCodes.Select(x=>x.Code).ToList(); - - var dictionaryList = await _dicRepository.Where(x => codes.Contains(x.Code)) + + var dictionaryList = await _dicRepository.Where(x => codes.Contains(x.Code) && x.ParentId == null) .OrderBy(x => x.ShowOrder).Select(x => new GetCriterionDictionaryListOutDto() { Code = x.Code, + ShowOrder = x.ShowOrder, Description = x.Description }).ToListAsync(); dictionaryList.ForEach(x => { - + x.Count = parentCodes.Count(y => y == x.Code); x.Id = criterionCodes.Where(y => y.Code == x.Code).Select(x => x.Id).FirstOrDefault(); }); From c930df41536e113ac85631c6628ce9632e228da1 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Wed, 8 Feb 2023 15:06:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/ReadingImageTask/ReadingImageTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 4b26c46f..61d0ea7d 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -1489,7 +1489,7 @@ namespace IRaCIS.Application.Services rowInfo.IsCurrentTaskAdd = isCurrentTaskAdd; rowInfo.NumberOfFrames = inDto.NumberOfFrames; rowInfo.FristAddTaskNum = taskinfo.VisitTaskNum; - rowInfo.FristAddTaskId = rowInfo.Id; + rowInfo.FristAddTaskId = inDto.VisitTaskId; rowInfo.PicturePath = inDto.PicturePath; rowInfo.RowIndex = inDto.RowIndex; rowInfo.OrganInfoId = inDto.OrganInfoId;