diff --git a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs index 18c794f7..80b38749 100644 --- a/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs +++ b/BMA.EHR.Application/Repositories/Commands/CommandReportRepository.cs @@ -78,23 +78,25 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PositionNumber) .Include(x => x.PositionType) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType01Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, - FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", + FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Oc = _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), PositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, PositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, PositionType = p.PositionType == null ? "" : p.PositionType.Name, - PositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - Salary = p.Amount == null ? 0 : p.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3(), - ExamNumber = p.ExamNumber == null ? 0 : p.ExamNumber.Value, - PlacementName = $"{p.Placement.Name} ครั้งที่ {p.Placement.Round}/{p.Placement.Year.ToThaiYear()}" + PositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + Salary = p.Amount == null ? "0" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(), + ExamNumber = p.ExamNumber == null ? "0" : p.ExamNumber.Value.ToString().ToThaiNumber(), + PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}" }).ToList(); return report_data; - + } catch { @@ -125,19 +127,21 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PositionNumber) .Include(x => x.PositionType) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType01Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Oc = _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), PositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, PositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, PositionType = p.PositionType == null ? "" : p.PositionType.Name, - PositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - Salary = p.Amount == null ? 0 : p.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3(), - ExamNumber = p.ExamNumber == null ? 0 : p.ExamNumber.Value, - PlacementName = $"{p.Placement.Name} ครั้งที่ {p.Placement.Round}/{p.Placement.Year.ToThaiYear()}" + PositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + Salary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber(), + ExamNumber = p.ExamNumber == null ? "" : p.ExamNumber.Value.ToString().ToThaiNumber(), + PlacementName = $"{p.Placement.Name.ToThaiNumber()} ครั้งที่ {p.Placement.Round.ToThaiNumber()}/{p.Placement.Year.ToThaiYear().ToString().ToThaiNumber()}" }).ToList(); return report_data; @@ -177,23 +181,25 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PosNo) .Include(x => x.Salaries) on r.CitizenId equals pf.CitizenId + orderby r.Sequence select new CommandType03Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", OldOc = pf.Oc == null ? "" : pf.Oc.Replace("/", " "), OldPositionName = pf.Position == null ? "" : pf.Position.Name, OldPositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, OldPositionType = pf.PositionType == null ? "" : pf.PositionType.Name, - OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name, - OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? 0 : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(), + OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewOc = _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, NewPositionType = p.PositionType == null ? "" : p.PositionType.Name, - NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - NewSalary = p.Amount == null ? 0 : p.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3() + NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber() }) .ToList(); @@ -234,23 +240,25 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PosNo) .Include(x => x.Salaries) on r.CitizenId equals pf.CitizenId + orderby r.Sequence select new CommandType03Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", OldOc = pf.Oc == null ? "" : pf.Oc.Replace("/", " "), OldPositionName = pf.Position == null ? "" : pf.Position.Name, OldPositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, OldPositionType = pf.PositionType == null ? "" : pf.PositionType.Name, - OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name, - OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? 0 : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(), + OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewOc = _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, NewPositionType = p.PositionType == null ? "" : p.PositionType.Name, - NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - NewSalary = p.Amount == null ? 0 : p.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3() + NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + NewSalary = p.Amount == null ? 0 : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber() }) .ToList(); @@ -291,23 +299,25 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PosNo) .Include(x => x.Salaries) on r.CitizenId equals pf.CitizenId + orderby r.Sequence select new CommandType03Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", OldOc = pf.Oc == null ? "" : pf.Oc.Replace("/", " "), OldPositionName = pf.Position == null ? "" : pf.Position.Name, OldPositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, OldPositionType = pf.PositionType == null ? "" : pf.PositionType.Name, - OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name, - OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? 0 : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(), + OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewOc = _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, NewPositionType = p.PositionType == null ? "" : p.PositionType.Name, - NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - NewSalary = r.Amount == null ? 0 : r.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3() + NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber() }) .ToList(); @@ -348,23 +358,25 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PosNo) .Include(x => x.Salaries) on r.CitizenId equals pf.CitizenId + orderby r.Sequence select new CommandType03Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", OldOc = pf.Oc == null ? "" : pf.Oc.Replace("/", " "), OldPositionName = pf.Position == null ? "" : pf.Position.Name, OldPositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, OldPositionType = pf.PositionType == null ? "" : pf.PositionType.Name, - OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name, - OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? 0 : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + OldPositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(), + OldSalary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewOc = _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, NewPositionType = p.PositionType == null ? "" : p.PositionType.Name, - NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - NewSalary = r.Amount == null ? 0 : r.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3() + NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber() }) .ToList(); @@ -409,23 +421,25 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PositionNumber) .Include(x => x.PositionType) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType03Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", OldOc = p.Profile.Oc == null ? "" : p.Profile.Oc.Replace("/", " "), OldPositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, OldPositionLevel = p.Profile.PositionLevel == null ? "" : p.Profile.PositionLevel.Name, OldPositionType = p.Profile.PositionType == null ? "" : p.Profile.PositionType.Name, - OldPositionNumber = p.Profile.PosNo == null ? "" : p.Profile.PosNo.Name, - OldSalary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? 0 : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + OldPositionNumber = p.Profile.PosNo == null ? "" : p.Profile.PosNo.Name.ToThaiNumber(), + OldSalary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewOc = p.OrganizationPosition == null ? "" : _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, NewPositionType = p.PositionType == null ? "" : p.PositionType.Name, - NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - NewSalary = p.Amount == null ? 0 : p.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3() + NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + NewSalary = p.Amount == null ? "" : p.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber() }) .ToList(); @@ -470,23 +484,25 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PositionNumber) .Include(x => x.PositionType) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType03Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", OldOc = p.Profile.Oc == null ? "" : p.Profile.Oc.Replace("/", " "), OldPositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, OldPositionLevel = p.Profile.PositionLevel == null ? "" : p.Profile.PositionLevel.Name, OldPositionType = p.Profile.PositionType == null ? "" : p.Profile.PositionType.Name, - OldPositionNumber = p.Profile.PosNo == null ? "" : p.Profile.PosNo.Name, - OldSalary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? 0 : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + OldPositionNumber = p.Profile.PosNo == null ? "" : p.Profile.PosNo.Name.ToThaiNumber(), + OldSalary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), NewOc = p.OrganizationPosition == null ? "" : _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, NewPositionType = p.PositionType == null ? "" : p.PositionType.Name, - NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - NewSalary = r.Amount == null ? 0 : r.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3() + NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber() }) .ToList(); @@ -507,17 +523,17 @@ namespace BMA.EHR.Application.Repositories.Commands .Where(c => c.Command.Id == id) .Select(r => new CommandType11Response { - CommandNo = r.Command.CommandNo, - CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString(), - CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3(), + CommandNo = r.Command.CommandNo.ToThaiNumber(), + CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), + CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), IssuerOrganizationName = r.Command.IssuerOrganizationName, AuthorizedUserFullName = r.Command.AuthorizedUserFullName, AuthorizedPosition = r.Command.AuthorizedPosition, CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PlacementCommandIssuer = r.Command.PlacementCommandIssuer, - PlacementCommandNo = r.Command.PlacementCommandNo, - PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3() + PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(), + PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber() }) .ToListAsync(); if (raw_data == null) @@ -542,17 +558,17 @@ namespace BMA.EHR.Application.Repositories.Commands .Where(c => c.Command.Id == id) .Select(r => new CommandType11Response { - CommandNo = r.Command.CommandNo, - CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString(), - CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3(), + CommandNo = r.Command.CommandNo.ToThaiNumber(), + CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), + CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), IssuerOrganizationName = r.Command.IssuerOrganizationName, AuthorizedUserFullName = r.Command.AuthorizedUserFullName, AuthorizedPosition = r.Command.AuthorizedPosition, CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PlacementCommandIssuer = r.Command.PlacementCommandIssuer, - PlacementCommandNo = r.Command.PlacementCommandNo, - PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3() + PlacementCommandNo = r.Command.PlacementCommandNo.ToThaiNumber(), + PlacementCommandDate = r.Command.PlacementCommandDate == null ? "" : r.Command.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber() }) .ToListAsync(); if (raw_data == null) @@ -591,16 +607,18 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PosNo) .Include(x => x.Salaries) on r.CitizenId equals pf.CitizenId + orderby r.Sequence select new CommandType13Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Organization = pf.Oc == null ? "" : pf.Oc.Replace("/", " "), PositionName = pf.Position == null ? "" : pf.Position.Name, PositionLevel = pf.PositionLevel == null ? "" : pf.PositionLevel.Name, PositionType = pf.PositionType == null ? "" : pf.PositionType.Name, - PositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name, - Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? 0 : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + PositionNumber = pf.PosNo == null ? "" : pf.PosNo.Name.ToThaiNumber(), + Salary = pf.Salaries == null || pf.Salaries.Count == 0 ? "" : pf.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), ActiveDate = "", ReceiveOrganizationName = r.Command!.ReceiveOrganizationName }) @@ -634,23 +652,25 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.PositionNumber) .Include(x => x.PositionType) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType03Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", OldOc = p.OrganizationPositionOld, OldPositionName = p.OrganizationPositionOld, OldPositionLevel = p.PositionLevelOld, OldPositionType = p.PositionTypeOld, - OldPositionNumber = p.PositionNumberOld, - OldSalary = p.AmountOld == null ? 0 : p.AmountOld.Value, + OldPositionNumber = p.PositionNumberOld.ToThaiNumber(), + OldSalary = p.AmountOld == null ? "" : p.AmountOld.Value.ToNumericNoDecimalText().ToThaiNumber(), NewOc = _organizationCommonRepository.GetOrganizationNameFullPath(p.OrganizationPosition!.Organization!.Id, false, false, "/"), NewPositionName = p.PositionPath == null ? "" : p.PositionPath!.Name, NewPositionLevel = p.PositionLevel == null ? "" : p.PositionLevel.Name, NewPositionType = p.PositionType == null ? "" : p.PositionType.Name, - NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name, - NewSalary = r.Amount == null ? 0 : r.Amount.Value, - AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiFullDate3() + NewPositionNumber = p.PositionNumber == null ? "" : p.PositionNumber.Name.ToThaiNumber(), + NewSalary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + AppointDate = p.RecruitDate == null ? "" : p.RecruitDate.Value.ToThaiShortDate2().ToThaiNumber() }) .ToList(); @@ -675,14 +695,16 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(p => p.Profile) .ThenInclude(p => p.Position) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType15Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, Organization = p.Organization, - StartDate = p.DateStart == null ? "" : p.DateStart.Value.ToThaiFullDate3(), - EndDate = p.DateEnd == null ? "" : p.DateEnd.Value.ToThaiFullDate3(), + StartDate = p.DateStart == null ? "" : p.DateStart.Value.ToThaiShortDate2().ToThaiNumber(), + EndDate = p.DateEnd == null ? "" : p.DateEnd.Value.ToThaiShortDate2().ToThaiNumber(), }) .ToList(); @@ -714,17 +736,19 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(p => p.Profile) .ThenInclude(p => p.Salaries) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType17Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, Organization = p.OrganizationPositionOld, PositionLevel = p.PositionLevelOld, PositionType = p.PositionTypeOld, - PositionNumber = p.PositionNumberOld, - ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiFullDate3(), - Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? 0 : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + PositionNumber = p.PositionNumberOld.ToThaiNumber(), + ActiveDate = p.ActiveDate == null ? "" : p.ActiveDate.Value.ToThaiShortDate2().ToThaiNumber(), + Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Remark = p.Reason ?? "" }) .ToList(); @@ -757,11 +781,12 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(p => p.Profile) .ThenInclude(p => p.Salaries) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType18Response { - CommandNo = r.Command.CommandNo, - CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString(), - CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3(), + CommandNo = r.Command.CommandNo.ToThaiNumber(), + CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), + CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), IssuerOrganizationName = r.Command.IssuerOrganizationName, AuthorizedUserFullName = r.Command.AuthorizedUserFullName, AuthorizedPosition = r.Command.AuthorizedPosition, @@ -771,12 +796,12 @@ namespace BMA.EHR.Application.Repositories.Commands Organization = p.OrganizationPositionOld, PositionLevel = p.PositionLevelOld, PositionType = p.PositionTypeOld, - PositionNumber = p.PositionNumberOld, - Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? 0 : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + PositionNumber = p.PositionNumberOld.ToThaiNumber(), + Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Fault = r.Command.Fault, GuiltyBasis = r.Command.GuiltyBasis, - ConclusionFireNo = r.Command!.ConclusionFireNo, - ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3(), + ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), + ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), ConclusionFireResolution = r.Command.ConclusionFireResolution }) .ToList(); @@ -809,11 +834,12 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(p => p.Profile) .ThenInclude(p => p.Salaries) on r.RefPlacementProfileId equals p.Id + orderby r.Sequence select new CommandType18Response { - CommandNo = r.Command.CommandNo, - CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString(), - CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3(), + CommandNo = r.Command.CommandNo.ToThaiNumber(), + CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), + CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), IssuerOrganizationName = r.Command.IssuerOrganizationName, AuthorizedUserFullName = r.Command.AuthorizedUserFullName, AuthorizedPosition = r.Command.AuthorizedPosition, @@ -823,12 +849,12 @@ namespace BMA.EHR.Application.Repositories.Commands Organization = p.OrganizationPositionOld, PositionLevel = p.PositionLevelOld, PositionType = p.PositionTypeOld, - PositionNumber = p.PositionNumberOld, - Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? 0 : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + PositionNumber = p.PositionNumberOld.ToThaiNumber(), + Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Fault = r.Command.Fault, GuiltyBasis = r.Command.GuiltyBasis, - ConclusionFireNo = r.Command!.ConclusionFireNo, - ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3(), + ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), + ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), ConclusionFireResolution = r.Command.ConclusionFireResolution }) .ToList(); @@ -863,9 +889,9 @@ namespace BMA.EHR.Application.Repositories.Commands on r.RefPlacementProfileId equals p.Id select new CommandType18Response { - CommandNo = r.Command.CommandNo, - CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString(), - CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3(), + CommandNo = r.Command.CommandNo.ToThaiNumber(), + CommandYear = r.Command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), + CommandAffectDate = r.Command.CommandAffectDate == null ? "" : r.Command.CommandAffectDate.Value.ToThaiFullDate3().ToThaiNumber(), IssuerOrganizationName = r.Command.IssuerOrganizationName, AuthorizedUserFullName = r.Command.AuthorizedUserFullName, AuthorizedPosition = r.Command.AuthorizedPosition, @@ -875,12 +901,12 @@ namespace BMA.EHR.Application.Repositories.Commands Organization = p.OrganizationPositionOld, PositionLevel = p.PositionLevelOld, PositionType = p.PositionTypeOld, - PositionNumber = p.PositionNumberOld, - Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? 0 : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value, + PositionNumber = p.PositionNumberOld.ToThaiNumber(), + Salary = p.Profile.Salaries == null || p.Profile.Salaries.Count == 0 ? "" : p.Profile.Salaries.OrderByDescending(x => x.Order).FirstOrDefault().Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), Fault = r.Command.Fault, GuiltyBasis = r.Command.GuiltyBasis, - ConclusionFireNo = r.Command!.ConclusionFireNo, - ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3(), + ConclusionFireNo = r.Command!.ConclusionFireNo.ToThaiNumber(), + ConclusionFireDate = r.Command.ConclusionFireDate == null ? "" : r.Command.ConclusionFireDate.Value.ToThaiFullDate3().ToThaiNumber(), ConclusionFireResolution = r.Command.ConclusionFireResolution }) .ToList(); @@ -917,18 +943,19 @@ namespace BMA.EHR.Application.Repositories.Commands .Include(x => x.Profile) .ThenInclude(x => x.PosNo) on r.RefPlacementProfileId equals p.Id - + orderby r.Sequence select new CommandType21Response { + Seq = r.Sequence.ToString().ToThaiNumber(), CitizenId = r.CitizenId, FullName = $"{r.Prefix}{r.FirstName} {r.LastName}", Organization = p.Profile!.EmployeeOc, PositionName = p.Profile.Position == null ? "" : p.Profile.Position.Name, PositionLevel = p.Profile.PositionLevel == null ? "" : p.Profile.PositionLevel.Name, PositionType = p.Profile.PositionType == null ? "" : p.Profile.PositionType.Name, - PositionNumber = p.Profile.PosNo == null ? "" : p.Profile.PosNo.Name, - Salary = r.Amount == null ? 0 : r.Amount.Value, - RetireDate = p.Profile.BirthDate.CalculateRetireDate().ToThaiFullDate3() + PositionNumber = p.Profile.PosNo == null ? "" : p.Profile.PosNo.Name.ToThaiNumber(), + Salary = r.Amount == null ? "" : r.Amount.Value.ToNumericNoDecimalText().ToThaiNumber(), + RetireDate = p.Profile.BirthDate.CalculateRetireDate().ToThaiShortDate2().ToThaiNumber() }) .ToList(); diff --git a/BMA.EHR.Application/Responses/Reports/CommandType01Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType01Response.cs index 4ff30558..53076593 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType01Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType01Response.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BMA.EHR.Application.Responses.Reports +namespace BMA.EHR.Application.Responses.Reports { public class CommandType01Response { @@ -22,12 +16,14 @@ namespace BMA.EHR.Application.Responses.Reports public string PositionNumber { get; set; } = string.Empty; - public double Salary { get; set; } = 0; + public string Salary { get; set; } = "0"; public string AppointDate { get; set; } = string.Empty; - public int ExamNumber { get; set; } = 0; + public string ExamNumber { get; set; } = "0"; public string PlacementName { get; set;} = string.Empty; + + public string Seq { get; set; } = string.Empty; } } diff --git a/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs index 99335098..a6f4b82d 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType03Response.cs @@ -4,6 +4,8 @@ namespace BMA.EHR.Application.Responses.Reports { public class CommandType03Response { + + public string Seq { get; set; } = string.Empty; public string CitizenId { get; set; } = string.Empty; public string FullName { get; set; } = string.Empty; @@ -18,7 +20,7 @@ namespace BMA.EHR.Application.Responses.Reports public string OldPositionNumber { get; set; } = string.Empty; - public double OldSalary { get; set; } = 0; + public string OldSalary { get; set; } = ""; public string NewOc { get; set; } = string.Empty; @@ -30,7 +32,7 @@ namespace BMA.EHR.Application.Responses.Reports public string NewPositionNumber { get; set; } = string.Empty; - public double NewSalary { get; set; } = 0; + public string NewSalary { get; set; } = ""; public string AppointDate { get; set; } = string.Empty; } diff --git a/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs index d8da5e56..93b0e921 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType13Response.cs @@ -2,6 +2,8 @@ { public class CommandType13Response { + public string Seq { get; set; } = string.Empty; + public string CitizenId { get; set; } = string.Empty; public string FullName { get; set; } = string.Empty; @@ -16,7 +18,7 @@ public string PositionNumber { get; set; } = string.Empty; - public double Salary { get; set; } = 0; + public string Salary { get; set; } = string.Empty; public string ReceiveOrganizationName { get; set; } = string.Empty; diff --git a/BMA.EHR.Application/Responses/Reports/CommandType15Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType15Response.cs index 855be88d..352014a1 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType15Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType15Response.cs @@ -2,6 +2,8 @@ { public class CommandType15Response { + public string Seq { get; set; } = string.Empty; + public string CitizenId { get; set; } = string.Empty; public string FullName { get; set; } = string.Empty; diff --git a/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs index d1fa5811..37e4eb16 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType17Response.cs @@ -2,6 +2,8 @@ { public class CommandType17Response { + public string Seq { get; set; } = string.Empty; + public string CitizenId { get; set; } = string.Empty; public string FullName { get; set; } = string.Empty; @@ -16,7 +18,7 @@ public string PositionNumber { get; set; } = string.Empty; - public double Salary { get; set; } = 0; + public string Salary { get; set; } = string.Empty; public string ActiveDate { get; set; } = string.Empty; diff --git a/BMA.EHR.Application/Responses/Reports/CommandType18Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType18Response.cs index f0be507f..31636db8 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType18Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType18Response.cs @@ -28,7 +28,7 @@ public string PositionNumber { get; set; } = string.Empty; - public double Salary { get; set; } = 0; + public string Salary { get; set; } = string.Empty; public string Fault { get; set; } = string.Empty; diff --git a/BMA.EHR.Application/Responses/Reports/CommandType21Response.cs b/BMA.EHR.Application/Responses/Reports/CommandType21Response.cs index 49c7d675..7823d041 100644 --- a/BMA.EHR.Application/Responses/Reports/CommandType21Response.cs +++ b/BMA.EHR.Application/Responses/Reports/CommandType21Response.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace BMA.EHR.Application.Responses.Reports +namespace BMA.EHR.Application.Responses.Reports { public class CommandType21Response { + public string Seq { get; set; } = string.Empty; + public string CitizenId { get; set; } = string.Empty; public string FullName { get; set; } = string.Empty; @@ -22,7 +18,7 @@ namespace BMA.EHR.Application.Responses.Reports public string PositionNumber { get; set; } = string.Empty; - public double Salary { get; set; } = 0; + public string Salary { get; set; } = string.Empty; public string RetireDate { get; set;} = string.Empty; } diff --git a/BMA.EHR.Domain/Extensions/IntegerExtension.cs b/BMA.EHR.Domain/Extensions/IntegerExtension.cs index 730132fc..b7c6040c 100644 --- a/BMA.EHR.Domain/Extensions/IntegerExtension.cs +++ b/BMA.EHR.Domain/Extensions/IntegerExtension.cs @@ -47,20 +47,20 @@ namespace BMA.EHR.Domain.Extensions { string arabicNumbers = "0123456789"; string thaiNumbers = "๐๑๒๓๔๕๖๗๘๙"; - StringBuilder ThaiYear = new StringBuilder(); + StringBuilder result = new StringBuilder(); foreach (char digit in value) { int index = arabicNumbers.IndexOf(digit); if (index >= 0) { - ThaiYear.Append(thaiNumbers[index]); + result.Append(thaiNumbers[index]); } else { - ThaiYear.Append(digit); + result.Append(digit); } } - return ThaiYear.ToString(); + return result.ToString(); } } } \ No newline at end of file diff --git a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs index ee36ce0c..b1488588 100644 --- a/BMA.EHR.Report.Service/Controllers/CommandReportController.cs +++ b/BMA.EHR.Report.Service/Controllers/CommandReportController.cs @@ -1,13 +1,9 @@ using BMA.EHR.Application.Repositories.Commands; using BMA.EHR.Domain.Common; using BMA.EHR.Domain.Extensions; -using BMA.EHR.Domain.Models.OrganizationEmployee; -using BMA.EHR.Domain.Models.Placement; using BMA.EHR.Domain.Shared; -using DocumentFormat.OpenXml.Drawing.Charts; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.EntityFrameworkCore; using Swashbuckle.AspNetCore.Annotations; using Telerik.Reporting; using Telerik.Reporting.Processing; @@ -70,16 +66,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -144,9 +140,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -188,16 +184,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -262,9 +258,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -306,16 +302,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -380,9 +376,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -424,16 +420,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -498,9 +494,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -509,7 +505,6 @@ namespace BMA.EHR.Report.Service.Controllers ReportDocument = report }; - ReportProcessor reportProcessor = new ReportProcessor(_configuration); RenderingResult result = reportProcessor.RenderReport(exportType, instanceReportSource, deviceInfo); @@ -542,16 +537,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -616,9 +611,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -660,16 +655,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -734,9 +729,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -778,16 +773,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -852,9 +847,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -896,20 +891,20 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, - ConclusionReturnDate = raw_data.ConclusionReturnDate == null ? "" : raw_data.ConclusionReturnDate.Value.ToThaiFullDate3(), + ConclusionReturnNo = raw_data.ConclusionReturnNo.ToThaiNumber(), + ConclusionReturnDate = raw_data.ConclusionReturnDate == null ? "" : raw_data.ConclusionReturnDate.Value.ToThaiFullDate3().ToThaiNumber(), }; var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-5.trdp"); @@ -972,9 +967,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -1016,23 +1011,23 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, - ConclusionReturnDate = raw_data.ConclusionReturnDate == null ? "" : raw_data.ConclusionReturnDate.Value.ToThaiFullDate3(), + ConclusionReturnNo = raw_data.ConclusionReturnNo.ToThaiNumber(), + ConclusionReturnDate = raw_data.ConclusionReturnDate == null ? "" : raw_data.ConclusionReturnDate.Value.ToThaiFullDate3().ToThaiNumber(), SourceOrganizationName = raw_data.SourceOrganizationName, - MilitaryCommandNo = raw_data.MilitaryCommandNo, - MilitaryCommanDate = raw_data.MilitaryCommanDate == null ? "" : raw_data.MilitaryCommanDate.Value.ToThaiFullDate3() + MilitaryCommandNo = raw_data.MilitaryCommandNo.ToThaiNumber(), + MilitaryCommanDate = raw_data.MilitaryCommanDate == null ? "" : raw_data.MilitaryCommanDate.Value.ToThaiFullDate3().ToThaiNumber() }; var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-7.trdp"); @@ -1095,9 +1090,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -1139,26 +1134,26 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, PlacementCommandIssuer = raw_data.PlacementCommandIssuer, - PlacementCommandNo = raw_data.PlacementCommandNo, - PlacementCommandDate = raw_data.PlacementCommandDate == null ? "" : raw_data.PlacementCommandDate.Value.ToThaiFullDate3(), + PlacementCommandNo = raw_data.PlacementCommandNo.ToThaiNumber(), + PlacementCommandDate = raw_data.PlacementCommandDate == null ? "" : raw_data.PlacementCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), PlacementPositionName = raw_data.PlacementPositionName, PlacementOrganizationName = raw_data.PlacementOrganizationName, - ProbationStartDate = raw_data.ProbationStartDate == null ? "" : raw_data.ProbationStartDate.Value.ToThaiFullDate3(), - ProbationEndDate = raw_data.ProbationEndDate == null ? "" : raw_data.ProbationEndDate.Value.ToThaiFullDate3(), + ProbationStartDate = raw_data.ProbationStartDate == null ? "" : raw_data.ProbationStartDate.Value.ToThaiFullDate3().ToThaiNumber(), + ProbationEndDate = raw_data.ProbationEndDate == null ? "" : raw_data.ProbationEndDate.Value.ToThaiFullDate3().ToThaiNumber(), ChairManFullName = raw_data.ChairManFullName, Member1FullName = raw_data.Member1FullName, Member2FullName = raw_data.Member2FullName, @@ -1311,16 +1306,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, @@ -1387,9 +1382,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -1431,22 +1426,22 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, TransferOrganizationName = raw_data.TransferOrganizationName, - ConclusionReceiveNo = raw_data.ConclusionReceiveNo, - ConclusionReceiveDate = raw_data.ConclusionReceiveDate == null ? "" : raw_data.ConclusionReceiveDate.Value.ToThaiFullDate3(), + ConclusionReceiveNo = raw_data.ConclusionReceiveNo.ToThaiNumber(), + ConclusionReceiveDate = raw_data.ConclusionReceiveDate == null ? "" : raw_data.ConclusionReceiveDate.Value.ToThaiFullDate3().ToThaiNumber(), }; var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp"); @@ -1509,9 +1504,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -1553,16 +1548,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -1627,9 +1622,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -1671,20 +1666,20 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, - GovAidCommandNo = raw_data.GovAidCommandNo, - GovAidCommandDate = raw_data.GovAidCommandDate == null ? "" : raw_data.GovAidCommandDate.Value.ToThaiFullDate3(), + GovAidCommandNo = raw_data.GovAidCommandNo.ToThaiNumber(), + GovAidCommandDate = raw_data.GovAidCommandDate == null ? "" : raw_data.GovAidCommandDate.Value.ToThaiFullDate3().ToThaiNumber(), }; var rptFile = Path.Combine(_hostingEnvironment.ContentRootPath, "Reports", $"30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp"); @@ -1740,16 +1735,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; @@ -1814,9 +1809,9 @@ namespace BMA.EHR.Report.Service.Controllers tblData.DataSource = data; report.ReportParameters["IssuerOrganizationName"].Value = command.IssuerOrganizationName; - report.ReportParameters["CommandNo"].Value = command.CommandNo; - report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString(); - report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3(); + report.ReportParameters["CommandNo"].Value = command.CommandNo.ToThaiNumber(); + report.ReportParameters["CommandYear"].Value = command.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(); + report.ReportParameters["CommandExecuteDate"].Value = command.CommandExcecuteDate == null ? "" : command.CommandExcecuteDate.Value.ToThaiFullDate3().ToThaiNumber(); System.Collections.Hashtable deviceInfo = new System.Collections.Hashtable(); @@ -1999,16 +1994,16 @@ namespace BMA.EHR.Report.Service.Controllers var command = new { - CommandNo = raw_data.CommandNo, - CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString(), + CommandNo = raw_data.CommandNo.ToThaiNumber(), + CommandYear = raw_data.CommandYear.ToInteger().ToThaiYear().ToString().ToThaiNumber(), IssuerOrganizationName = raw_data.IssuerOrganizationName, - ConclusionRegisterNo = raw_data.ConclusionRegisterNo, - ConclusionRegisterDate = raw_data.ConclusionRegisterDate == null ? "" : raw_data.ConclusionRegisterDate.Value.ToThaiFullDate3(), - ConclusionResultNo = raw_data.ConclusionResultNo, - ConclusionResultDate = raw_data.ConclusionResultDate == null ? "" : raw_data.ConclusionResultDate.Value.ToThaiFullDate3(), + ConclusionRegisterNo = 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(), PositionList = "", - Count = raw_data.Receivers.Count, - CommandAffectDate = raw_data.CommandAffectDate == null ? "" : raw_data.CommandAffectDate.Value.ToThaiFullDate3(), + 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, }; diff --git a/BMA.EHR.Report.Service/Dockerfile b/BMA.EHR.Report.Service/Dockerfile index 819b9d09..1aecd0e1 100644 --- a/BMA.EHR.Report.Service/Dockerfile +++ b/BMA.EHR.Report.Service/Dockerfile @@ -25,14 +25,14 @@ RUN dotnet publish "BMA.EHR.Report.Service.csproj" -c Release -o /app/publish /p FROM base AS final RUN apt-get update && apt-get -y install fontconfig && apt-get install -y --allow-unauthenticated libgdiplus libc6-dev libx11-dev && rm -rf /var/lib/apt/lists/* -COPY ./BMA.EHR.Report.Service/Fonts/THSarabunIT.ttf /usr/share/fonts/truetype/ -COPY ./BMA.EHR.Report.Service/Fonts/THSarabunITBold.ttf /usr/share/fonts/truetype/ -COPY ./BMA.EHR.Report.Service/Fonts/THSarabunITItalic.ttf /usr/share/fonts/truetype/ -COPY ./BMA.EHR.Report.Service/Fonts/THSarabunITBoldItalic.ttf /usr/share/fonts/truetype/ -COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNew.ttf /usr/share/fonts/truetype/ -COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNewBold.ttf /usr/share/fonts/truetype/ -COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNewItalic.ttf /usr/share/fonts/truetype/ -COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNewBoldItalic.ttf /usr/share/fonts/truetype/ +#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunIT.ttf /usr/share/fonts/truetype/ +#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunITBold.ttf /usr/share/fonts/truetype/ +#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunITItalic.ttf /usr/share/fonts/truetype/ +#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunITBoldItalic.ttf /usr/share/fonts/truetype/ +#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNew.ttf /usr/share/fonts/truetype/ +#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNewBold.ttf /usr/share/fonts/truetype/ +#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNewItalic.ttf /usr/share/fonts/truetype/ +#COPY ./BMA.EHR.Report.Service/Fonts/THSarabunNewBoldItalic.ttf /usr/share/fonts/truetype/ COPY ./BMA.EHR.Report.Service/Fonts/THSarabun.ttf /usr/share/fonts/truetype/ COPY ./BMA.EHR.Report.Service/Fonts/THSarabun Bold.ttf /usr/share/fonts/truetype/ diff --git a/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-1.trdp b/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-1.trdp index b917c9ff..e80c1e41 100644 Binary files a/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-1.trdp and b/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-1.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-2.trdp b/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-2.trdp index ec4c6aa2..4c876fe9 100644 Binary files a/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-2.trdp and b/BMA.EHR.Report.Service/Reports/01-คำสั่งบรรจุและแต่งตั้งผู้สอบแข่งขันได้-2.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-3.trdp b/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-3.trdp index c4ee438a..e01dc2c0 100644 Binary files a/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-3.trdp and b/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-3.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-4.trdp b/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-4.trdp index c2447037..7eba20c1 100644 Binary files a/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-4.trdp and b/BMA.EHR.Report.Service/Reports/02-คำสั่งบรรจุและแต่งตั้งผู้ได้รับคัดเลือก-4.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน-Head.trdp b/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน-Head.trdp index 3a34e0f5..3031d55e 100644 Binary files a/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน-Head.trdp and b/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน-Head.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน.trdp b/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน.trdp index 40912d82..5fd2ae76 100644 Binary files a/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน.trdp and b/BMA.EHR.Report.Service/Reports/03-คำสั่งแต่งตั้งผู้สอบแข่งขัน.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน-Head.trdp b/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน-Head.trdp index b0eba74b..11ceafc5 100644 Binary files a/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน-Head.trdp and b/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน-Head.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน.trdp b/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน.trdp index 4c4109c0..9e720d67 100644 Binary files a/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน.trdp and b/BMA.EHR.Report.Service/Reports/04-คำสั่งย้ายผู้สอบแข่งขัน.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/05-06-คำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp b/BMA.EHR.Report.Service/Reports/05-06-คำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp index aa2beaaa..936993ae 100644 Binary files a/BMA.EHR.Report.Service/Reports/05-06-คำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp and b/BMA.EHR.Report.Service/Reports/05-06-คำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/05-06-แนบท้ายคำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp b/BMA.EHR.Report.Service/Reports/05-06-แนบท้ายคำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp index ee8f5182..72f5b24a 100644 Binary files a/BMA.EHR.Report.Service/Reports/05-06-แนบท้ายคำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp and b/BMA.EHR.Report.Service/Reports/05-06-แนบท้ายคำสั่งแต่งตั้ง-คำสั่งเลื่อน.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/07-คำสั่งย้าย.trdp b/BMA.EHR.Report.Service/Reports/07-คำสั่งย้าย.trdp index b429ba64..b9805b10 100644 Binary files a/BMA.EHR.Report.Service/Reports/07-คำสั่งย้าย.trdp and b/BMA.EHR.Report.Service/Reports/07-คำสั่งย้าย.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/07-แนบท้ายคำสั่งย้าย.trdp b/BMA.EHR.Report.Service/Reports/07-แนบท้ายคำสั่งย้าย.trdp index af965190..4c7f3141 100644 Binary files a/BMA.EHR.Report.Service/Reports/07-แนบท้ายคำสั่งย้าย.trdp and b/BMA.EHR.Report.Service/Reports/07-แนบท้ายคำสั่งย้าย.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-5.trdp b/BMA.EHR.Report.Service/Reports/08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-5.trdp index 7b344c75..75c92f26 100644 Binary files a/BMA.EHR.Report.Service/Reports/08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-5.trdp and b/BMA.EHR.Report.Service/Reports/08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-5.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-6.trdp b/BMA.EHR.Report.Service/Reports/08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-6.trdp index 47ef598c..66783055 100644 Binary files a/BMA.EHR.Report.Service/Reports/08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-6.trdp and b/BMA.EHR.Report.Service/Reports/08-คำสั่งบรรจุและแต่งตั้งข้าราชการฯกลับเข้ารับราชการ-6.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-7.trdp b/BMA.EHR.Report.Service/Reports/09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-7.trdp index 8d99723a..a7c69be0 100644 Binary files a/BMA.EHR.Report.Service/Reports/09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-7.trdp and b/BMA.EHR.Report.Service/Reports/09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-7.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-8.trdp b/BMA.EHR.Report.Service/Reports/09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-8.trdp index f9616b62..ad471488 100644 Binary files a/BMA.EHR.Report.Service/Reports/09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-8.trdp and b/BMA.EHR.Report.Service/Reports/09-คำสั่งบรรจุและแต่งตั้งผู้ออกไปรับราชการทหารกลับเข้ารับราชการ-8.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/11-คำสั่งให้ข้าราชการที่ผ่านการประเมิน รับราชการต่อไป.trdp b/BMA.EHR.Report.Service/Reports/11-คำสั่งให้ข้าราชการที่ผ่านการประเมิน รับราชการต่อไป.trdp index fe6c4eea..09b84afc 100644 Binary files a/BMA.EHR.Report.Service/Reports/11-คำสั่งให้ข้าราชการที่ผ่านการประเมิน รับราชการต่อไป.trdp and b/BMA.EHR.Report.Service/Reports/11-คำสั่งให้ข้าราชการที่ผ่านการประเมิน รับราชการต่อไป.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/12-คำสั่งให้ข้าราชการที่ไม่ผ่านการประเมิน ออกจากราชการ.trdp b/BMA.EHR.Report.Service/Reports/12-คำสั่งให้ข้าราชการที่ไม่ผ่านการประเมิน ออกจากราชการ.trdp index c8b43e35..9cc25e54 100644 Binary files a/BMA.EHR.Report.Service/Reports/12-คำสั่งให้ข้าราชการที่ไม่ผ่านการประเมิน ออกจากราชการ.trdp and b/BMA.EHR.Report.Service/Reports/12-คำสั่งให้ข้าราชการที่ไม่ผ่านการประเมิน ออกจากราชการ.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-2.trdp b/BMA.EHR.Report.Service/Reports/20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-2.trdp index e17630f4..343a363c 100644 Binary files a/BMA.EHR.Report.Service/Reports/20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-2.trdp and b/BMA.EHR.Report.Service/Reports/20-คำสั่งแต่งตั้งลูกจ้างชั่วคราวเป็นลูกจ้างประจำ-2.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-1.trdp b/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-1.trdp index 22e621d2..3993cda2 100644 Binary files a/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-1.trdp and b/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-1.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp b/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp index 48b05202..c97da7d8 100644 Binary files a/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp and b/BMA.EHR.Report.Service/Reports/27-คำสั่งให้โอนข้าราชการกรุงเทพมหานครสามัญ-2.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp b/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp index 0f5a5f8a..8ee8ea64 100644 Binary files a/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp and b/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ-5.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ5-10.trdp b/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ5-10.trdp index e305824f..8f49031e 100644 Binary files a/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ5-10.trdp and b/BMA.EHR.Report.Service/Reports/28-คำสั่งรับโอนข้าราชการกรุงเทพมหานครสามัญ5-10.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/29-คำสั่งให้ช่วยราชการ-1.trdp b/BMA.EHR.Report.Service/Reports/29-คำสั่งให้ช่วยราชการ-1.trdp index ff38acd5..54ccc231 100644 Binary files a/BMA.EHR.Report.Service/Reports/29-คำสั่งให้ช่วยราชการ-1.trdp and b/BMA.EHR.Report.Service/Reports/29-คำสั่งให้ช่วยราชการ-1.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/29-คำสั่งให้ช่วยราชการ-2.trdp b/BMA.EHR.Report.Service/Reports/29-คำสั่งให้ช่วยราชการ-2.trdp index 78cfaa3c..cc489403 100644 Binary files a/BMA.EHR.Report.Service/Reports/29-คำสั่งให้ช่วยราชการ-2.trdp and b/BMA.EHR.Report.Service/Reports/29-คำสั่งให้ช่วยราชการ-2.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp b/BMA.EHR.Report.Service/Reports/30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp index 91681a24..7d1d74a0 100644 Binary files a/BMA.EHR.Report.Service/Reports/30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp and b/BMA.EHR.Report.Service/Reports/30-คำสั่งส่งตัวกลับไปปฏิบัติงานทางต้นสังกัดเดิม.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-4.trdp b/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-4.trdp index f1b4d83a..d4b0946a 100644 Binary files a/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-4.trdp and b/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-4.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp b/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp index 492282fa..9341c174 100644 Binary files a/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp and b/BMA.EHR.Report.Service/Reports/34-คำสั่งอนุญาตให้ข้าราชการลาออกจากราชการ-5.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/37-คำสั่งปลดออกจากราชการ.trdp b/BMA.EHR.Report.Service/Reports/37-คำสั่งปลดออกจากราชการ.trdp index 201c6328..5091c934 100644 Binary files a/BMA.EHR.Report.Service/Reports/37-คำสั่งปลดออกจากราชการ.trdp and b/BMA.EHR.Report.Service/Reports/37-คำสั่งปลดออกจากราชการ.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/37-คำสั่งให้ออกจากราชการ.trdp b/BMA.EHR.Report.Service/Reports/37-คำสั่งให้ออกจากราชการ.trdp index 181a1b2d..ba337f53 100644 Binary files a/BMA.EHR.Report.Service/Reports/37-คำสั่งให้ออกจากราชการ.trdp and b/BMA.EHR.Report.Service/Reports/37-คำสั่งให้ออกจากราชการ.trdp differ diff --git a/BMA.EHR.Report.Service/Reports/38-คำสั่งลงโทษไล่ข้าราชการออกจากราชการ.trdp b/BMA.EHR.Report.Service/Reports/38-คำสั่งลงโทษไล่ข้าราชการออกจากราชการ.trdp index 3b632fce..e438efed 100644 Binary files a/BMA.EHR.Report.Service/Reports/38-คำสั่งลงโทษไล่ข้าราชการออกจากราชการ.trdp and b/BMA.EHR.Report.Service/Reports/38-คำสั่งลงโทษไล่ข้าราชการออกจากราชการ.trdp differ