diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
index e5c46c3b..f64e8a6f 100644
--- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
+++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs
@@ -779,8 +779,8 @@ namespace BMA.EHR.Application.Repositories.Commands
                                        GovAidCommandNo = r.Command.GovAidCommandNo.ToThaiNumber(),
                                        GovAidCommandDate = r.Command.GovAidCommandDate == null ? "" :
                                                            r.Command.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(),
-                                       StartDate = "", // TODO: Frontend ไม่มีการเก็บค่าไว้ หรือไม่มีเก็บไว้จากระบบบรรจุ ทำให้ดึงมาแสดงไม่ได้
-                                       ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiFullDate3().ToThaiNumber(),
+                                       StartDate = p.Date == null ? "" : p.Date.Value.ToThaiFullDate3().ToThaiNumber(),
+                                       ActiveDate = p.DateRepatriation == null ? "" : p.DateRepatriation.Value.ToThaiFullDate3().ToThaiNumber(),
                                        FullName = $"{p.Profile.Prefix!.Name}{p.Profile.FirstName!} {p.Profile.LastName!}"
                                    })
                                    .ToList();