From 8b1d2f4c889f9656c4d7e9d07ba7f7fa0c1a5648 Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Thu, 28 Sep 2023 16:27:03 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=9F=E0=B8=B5?= =?UTF-8?q?=E0=B8=A5=E0=B8=94=E0=B9=8C=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=AA?= =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1=E0=B8=A7=E0=B8=81=E0=B8=A5?= =?UTF-8?q?=E0=B8=B1=E0=B8=9A=20=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1?= =?UTF-8?q?=E0=B9=88=E0=B8=87=E0=B8=AA=E0=B9=88=E0=B8=87=E0=B8=95=E0=B8=B1?= =?UTF-8?q?=E0=B8=A7=E0=B8=81=E0=B8=A5=E0=B8=B1=E0=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Repositories/Commands/CommandReportRepository.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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();