From 9a64755efa94f0105f7aafdc904bab1cfe4f8d6a Mon Sep 17 00:00:00 2001 From: Suphonchai Phoonsawat Date: Fri, 22 Dec 2023 20:54:17 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=A3=E0=B8=B2?= =?UTF-8?q?=E0=B8=A2=E0=B8=87=E0=B8=B2=E0=B8=99=E0=B8=AD=E0=B8=AD=E0=B8=81?= =?UTF-8?q?=E0=B8=84=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Commands/CommandReportRepository.cs | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index 7a249021..5a70540f 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -578,8 +578,8 @@ namespace BMA.EHR.Application.Repositories.Commands AuthorizedPosition = r.Command.AuthorizedPosition, CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", - PlacementCommandIssuer = r.Command.PlacementCommandIssuer, - PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(), + PlacementCommandIssuer = r.Command.PlacementCommandIssuer ?? "", + PlacementCommandNo = r.Command.PlacementCommandNo == null ? "" : r.Command.PlacementCommandNo.ToThaiNumber(), PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), Subject = $"เรื่อง {r.Command.CommandSubject}", }) @@ -614,8 +614,8 @@ namespace BMA.EHR.Application.Repositories.Commands AuthorizedPosition = r.Command.AuthorizedPosition, CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", - PlacementCommandIssuer = r.Command.PlacementCommandIssuer, - PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(), + PlacementCommandIssuer = r.Command.PlacementCommandIssuer ?? "", + PlacementCommandNo = r.Command.PlacementCommandNo == null ? "" : r.Command.PlacementCommandNo.ToThaiNumber(), PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), Subject = $"เรื่อง {r.Command.CommandSubject}", }) @@ -670,7 +670,7 @@ namespace BMA.EHR.Application.Repositories.Commands Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), ActiveDate = p.Date == null ? "" : p.Date.Value.ToThaiShortDate2().ToThaiNumber(), - ReceiveOrganizationName = r.Command!.ReceiveOrganizationName, + ReceiveOrganizationName = r.Command!.ReceiveOrganizationName ?? "", Reason = p.Reason ?? "" }) .ToList(); @@ -710,11 +710,11 @@ namespace BMA.EHR.Application.Repositories.Commands Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", - OldOc = p.OrganizationPositionOld, - OldPositionName = p.OrganizationPositionOld, - OldPositionLevel = p.PositionLevelOld, - OldPositionType = p.PositionTypeOld, - OldPositionNumber = p.PositionNumberOld.ToThaiNumber(), + OldOc = p.OrganizationPositionOld ?? "", + OldPositionName = p.OrganizationPositionOld ?? "", + OldPositionLevel = p.PositionLevelOld ?? "", + OldPositionType = p.PositionTypeOld ?? "", + OldPositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(), OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), NewOc = p.OrganizationPosition == null || p.OrganizationPosition!.Organization == null ? "" : _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, @@ -802,7 +802,7 @@ namespace BMA.EHR.Application.Repositories.Commands IssuerOrganizationName = r.Command.IssuerOrganizationName, AuthorizedUserFullName = r.Command.AuthorizedUserFullName, AuthorizedPosition = r.Command.AuthorizedPosition, - GovAidCommandNo = r.Command.GovAidCommandNo.ToThaiNumber(), + GovAidCommandNo = r.Command.GovAidCommandNo == null ? "" : r.Command.GovAidCommandNo.ToThaiNumber(), GovAidCommandDate = r.Command.GovAidCommandDate == null ? "" : r.Command.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), StartDate = p.Date == null ? "" : p.Date.Value.ToThaiFullDate3().ToThaiNumber(), @@ -847,10 +847,10 @@ namespace BMA.EHR.Application.Repositories.Commands CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, - Organization = p.OrganizationPositionOld, - PositionLevel = p.PositionLevelOld, - PositionType = p.PositionTypeOld, - PositionNumber = p.PositionNumberOld.ToThaiNumber(), + Organization = p.OrganizationPositionOld ?? "", + PositionLevel = p.PositionLevelOld ?? "", + PositionType = p.PositionTypeOld ?? "", + PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(), ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), @@ -899,17 +899,17 @@ namespace BMA.EHR.Application.Repositories.Commands CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, - Organization = p.OrganizationPositionOld, - PositionLevel = p.PositionLevelOld, - PositionType = p.PositionTypeOld, - PositionNumber = p.PositionNumberOld.ToThaiNumber(), + Organization = p.OrganizationPositionOld == null ? "" : p.OrganizationPositionOld, + PositionLevel = p.PositionLevelOld == null ? "" : p.PositionLevelOld, + PositionType = p.PositionTypeOld == null ? "" : p.PositionTypeOld, + PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(), Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), - Fault = r.Command.Fault.ToThaiNumber(), - GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(), - ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), + Fault = r.Command.Fault == null ? "" : r.Command.Fault.ToThaiNumber(), + GuiltyBasis = r.Command.GuiltyBasis == null ? "" : r.Command.GuiltyBasis.ToThaiNumber(), + ConclusionFireNo = r.Command.ConclusionFireNo == null ? "" : r.Command!.ConclusionFireNo.ToThaiNumber(), ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber(), + ConclusionFireResolution = r.Command.ConclusionFireResolution == null ? "" : r.Command.ConclusionFireResolution.ToThaiNumber(), Subject = $"เรื่อง {r.Command.CommandSubject}", }) .ToList(); @@ -954,17 +954,17 @@ namespace BMA.EHR.Application.Repositories.Commands CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, - Organization = p.OrganizationPositionOld, - PositionLevel = p.PositionLevelOld, - PositionType = p.PositionTypeOld, - PositionNumber = p.PositionNumberOld.ToThaiNumber(), + Organization = p.OrganizationPositionOld ?? "", + PositionLevel = p.PositionLevelOld ?? "", + PositionType = p.PositionTypeOld ?? "", + PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(), Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), //Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), - Fault = r.Command.Fault.ToThaiNumber(), - GuiltyBasis = r.Command.GuiltyBasis.ToThaiNumber(), - ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), + Fault = r.Command.Fault == null ? "" : r.Command.Fault.ToThaiNumber(), + GuiltyBasis = r.Command.GuiltyBasis == null ? "" : r.Command.GuiltyBasis.ToThaiNumber(), + ConclusionFireNo = r.Command.ConclusionFireNo == null ? "" : r.Command!.ConclusionFireNo.ToThaiNumber(), ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionFireResolution = r.Command.ConclusionFireResolution.ToThaiNumber(), + ConclusionFireResolution = r.Command.ConclusionFireResolution == null ? "" : r.Command.ConclusionFireResolution.ToThaiNumber(), Subject = $"เรื่อง {r.Command.CommandSubject}", }) .ToList(); @@ -1202,7 +1202,7 @@ namespace BMA.EHR.Application.Repositories.Commands PositionType = p.PositionTypeOld == null ? "" : p.PositionTypeOld.ToThaiNumber(), PositionNumber = p.PositionNumberOld == null ? "" : p.PositionNumberOld.ToThaiNumber(), Salary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), - RetireDate = p.ActiveDate.Value.ToThaiFullDate3().ToThaiNumber(), + RetireDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiFullDate3().ToThaiNumber(), CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), })