diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
index 5e7ae76f..e94eb692 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
@@ -754,8 +754,9 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        Seq = r.Sequence.ToString().ToThaiNumber(),
                                        CitizenId = r.CitizenId,
                                        FullName = $"{r.Prefix}{r.FirstName} {r.LastName}",
-                                       PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name,
-                                       Organization = p.Organization,
+                                       PositionName = p.OrganizationPositionOld,
+                                       //    PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name,
+                                       Organization = p.Organization == null ? "" : p.Organization,
                                        StartDate = p.DateStart == null ? "" : p.DateStart.Value.ToThaiShortDate2().ToThaiNumber(),
                                        EndDate = p.DateEnd == null ? "" : p.DateEnd.Value.ToThaiShortDate2().ToThaiNumber(),
                                        Reason = p.Reason == null ? "" : p.Reason.ToThaiNumber()