diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index 059e074a..53ec25c6 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -1071,8 +1071,8 @@ namespace BMA.EHR.Application.Repositories.Commands CitizenId = r.CitizenId.ToThaiNumber(), FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Organization = p.OrgEmployee == null || p.OrgEmployee!.OrganizationAgency == null || p.OrgEmployee!.OrganizationAgency!.OrganizationOrganization == null ? "" : p.OrgEmployee!.OrganizationAgency!.OrganizationOrganization!.Name, - PositionName = p.OrgEmployee.PositionEmployeePosition == null ? "" : p.OrgEmployee.PositionEmployeePosition.Name.ToThaiNumber(), - PositionLevel = p.OrgEmployee.OrganizationPositionEmployeeLevels == null ? "" : p.OrgEmployee.OrganizationPositionEmployeeLevels.First().PositionEmployeeLevel.Name.ToThaiNumber(), + PositionName = p.OrgEmployee == null || p.OrgEmployee.PositionEmployeePosition == null ? "" : p.OrgEmployee.PositionEmployeePosition.Name.ToThaiNumber(), + PositionLevel = p.OrgEmployee == null || p.OrgEmployee.OrganizationPositionEmployeeLevels == null ? "" : p.OrgEmployee.OrganizationPositionEmployeeLevels.First().PositionEmployeeLevel.Name.ToThaiNumber(), PositionType = p.Profile.PositionType == null ? "" : p.Profile.PositionType.Name.ToThaiNumber(), PositionNumber = p.OrgEmployee.PosNo == null ? "" : p.OrgEmployee.PosNo.ToThaiNumber(), Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), @@ -1302,7 +1302,7 @@ namespace BMA.EHR.Application.Repositories.Commands Positionname = pf.Position == null ? "" : pf.Position.Name, Positionno = pf.PosNo == null ? "" : pf.PosNo.Name, Organizationname = pf.Oc == null ? "" : pf.Oc.Replace("/", " "), - Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + Salary = pf.Salaries == null || pf.Salaries.Count == 0 || pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount == null ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), }).FirstOrDefault(); return report_data; diff --git a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs index d5e69983..87151215 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandRepository.cs @@ -2909,7 +2909,7 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var oc = _dbContext.Set() @@ -2970,8 +2970,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; profile.Salaries.Add(salary); @@ -3186,7 +3186,7 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var oc = _dbContext.Set() @@ -3247,8 +3247,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; profile.Salaries.Add(salary); @@ -3440,7 +3440,7 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var oc = _dbContext.Set() @@ -3501,8 +3501,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; profile.Salaries.Add(salary); @@ -3694,7 +3694,7 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var oc = _dbContext.Set() @@ -3755,8 +3755,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; profile.Salaries.Add(salary); @@ -3948,7 +3948,7 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var oc = _dbContext.Set() @@ -4009,8 +4009,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; profile.Salaries.Add(salary); @@ -4220,7 +4220,7 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; @@ -4236,15 +4236,15 @@ namespace BMA.EHR.Application.Repositories.Commands SalaryClass = "", SalaryRef = "คำสั่งบรรจุและแต่งตั้งข้าราชการฯ กลับเข้ารับราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -4272,8 +4272,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; profile.Salaries.Add(salary); @@ -4472,7 +4472,7 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; //var oc = _dbContext.Set() @@ -4497,15 +4497,15 @@ namespace BMA.EHR.Application.Repositories.Commands SalaryClass = "", SalaryRef = "คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -4533,8 +4533,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; profile.Salaries.Add(salary); @@ -4670,28 +4670,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งแต่งตั้งคณะกรรมการประเมินผลการทดลองปฏิบัติหน้าที่ราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -4705,9 +4705,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -4719,8 +4719,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Salaries.Add(salary); @@ -4846,28 +4846,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งให้ข้าราชการที่มีผลการทดลองปฏิบัติหน้าที่ราชการไม่ต่ำกว่ามาตรฐานที่กำหนดรับราชการต่อไป คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -4881,9 +4881,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -4895,8 +4895,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Salaries.Add(salary); @@ -5025,28 +5025,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งให้ข้าราชการออกจากราชการเพราะผลการทดลองปฏิบัติหน้าที่ราชการต่ำกว่ามาตรฐานที่กำหนด คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -5060,9 +5060,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -5074,8 +5074,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Salaries.Add(salary); @@ -5214,28 +5214,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -5249,9 +5249,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -5263,8 +5263,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Profile.Salaries.Add(salary); @@ -5753,28 +5753,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งให้ช่วยราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -5788,9 +5788,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -5802,8 +5802,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Profile.Salaries.Add(salary); @@ -5934,28 +5934,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งส่งตัวกลับ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -5969,9 +5969,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -5983,8 +5983,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Profile.Salaries.Add(salary); @@ -6115,28 +6115,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -6150,9 +6150,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -6164,8 +6164,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Profile.Salaries.Add(salary); @@ -6304,28 +6304,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งให้ออกจากราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -6339,9 +6339,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -6353,8 +6353,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Profile.Salaries.Add(salary); @@ -6491,28 +6491,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งปลดออกจากราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -6526,9 +6526,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -6540,8 +6540,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Salaries.Add(salary); @@ -6692,28 +6692,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งไล่ออกจากราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -6727,9 +6727,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -6741,8 +6741,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Salaries.Add(salary); @@ -7279,27 +7279,27 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = data.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งให้ลูกจ้างออกจากราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -7313,9 +7313,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -7327,8 +7327,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; data.Profile.Salaries.Add(salary); @@ -7666,28 +7666,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = dataProfile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งพักจากราชการ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -7701,9 +7701,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -7715,8 +7715,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; dataProfile.Salaries.Add(salary); @@ -7864,28 +7864,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = dataProfile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งให้ออกจากราชการไว้ก่อน คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -7899,9 +7899,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -7913,8 +7913,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; dataProfile.Salaries.Add(salary); @@ -8062,28 +8062,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = dataProfile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งลงโทษ ภาคทัณฑ์ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -8097,9 +8097,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -8111,8 +8111,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; dataProfile.Salaries.Add(salary); @@ -8260,28 +8260,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = dataProfile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งลงโทษ ตัดเงินเดือน คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -8295,9 +8295,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -8309,8 +8309,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; dataProfile.Salaries.Add(salary); @@ -8458,28 +8458,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = dataProfile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งลงโทษ ลดขั้นเงินเดือน คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -8493,9 +8493,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -8507,8 +8507,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; dataProfile.Salaries.Add(salary); @@ -8656,28 +8656,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = dataProfile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งเพิ่มโทษ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -8691,9 +8691,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -8705,8 +8705,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; dataProfile.Salaries.Add(salary); @@ -8854,28 +8854,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = dataProfile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งงดโทษ คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -8889,9 +8889,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary == null ? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary == null ? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -8903,8 +8903,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; dataProfile.Salaries.Add(salary); @@ -9052,28 +9052,28 @@ namespace BMA.EHR.Application.Repositories.Commands var lastSarary = dataProfile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault(); var order = 1; - if (lastSarary.Order != null) + if (lastSarary != null && lastSarary.Order != null) order = lastSarary.Order.Value + 1; var salary = new ProfileSalary { Order = order, Date = command.CommandAffectDate, - Amount = lastSarary.Amount, - PositionSalaryAmount = lastSarary.PositionSalaryAmount, - MouthSalaryAmount = lastSarary.MouthSalaryAmount, + Amount = lastSarary == null ? null : lastSarary.Amount, + PositionSalaryAmount = lastSarary == null ? null : lastSarary.PositionSalaryAmount, + MouthSalaryAmount = lastSarary == null ? null : lastSarary.MouthSalaryAmount, SalaryClass = "", SalaryRef = "คำสั่งยุติเรื่อง คำสั่ง" + command.IssuerOrganizationName + "ที่ " + $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()} ลงวันที่ {command.CommandExcecuteDate!.Value.ToThaiFullDate3()}", - OcId = lastSarary.OcId, + OcId = lastSarary == null ? null : lastSarary.OcId, - PositionId = lastSarary.PositionId, + PositionId = lastSarary == null ? null : lastSarary.PositionId, - PositionLevel = lastSarary.PositionLevel, - PositionLineId = lastSarary.PositionLineId, - PositionTypeId = lastSarary.PositionTypeId, - OrganizationShortNameId = lastSarary.OrganizationShortNameId, - PosNoId = lastSarary.PosNoId, + PositionLevel = lastSarary == null ? null : lastSarary.PositionLevel, + PositionLineId = lastSarary == null ? null : lastSarary.PositionLineId, + PositionTypeId = lastSarary == null ? null : lastSarary.PositionTypeId, + OrganizationShortNameId = lastSarary == null ? null : lastSarary.OrganizationShortNameId, + PosNoId = lastSarary == null ? null : lastSarary.PosNoId, CommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", RefCommandNo = $"{command.CommandNo}/{command.CommandYear.ToInteger().ToThaiYear()}", @@ -9087,9 +9087,9 @@ namespace BMA.EHR.Application.Repositories.Commands PosNoEmployee = "", - //PositionPathSideId = lastSarary.PositionPathSideId == null, - PositionExecutiveId = lastSarary.PositionExecutiveId, - //PositionExecutiveSideId = lastSarary.PositionExecutiveSideId, + //PositionPathSideId = lastSarary ==null? null : lastSarary.PositionPathSideId == null, + PositionExecutiveId = lastSarary == null ? null : lastSarary.PositionExecutiveId, + //PositionExecutiveSideId = lastSarary ==null? null : lastSarary.PositionExecutiveSideId, IsActive = true, CreatedAt = DateTime.Now, @@ -9101,8 +9101,8 @@ namespace BMA.EHR.Application.Repositories.Commands }; - if (lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; - if (lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; + if (lastSarary != null && lastSarary.PositionPathSideId != null) salary.PositionPathSideId = lastSarary.PositionPathSideId; + if (lastSarary != null && lastSarary.PositionExecutiveSideId != null) salary.PositionExecutiveSideId = lastSarary.PositionExecutiveSideId; dataProfile.Salaries.Add(salary); diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs index a344ef87..327b2646 100644 --- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs @@ -71,9 +71,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = positionList, Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -190,9 +190,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = positionList, Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -309,9 +309,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = positionList, Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -428,9 +428,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = positionList, Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -546,11 +546,11 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionMeetingNo = raw_data.ConclusionMeetingNo.ToThaiNumber(), + ConclusionMeetingNo = raw_data.ConclusionMeetingNo == null ? "" : raw_data.ConclusionMeetingNo.ToThaiNumber(), ConclusionMeetingDate = raw_data.ConclusionMeetingDate == null ? "" : raw_data.ConclusionMeetingDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = positionList, Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -667,16 +667,16 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = positionList, Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), AuthorizedUserFullName = raw_data.AuthorizedUserFullName, AuthorizedPosition = raw_data.AuthorizedPosition, - ConclusionMeetingNo = raw_data.ConclusionMeetingNo.ToThaiNumber(), + ConclusionMeetingNo = raw_data.ConclusionMeetingNo == null ? "" : raw_data.ConclusionMeetingNo.ToThaiNumber(), ConclusionMeetingDate = raw_data.ConclusionMeetingDate == null ? "" : raw_data.ConclusionMeetingDate.Value.ToThaiFullDate3().ToThaiNumber(), Subject = $"เรื่อง {raw_data.CommandSubject}", }; @@ -788,9 +788,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = positionList, Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -907,16 +907,16 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), AuthorizedUserFullName = raw_data.AuthorizedUserFullName, AuthorizedPosition = raw_data.AuthorizedPosition, - ConclusionReturnNo = raw_data.ConclusionReturnNo.ToThaiNumber(), + ConclusionReturnNo = raw_data.ConclusionReturnNo == null ? "" : raw_data.ConclusionReturnNo.ToThaiNumber(), ConclusionReturnDate = raw_data.ConclusionReturnDate == null ? "" : raw_data.ConclusionReturnDate.Value.ToThaiFullDate3().ToThaiNumber(), Subject = $"เรื่อง {raw_data.CommandSubject}", }; @@ -1028,19 +1028,19 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), AuthorizedUserFullName = raw_data.AuthorizedUserFullName, AuthorizedPosition = raw_data.AuthorizedPosition, - ConclusionReturnNo = raw_data.ConclusionReturnNo.ToThaiNumber(), + ConclusionReturnNo = raw_data.ConclusionReturnNo == null ? "" : raw_data.ConclusionReturnNo.ToThaiNumber(), ConclusionReturnDate = raw_data.ConclusionReturnDate == null ? "" : raw_data.ConclusionReturnDate.Value.ToThaiFullDate3().ToThaiNumber(), SourceOrganizationName = raw_data.SourceOrganizationName, - MilitaryCommandNo = raw_data.MilitaryCommandNo.ToThaiNumber(), + MilitaryCommandNo = raw_data.MilitaryCommandNo == null ? "" : raw_data.MilitaryCommandNo.ToThaiNumber(), MilitaryCommanDate = raw_data.MilitaryCommanDate == null ? "" : raw_data.MilitaryCommanDate.Value.ToThaiFullDate3().ToThaiNumber(), Subject = $"เรื่อง {raw_data.CommandSubject}", }; @@ -1152,9 +1152,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -1163,7 +1163,7 @@ namespace BMA.EHR.Report.Service.Controllers AuthorizedPosition = raw_data.AuthorizedPosition, PlacementCommandIssuer = raw_data.PlacementCommandIssuer, - PlacementCommandNo = raw_data.PlacementCommandNo.ToThaiNumber(), + PlacementCommandNo = raw_data.PlacementCommandNo == null ? "" : raw_data.PlacementCommandNo.ToThaiNumber(), PlacementCommandDate = raw_data.PlacementCommandDate == null ? "" : raw_data.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), PlacementPositionName = raw_data.PlacementPositionName, PlacementOrganizationName = raw_data.PlacementOrganizationName, @@ -1326,9 +1326,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -1446,9 +1446,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -1456,7 +1456,7 @@ namespace BMA.EHR.Report.Service.Controllers AuthorizedUserFullName = raw_data.AuthorizedUserFullName, AuthorizedPosition = raw_data.AuthorizedPosition, TransferOrganizationName = raw_data.TransferOrganizationName, - ConclusionReceiveNo = raw_data.ConclusionReceiveNo.ToThaiNumber(), + ConclusionReceiveNo = raw_data.ConclusionReceiveNo == null ? "" : raw_data.ConclusionReceiveNo.ToThaiNumber(), ConclusionReceiveDate = raw_data.ConclusionReceiveDate == null ? "" : raw_data.ConclusionReceiveDate.Value.ToThaiFullDate3().ToThaiNumber(), Subject = $"เรื่อง {raw_data.CommandSubject}", }; @@ -1568,9 +1568,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -1758,9 +1758,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -1955,9 +1955,9 @@ namespace BMA.EHR.Report.Service.Controllers No = raw_data.CommandNo.ToThaiNumber(), Year = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), Issuerorganizationname = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -2048,9 +2048,9 @@ namespace BMA.EHR.Report.Service.Controllers No = raw_data.CommandNo.ToThaiNumber(), Year = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), Issuerorganizationname = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -2110,9 +2110,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -2305,9 +2305,9 @@ namespace BMA.EHR.Report.Service.Controllers CommandNo = raw_data.CommandNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(), @@ -2378,10 +2378,10 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { CommandNo = raw_data.CommandNo.ToThaiNumber(), - ConclusionTranferNo = raw_data.ConclusionTranferNo == null ? null : raw_data.ConclusionTranferNo.ToThaiNumber(), + ConclusionTranferNo = raw_data.ConclusionTranferNo == null ? "" : raw_data.ConclusionTranferNo.ToThaiNumber(), CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), // ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), // ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), @@ -2501,9 +2501,9 @@ namespace BMA.EHR.Report.Service.Controllers No = raw_data.CommandNo.ToThaiNumber(), Year = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), Issuerorganizationname = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo.ToThaiNumber(), + ConclusionRegisterNo = raw_data.ConclusionRegisterNo == null ? "" : raw_data.ConclusionRegisterNo.ToThaiNumber(), ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3().ToThaiNumber(), - ConclusionResultNo = raw_data.ConclusionResultNo.ToThaiNumber(), + ConclusionResultNo = raw_data.ConclusionResultNo == null ? "" : raw_data.ConclusionResultNo.ToThaiNumber(), ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3().ToThaiNumber(), PositionList = "", Count = raw_data.Receivers.Count.ToString().ToThaiNumber(),