From 55d3ea2c75d5946da6e2eed631c628fac16a0461 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 26 Apr 2022 13:42:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BD=AC=E5=8F=91=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IRaCIS.Core.Application.xml | 15 +++++++++++++++ .../Common/DTO/FrontAuditConfigViewModel.cs | 19 +++++++++++++++++++ .../Service/Common/FrontAuditConfigService.cs | 4 +++- .../Service/QC/QCOperationService.cs | 2 +- IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 18 ++++++++++++++++++ .../Repository/Repository.cs | 2 ++ 6 files changed, 58 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index c70940d38..fc0317acc 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -511,6 +511,21 @@ 字典Type + + + 外键Table + + + + + 外键Ke + + + + + 外键Text + + SystemAnonymizationView 列表视图模型 diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs index 65960e3ad..33c49b88d 100644 --- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs +++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs @@ -212,6 +212,25 @@ namespace IRaCIS.Core.Application.ViewModel public string DictionaryType { get; set; } = string.Empty; + /// + /// 外键Table + /// + + public string ForeignKeyTable { get; set; } = string.Empty; + + /// + /// 外键Ke + /// + + public string ForeignKeyValue { get; set; } = string.Empty; + + /// + ///外键Text + /// + + public string ForeignKeyText { get; set; } = string.Empty; + + } diff --git a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs index 41bc81d83..76e92273b 100644 --- a/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs @@ -195,7 +195,9 @@ namespace IRaCIS.Core.Application.Service DateType=data.DataType, DictionaryCode=data.DictionaryCode, DictionaryType=data.DictionaryType, - }; + + + }; query = query .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Value == iq.Value) diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs index 52dd73ce3..c8f3dbeae 100644 --- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs +++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs @@ -1933,7 +1933,7 @@ namespace IRaCIS.Core.Application.Image.QA SiteId = info.SiteId, SubjectId = info.SubjectId, SubjectVisitId = subjectVisitId, - Identification = "NaN-14-0" + Identification = "Edit|Visit|Status|Visit-Image Forward" }; var targetPath = "/IMPORT-IMAGES/" + info.TrialCode + "_" + info.SubjectCode + "_" + info.VisitName; diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs index 5443a38d7..a9b6856d0 100644 --- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs +++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs @@ -192,6 +192,24 @@ namespace IRaCIS.Core.Domain.Models public string DictionaryType { get; set; } + /// + /// 字典表 + /// + + public string ForeignKeyTable { get; set; } + + /// + /// 字典Value + /// + + public string ForeignKeyValue { get; set; } + + /// + /// 字典 + /// + + public string ForeignKeyText { get; set; } + } diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index 883f9c83a..b7b02fae3 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs @@ -544,6 +544,8 @@ namespace IRaCIS.Core.Infra.EFCore #region 稽查 + + /// /// 获取枚举 ///