From 02487d91ff3073a2293db6a7ef7a2fc146ca84c5 Mon Sep 17 00:00:00 2001 From: harid Date: Wed, 28 Jan 2026 13:27:25 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9B=E0=B8=A5=E0=B8=B5=E0=B9=88?= =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B9=80=E0=B8=AA=E0=B9=89=E0=B8=99=20api=20?= =?UTF-8?q?=E0=B8=AA=E0=B8=B3=E0=B8=AB=E0=B8=A3=E0=B8=B1=E0=B8=9A=E0=B9=80?= =?UTF-8?q?=E0=B8=81=E0=B9=87=E0=B8=9A=20logs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs | 6 ++++-- BMA.EHR.Leave/Controllers/LeaveReportController.cs | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs b/BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs index 57ff69dd..15c88592 100644 --- a/BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs +++ b/BMA.EHR.Domain/Middlewares/CombinedErrorHandlerAndLoggingMiddleware.cs @@ -483,7 +483,8 @@ namespace BMA.EHR.Domain.Middlewares { logType = logType, ip = (string)contextData.RemoteIpAddress, - rootId = pf?.RootId, + //rootId = pf?.RootId, + rootId = pf?.RootDnaId, systemName = SystemName, startTimeStamp = startTime.ToString("o"), endTimeStamp = endTime.ToString("o"), @@ -684,7 +685,8 @@ namespace BMA.EHR.Domain.Middlewares { try { - var apiPath = $"{_configuration["API"]}/org/dotnet/by-keycloak/{keycloakId}"; + //var apiPath = $"{_configuration["API"]}/org/dotnet/by-keycloak/{keycloakId}"; + var apiPath = $"{_configuration["API"]}/org/dotnet/user-logs/{keycloakId}"; var apiKey = _configuration["API_KEY"]; var apiResult = await GetExternalAPIAsync(apiPath, accessToken ?? "", apiKey); diff --git a/BMA.EHR.Leave/Controllers/LeaveReportController.cs b/BMA.EHR.Leave/Controllers/LeaveReportController.cs index eb59f663..e71b4780 100644 --- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs +++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs @@ -1248,7 +1248,7 @@ namespace BMA.EHR.Leave.Service.Controllers Type3 = "☐", approve = approveResult, approverComment = !string.IsNullOrEmpty(data.LeaveDirectorComment) - ? data.LeaveDirectorComment.Replace("\r", "").Replace("\n", "").Trim() + ? data.LeaveDirectorComment.Replace("\r", "").Replace("\n", "").Trim().ToThaiNumber() : "......................", approverUpdatedAt = data.LastUpdatedAt.HasValue ? data.LastUpdatedAt.Value.ToThaiShortDate().ToThaiNumber() @@ -2924,7 +2924,7 @@ namespace BMA.EHR.Leave.Service.Controllers ? new[] { (x.PosExecutiveName.ToThaiNumber()), (isCommission == false ? x!.OrganizationName : x!.OrganizationName.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.")).ToThaiNumber() } : new[] { (isCommission == false ? x!.OrganizationName : x!.OrganizationName.Replace("สำนักงานคณะกรรมการข้าราชการกรุงเทพมหานคร", "สำนักงาน ก.ก.")).ToThaiNumber() }, positionSign = !string.IsNullOrEmpty(x.PositionSign) - ? x.PositionSign.Replace("\r", "").Replace("\n", " ") + ? x.PositionSign.Replace("\r", "").Replace("\n", " ").ToThaiNumber() : "............................................", updatedAt = x.LastUpdatedAt.HasValue ? x.LastUpdatedAt.Value.Date.ToThaiShortDate().ToThaiNumber()