diff --git a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs index 078cc2bb..d6928de6 100644 --- a/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Reports/InsigniaReportRepository.cs @@ -479,7 +479,7 @@ namespace BMA.EHR.Application.Repositories.Reports DateTh = r.Date == null ? "-" : r.Date.Value.ToThaiShortDate().ToString().ToThaiNumber(), Position = p.Name, OCName = o.Parent == null ? "-" : (o.Parent.OrganizationOrganization == null ? "-" : o.Parent.OrganizationOrganization.Name), - Age = r.Date == null ? "-" : r.Date.Value.CalculateAgeStrV2(0, 0).ToThaiNumber(), + Age = r.Date == null ? "-" : r.Date.Value.CalculateBetweenDateV2(DateTime.Now).ToThaiNumber(), Amount = r.Amount == null ? null : r.Amount.Value.ToNumericText().ToThaiNumber(), Date = r.Date, }) diff --git a/BMA.EHR.Domain/Extensions/DoubleExtension.cs b/BMA.EHR.Domain/Extensions/DoubleExtension.cs index 9cd11d89..72a552d3 100644 --- a/BMA.EHR.Domain/Extensions/DoubleExtension.cs +++ b/BMA.EHR.Domain/Extensions/DoubleExtension.cs @@ -69,6 +69,10 @@ namespace BMA.EHR.Domain.Extensions { return number.ToString("#,##0.00"); } + public static string ToNumericNoDecimalText(this double number) + { + return number.ToString("#,##"); + } public static string ToReadText(this double value) {