From 64c275a91c5b7ba08fd3198728a76d4f22745ec0 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Sun, 27 Apr 2025 10:18:31 +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 --- .../MRECISTHCCCalculateService.cs | 1 + IRaCIS.Core.Infra.EFCore/AuthUser/IUserInfo.cs | 5 +++++ IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs | 17 ++++++++++++----- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs index 8a11bd992..c3f7fc5b4 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs @@ -805,6 +805,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate x.DoctorUserId==taskinfo.DoctorUserId).FirstOrDefaultAsync(); if (recistTask != null) { + _userInfo.AuditIdentification = "HCC"; var trialReadingCriterion=await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).FirstOrDefaultAsync(); diff --git a/IRaCIS.Core.Infra.EFCore/AuthUser/IUserInfo.cs b/IRaCIS.Core.Infra.EFCore/AuthUser/IUserInfo.cs index e9434387f..d5935d293 100644 --- a/IRaCIS.Core.Infra.EFCore/AuthUser/IUserInfo.cs +++ b/IRaCIS.Core.Infra.EFCore/AuthUser/IUserInfo.cs @@ -43,6 +43,11 @@ Guid? BatchId { get; set; } + /// + /// 稽查额外字符串 + /// + string? AuditIdentification { get; set; } + bool IsNotNeedInspection { get; set; } diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 5a2278572..44b123a71 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -3910,18 +3910,18 @@ namespace IRaCIS.Core.Infra.EFCore.Common //{ // entityTypeName = "New/" + "UserSigned"; //} - + string result = string.Empty; //默认规则 if (IsDistinctionInterface) { //自定义 标识后面 补充由代码上层的 extraIdentification 附加 if (isSelfDefine) { - return $"{_userInfo.RequestUrl}/{entityTypeName}"; + result= $"{_userInfo.RequestUrl}/{entityTypeName}"; } else { - return $"{_userInfo.RequestUrl}/{entityTypeName}/{type}"; + result= $"{_userInfo.RequestUrl}/{entityTypeName}/{type}"; } @@ -3931,15 +3931,22 @@ namespace IRaCIS.Core.Infra.EFCore.Common //自定义 标识后面 补充由代码上层的 extraIdentification 附加 if (isSelfDefine) { - return $"{entityTypeName}"; + result = $"{entityTypeName}"; } else { - return $"{entityTypeName}/{type}"; + result = $"{entityTypeName}/{type}"; } } + if (_userInfo.AuditIdentification != null) + { + result = result + "/" + _userInfo.AuditIdentification; + } + + return result; + }