diff --git a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs index ee25953e..07026e48 100644 --- a/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs +++ b/BMA.EHR.Insignia/Controllers/InsigniaRequestController.cs @@ -2317,26 +2317,28 @@ namespace BMA.EHR.Insignia.Service.Controllers var row = 2; foreach (var item in requestProfiles) { - workSheet.Cells[row, 1].Value = item.Root; - workSheet.Cells[row, 2].Value = item.CitizenId; + workSheet.Cells[row, 1].Value = item.Root == null ? "-" : item.Root; + workSheet.Cells[row, 2].Value = item.CitizenId == null ? "-" : item.CitizenId; workSheet.Cells[row, 3].Value = item.Prefix == null ? "-" : ((item.Prefix == "นาย" || item.Prefix == "นาง" || item.Prefix == "นางสาว") ? item.Prefix : "-"); workSheet.Cells[row, 4].Value = item.Prefix == null ? "-" : ((item.Prefix == "นาย" || item.Prefix == "นาง" || item.Prefix == "นางสาว") ? "-" : item.Prefix); - workSheet.Cells[row, 5].Value = item.FirstName; - workSheet.Cells[row, 6].Value = item.LastName; + workSheet.Cells[row, 5].Value = item.FirstName == null ? "-" : item.FirstName; + workSheet.Cells[row, 6].Value = item.LastName == null ? "-" : item.LastName; workSheet.Cells[row, 7].Value = item.Gender == null ? "-" : item.Gender; - workSheet.Cells[row, 8].Value = item.BirthDate == null ? "" : item.BirthDate.Value.ToThaiDate(); - workSheet.Cells[row, 9].Value = item.DateAppoint == null ? "" : item.DateAppoint.Value.ToThaiDate(); - workSheet.Cells[row, 12].Value = ""; - workSheet.Cells[row, 13].Value = item.PosLevelName == null ? "" : item.PosLevelName; - workSheet.Cells[row, 14].Value = ""; - workSheet.Cells[row, 15].Value = null; - workSheet.Cells[row, 16].Value = item.Position ?? ""; + workSheet.Cells[row, 8].Value = item.BirthDate == null ? "-" : item.BirthDate.Value.ToThaiDate(); + workSheet.Cells[row, 9].Value = item.DateAppoint == null ? "-" : item.DateAppoint.Value.ToThaiDate(); + workSheet.Cells[row, 10].Value = "-"; + workSheet.Cells[row, 11].Value = "-"; + workSheet.Cells[row, 12].Value = "-"; + workSheet.Cells[row, 13].Value = item.PosLevelName == null ? "-" : item.PosLevelName; + workSheet.Cells[row, 14].Value = "-"; + workSheet.Cells[row, 15].Value = "-"; + workSheet.Cells[row, 16].Value = item.Position == null ? "-" : item.Position; workSheet.Cells[row, 17].Value = item.Amount == null ? 0 : item.Amount; - workSheet.Cells[row, 18].Value = null; + workSheet.Cells[row, 18].Value = "-"; workSheet.Cells[row, 19].Value = item.PositionSalaryAmount == null ? 0 : item.PositionSalaryAmount; - workSheet.Cells[row, 20].Value = item.LastInsigniaName; - workSheet.Cells[row, 21].Value = ""; - workSheet.Cells[row, 22].Value = null; + workSheet.Cells[row, 20].Value = item.LastInsigniaName == null ? "-" : item.LastInsigniaName; + workSheet.Cells[row, 21].Value = "-"; + workSheet.Cells[row, 22].Value = "-"; row++; } excel.Save();