From b03901b4aa977c34694fc4206cb70a4194acb7dc Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 10 Jun 2022 17:14:11 +0800 Subject: [PATCH] =?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.API/IRaCIS.Core.API.xml | 2 +- .../IRaCIS.Core.Application.xml | 16 +---- .../Inspection/FrontAuditConfigService.cs | 65 ++++++++++--------- .../Common/Dto/SetDictionaryValueDto.cs | 4 +- 4 files changed, 40 insertions(+), 47 deletions(-) diff --git a/IRaCIS.Core.API/IRaCIS.Core.API.xml b/IRaCIS.Core.API/IRaCIS.Core.API.xml index 9fb3ecb04..22cd06cd8 100644 --- a/IRaCIS.Core.API/IRaCIS.Core.API.xml +++ b/IRaCIS.Core.API/IRaCIS.Core.API.xml @@ -136,7 +136,7 @@ - 影像阅片签名 + 影像阅片临床数据签名 diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 77eb69a60..09c97afb8 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -343,20 +343,6 @@ 数据集 - - - 翻译稽查数据 - - - - - - - 翻译稽查数据 - - 传入Dto - - 格式化日期和时间 @@ -3659,7 +3645,7 @@ - 设置影像阅片签名 + 影像阅片临床数据签名 diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 346cda09e..ef39e10b8 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -27,6 +27,7 @@ namespace IRaCIS.Core.Application.Service private readonly IRepository _frontAuditConfigRepository; private readonly IRepository _qCChallengeDialogRepository; + private readonly IRepository _dataInspectionRepository; private readonly IRepository _qCChallengeRepository; private readonly IRepository _dictionaryRepository; private readonly IRepository _trialRepository; @@ -34,6 +35,7 @@ namespace IRaCIS.Core.Application.Service public FrontAuditConfigService(IRepository frontAuditConfigRepository, IRepository qCChallengeDialogRepository, + IRepository dataInspectionRepository, IRepository qCChallengeRepository, IRepository dictionaryRepository, IRepository trialRepository, @@ -42,6 +44,7 @@ namespace IRaCIS.Core.Application.Service { _frontAuditConfigRepository = frontAuditConfigRepository; this._qCChallengeDialogRepository = qCChallengeDialogRepository; + this._dataInspectionRepository = dataInspectionRepository; this._qCChallengeRepository = qCChallengeRepository; this._dictionaryRepository = dictionaryRepository; this._trialRepository = trialRepository; @@ -172,39 +175,41 @@ namespace IRaCIS.Core.Application.Service await _frontAuditConfigRepository.AddRangeAsync(fronts); } - /// - /// 翻译稽查数据 - /// - /// - /// - [HttpPost] - public async Task> SetInspectionEnumValue(SetInspectionEnumValueDto dto) - { - return await SetInspectionEnumValueDataList(dto); - } + ///// + ///// 翻译稽查数据 + ///// + ///// + ///// + //[HttpPost] + //public async Task> SetInspectionEnumValue(SetInspectionEnumValueDto dto) + //{ + // return await SetInspectionEnumValueDataList(dto); + //} - /// - /// 翻译稽查数据 - /// - /// 传入Dto - /// - private async Task> SetInspectionEnumValueDataList(SetInspectionEnumValueDto dto) - { - var listIdentification = dto.Items.Select(x => x.Identification).ToList(); - foreach (var item in dto.Items) - { - if (item.Identification == string.Empty || item.Json == string.Empty) - { - continue; - } - item.Json = await GetInspectionEnumValue(listIdentification, item.Json); - item.Json = await SetEnum(dto.TrialId, listIdentification, item.Json); - item.Json = await SetDataInspectionDateType(listIdentification, item.Json); - } - return dto.Items.Select(x => x.Json).ToList(); - } + ///// + ///// 翻译稽查数据 + ///// + ///// 传入Dto + ///// + //private async Task> SetInspectionEnumValueDataList(SetInspectionEnumValueDto dto) + //{ + // var audits= _dataInspectionRepository.Where(x= dto.AuditDataIds.Contains(OfficeOpenXml=>)) + + // var listIdentification = dto.Items.Select(x => x.Identification).ToList(); + // foreach (var item in dto.Items) + // { + // if (item.Identification == string.Empty || item.Json == string.Empty) + // { + // continue; + // } + // item.Json = await GetInspectionEnumValue(listIdentification, item.Json); + // item.Json = await SetEnum(dto.TrialId, listIdentification, item.Json); + // item.Json = await SetDataInspectionDateType(listIdentification, item.Json); + // } + // return dto.Items.Select(x => x.Json).ToList(); + //} diff --git a/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs b/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs index 64cf1cd52..beaa51cfc 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/Dto/SetDictionaryValueDto.cs @@ -13,7 +13,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common.Dto [NotDefault] public Guid TrialId { get; set; } - public List Items { get; set; } + public List AuditDataIds { get; set; } + + }