fix รายงานใบลา ข้อมูลแสดงในรายงานแสดงไม่ครบ #2184

2026-01-12 17:23:08 +07:00 · 2026-01-12 17:23:08 +07:00 · 90ea986831
commit 90ea986831
parent 1c3ce46bcb
2 changed files with 7 additions and 8 deletions
--- a/BMA.EHR.Leave/Controllers/LeaveReportController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveReportController.cs
@ -2618,10 +2618,9 @@ namespace BMA.EHR.Leave.Service.Controllers
                    updatedAt = x.LastUpdatedAt.HasValue
                        ? x.LastUpdatedAt.Value.Date.ToThaiShortDate().ToThaiNumber()
                        : "...... /...... /......",
-                    comment = (x.Comment ?? "")
-                        .Replace("\r", "")
-                        .Replace("\n", "")
-                        .Trim(),
+                    comment = !string.IsNullOrEmpty(x.Comment) 
+                        ? x.Comment.Replace("\r", "").Replace("\n", "").Trim() 
+                        : "......................",
                    approveType = (x.ApproveType ?? "").Trim().ToUpper()
                })
                .ToList();
--- a/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
+++ b/BMA.EHR.Leave/Controllers/LeaveRequestController.cs
@ -2027,10 +2027,10 @@ namespace BMA.EHR.Leave.Service.Controllers
                {
                    new LeaveRequestApprover
                    {
-                        Prefix = profile.Prefix,
-                        FirstName = profile.FirstName,
-                        LastName = profile.LastName,
-                        PositionName = profile.Position,
+                        Prefix = profile.Prefix ?? "",
+                        FirstName = profile.FirstName  ?? "",
+                        LastName = profile.LastName ?? "",
+                        PositionName = $"{profile.Position ?? ""}{profile.PositionLeaveName ?? ""}",
                        ProfileId = profile.Id,
                        KeycloakId = Guid.Parse(UserId!),
                        ApproveType = "SENDER",