Merge branch 'develop' into dev
Some checks failed
Build & Deploy on Dev / build (push) Failing after 28s

This commit is contained in:
harid 2025-12-04 17:50:43 +07:00
commit 59c9db4bf7

View file

@ -2194,72 +2194,72 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
_data.Add(new
{
Num = num.ToString().ToThaiNumber(),
PositionName = item.PositionName != null && item.PositionLevelName != null ? $"{item.PositionName} {item.PositionLevelName}".ToThaiNumber() : "-",
FullName = item.FullName != null ? item.FullName.ToThaiNumber() : "-",
Nationality = item.Nationality != null ? item.Nationality.ToThaiNumber() : "-",
ReligionName = item.ReligionName != null ? item.ReligionName.ToThaiNumber() : "-",
DateOfBirth = item.DateOfBirth != null ? item.DateOfBirth.ToThaiNumber() : "-",
Age = item.Age != null ? item.Age.ToThaiNumber() : "-",
Telephone = item.Telephone != null ? item.Telephone.ToThaiNumber() : "-",
Num = num.ToString(),
PositionName = item.PositionName != null && item.PositionLevelName != null ? $"{item.PositionName} {item.PositionLevelName}" : "-",
FullName = item.FullName != null ? item.FullName: "-",
Nationality = item.Nationality != null ? item.Nationality : "-",
ReligionName = item.ReligionName != null ? item.ReligionName : "-",
DateOfBirth = item.DateOfBirth != null ? item.DateOfBirth : "-",
Age = item.Age != null ? item.Age : "-",
Telephone = item.Telephone != null ? item.Telephone : "-",
Email = item.Email != null ? item.Email : "-",
CitizenId = item.CitizenId != null ? item.CitizenId.ToThaiNumber() : "-",
CitizenId = item.CitizenId != null ? item.CitizenId : "-",
EducationLevelExamName = education.EducationLevelExamName == null ? "-" : education.EducationLevelExamName.ToThaiNumber(),
EducationName = education.EducationName == null ? "-" : education.EducationName.ToThaiNumber(),
EducationMajor = education.EducationMajor == null ? "-" : education.EducationMajor.ToThaiNumber(),
EducationLocation = education.EducationLocation == null ? "-" : education.EducationLocation.ToThaiNumber(),
EducationEndDate = education.EducationEndDate == null ? "-" : (education.EducationEndDate == null ? "-" : education.EducationEndDate.Value.Date.ToThaiShortDate().ToThaiNumber()),
EducationScores = education.EducationScores == null ? "-" : education.EducationScores.ToThaiNumber(),
EducationType = education.EducationType == null ? "-" : education.EducationType.ToThaiNumber(),
EducationLevelHighName = education.EducationLevelHighName == null ? "-" : education.EducationLevelHighName.ToThaiNumber(),
EducationLevelExamName = education.EducationLevelExamName == null ? "-" : education.EducationLevelExamName,
EducationName = education.EducationName == null ? "-" : education.EducationName,
EducationMajor = education.EducationMajor == null ? "-" : education.EducationMajor,
EducationLocation = education.EducationLocation == null ? "-" : education.EducationLocation,
EducationEndDate = education.EducationEndDate == null ? "-" : (education.EducationEndDate == null ? "-" : education.EducationEndDate.Value.Date.ToThaiShortDate()),
EducationScores = education.EducationScores == null ? "-" : education.EducationScores,
EducationType = education.EducationType == null ? "-" : education.EducationType,
EducationLevelHighName = education.EducationLevelHighName == null ? "-" : education.EducationLevelHighName,
OccupationPositionType = item.OccupationPositionType == null ? "-" : GenerateStatusOccupation(item.OccupationPositionType),
OccupationPosition = item.OccupationPosition == null ? "-" : item.OccupationPosition.ToThaiNumber(),
OccupationSalary = item.OccupationSalary == null ? "-" : item.OccupationSalary.ToString().ToThaiNumber(),
OccupationGroup = item.OccupationGroup == null ? "-" : item.OccupationGroup.ToThaiNumber(),
OccupationPile = item.OccupationPile == null ? "-" : item.OccupationPile.ToThaiNumber(),
OccupationOrg = item.OccupationOrg == null ? "-" : item.OccupationOrg.ToThaiNumber(),
OccupationTelephone = item.OccupationTelephone == null ? "-" : item.OccupationTelephone.ToThaiNumber(),
OccupationPosition = item.OccupationPosition == null ? "-" : item.OccupationPosition,
OccupationSalary = item.OccupationSalary == null ? "-" : item.OccupationSalary.ToString(),
OccupationGroup = item.OccupationGroup == null ? "-" : item.OccupationGroup,
OccupationPile = item.OccupationPile == null ? "-" : item.OccupationPile,
OccupationOrg = item.OccupationOrg == null ? "-" : item.OccupationOrg,
OccupationTelephone = item.OccupationTelephone == null ? "-" : item.OccupationTelephone,
Position = firstCareer.Position == null ? "-" : firstCareer.Position.ToThaiNumber(),
Position = firstCareer.Position == null ? "-" : firstCareer.Position,
Type = firstCareer.Type == null ? "-" : firstCareer.Type,
DurationStart = firstCareer.DurationStart == null ? "-" : firstCareer.DurationStart.Date.ToThaiShortDate().ToThaiNumber(),
DurationEnd = firstCareer.DurationEnd == null ? "-" : firstCareer.DurationEnd.Date.ToThaiShortDate().ToThaiNumber(),
RangeDate = firstCareer.RangeDate == null ? "-" : firstCareer.RangeDate.ToThaiNumber(),
DurationStart = firstCareer.DurationStart == null ? "-" : firstCareer.DurationStart.Date.ToThaiShortDate(),
DurationEnd = firstCareer.DurationEnd == null ? "-" : firstCareer.DurationEnd.Date.ToThaiShortDate(),
RangeDate = firstCareer.RangeDate == null ? "-" : firstCareer.RangeDate,
CurrentAddress = item.CurrentAddress == null ? "-" : item.CurrentAddress.ToThaiNumber(),
CurrentProvinceName = item.CurrentProvinceName == null ? "-" : item.CurrentProvinceName.ToThaiNumber(),
CurrentDistrictName = item.CurrentDistrictName == null ? "-" : item.CurrentDistrictName.ToThaiNumber(),
CurrentSubDistrictName = item.CurrentSubDistrictName == null ? "-" : item.CurrentSubDistrictName.ToThaiNumber(),
CurrentZipCode = item.CurrentZipCode == null ? "-" : item.CurrentZipCode.ToThaiNumber(),
CurrentAddress = item.CurrentAddress == null ? "-" : item.CurrentAddress,
CurrentProvinceName = item.CurrentProvinceName == null ? "-" : item.CurrentProvinceName,
CurrentDistrictName = item.CurrentDistrictName == null ? "-" : item.CurrentDistrictName,
CurrentSubDistrictName = item.CurrentSubDistrictName == null ? "-" : item.CurrentSubDistrictName,
CurrentZipCode = item.CurrentZipCode == null ? "-" : item.CurrentZipCode,
RegistAddress = item.RegistAddress == null ? "-" : item.RegistAddress.ToThaiNumber(),
RegistProvinceName = item.RegistProvinceName == null ? "-" : item.RegistProvinceName.ToThaiNumber(),
RegistDistrictName = item.RegistDistrictName == null ? "-" : item.RegistDistrictName.ToThaiNumber(),
RegistSubDistrictName = item.RegistSubDistrictName == null ? "-" : item.RegistSubDistrictName.ToThaiNumber(),
RegistZipCode = item.RegistZipCode == null ? "-" : item.RegistZipCode.ToThaiNumber(),
RegistAddress = item.RegistAddress == null ? "-" : item.RegistAddress,
RegistProvinceName = item.RegistProvinceName == null ? "-" : item.RegistProvinceName,
RegistDistrictName = item.RegistDistrictName == null ? "-" : item.RegistDistrictName,
RegistSubDistrictName = item.RegistSubDistrictName == null ? "-" : item.RegistSubDistrictName,
RegistZipCode = item.RegistZipCode == null ? "-" : item.RegistZipCode,
ContactFullName = item.ContactFullName == null ? "-" : item.ContactFullName.ToThaiNumber(),
ContactRelations = item.ContactRelations == null ? "-" : item.ContactRelations.ToThaiNumber(),
ContactTel = item.ContactTel == null ? "-" : item.ContactTel.ToThaiNumber(),
ContactFullName = item.ContactFullName == null ? "-" : item.ContactFullName,
ContactRelations = item.ContactRelations == null ? "-" : item.ContactRelations,
ContactTel = item.ContactTel == null ? "-" : item.ContactTel,
CandidateStatus = GenerateStatusCandidate(item.Status),
Number = item.Number == null ? "-" : item.Number.ToThaiNumber(),
ExamIdenNumber = item.ExamIdenNumber == null ? "-" : item.ExamIdenNumber.ToThaiNumber(),
SeatNumber = item.SeatNumber == null ? "-" : item.SeatNumber.ToThaiNumber(),
PointTotalA = item.PointTotalA == null ? "-" : item.PointTotalA.ToThaiNumber(),
PointA = item.PointA == null ? "-" : item.PointA.ToThaiNumber(),
ResultA = item.ResultA == null ? "-" : item.ResultA.ToThaiNumber(),
PointTotalB = item.PointTotalB == null ? "-" : item.PointTotalB.ToThaiNumber(),
PointB = item.PointB == null ? "-" : item.PointB.ToThaiNumber(),
ResultB = item.ResultB == null ? "-" : item.ResultB.ToThaiNumber(),
PointTotalC = item.PointTotalC == null ? "-" : item.PointTotalC.ToThaiNumber(),
PointC = item.PointC == null ? "-" : item.PointC.ToThaiNumber(),
ResultC = item.ResultC == null ? "-" : item.ResultC.ToThaiNumber(),
Pass = item.Pass == null ? "-" : item.Pass.ToThaiNumber(),
CreatedAt = item.CreatedAt.Date == null ? "-" : item.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
RegisterDate = item.RegisterDate.Value.Date == null ? "-" : $"{item.RegisterDate.Value.Date.ToThaiShortDate()} {item.RegisterDate.Value.ToString("HH:mm:ss.ffff")}".ToThaiNumber()
Number = item.Number == null ? "-" : item.Number,
ExamIdenNumber = item.ExamIdenNumber == null ? "-" : item.ExamIdenNumber,
SeatNumber = item.SeatNumber == null ? "-" : item.SeatNumber,
PointTotalA = item.PointTotalA == null ? "-" : item.PointTotalA,
PointA = item.PointA == null ? "-" : item.PointA,
ResultA = item.ResultA == null ? "-" : item.ResultA,
PointTotalB = item.PointTotalB == null ? "-" : item.PointTotalB,
PointB = item.PointB == null ? "-" : item.PointB,
ResultB = item.ResultB == null ? "-" : item.ResultB,
PointTotalC = item.PointTotalC == null ? "-" : item.PointTotalC,
PointC = item.PointC == null ? "-" : item.PointC,
ResultC = item.ResultC == null ? "-" : item.ResultC,
Pass = item.Pass == null ? "-" : item.Pass,
CreatedAt = item.CreatedAt.Date == null ? "-" : item.CreatedAt.Date.ToThaiShortDate(),
RegisterDate = item.RegisterDate.Value.Date == null ? "-" : $"{item.RegisterDate.Value.Date.ToThaiShortDate()} {item.RegisterDate.Value.ToString("HH:mm:ss.ffff")}"
});
if (careers.Count > 1)
@ -2296,11 +2296,11 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
OccupationOrg = "",
OccupationTelephone = "",
Position = career.Position != null ? career.Position.ToThaiNumber() : "-",
Position = career.Position != null ? career.Position : "-",
Type = career.Type != null ? career.Type : "-",
DurationStart = career.DurationStart != null ? career.DurationStart.Date.ToThaiShortDate().ToThaiNumber() : "-",
DurationEnd = career.DurationEnd != null ? career.DurationEnd.Date.ToThaiShortDate().ToThaiNumber() : "-",
RangeDate = career.RangeDate != null ? career.RangeDate.ToThaiNumber() : "-",
DurationStart = career.DurationStart != null ? career.DurationStart.Date.ToThaiShortDate() : "-",
DurationEnd = career.DurationEnd != null ? career.DurationEnd.Date.ToThaiShortDate() : "-",
RangeDate = career.RangeDate != null ? career.RangeDate : "-",
CurrentAddress = "",
CurrentProvinceName = "",
@ -2342,33 +2342,33 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
{
_data.Add(new
{
Num = num.ToString().ToThaiNumber(),
PositionName = item.PositionName != null && item.PositionLevelName != null ? $"{item.PositionName} {item.PositionLevelName}".ToThaiNumber() : "-",
FullName = item.FullName != null ? item.FullName.ToThaiNumber() : "-",
Nationality = item.Nationality != null ? item.Nationality.ToThaiNumber() : "-",
ReligionName = item.ReligionName != null ? item.ReligionName.ToThaiNumber() : "-",
DateOfBirth = item.DateOfBirth != null ? item.DateOfBirth.ToThaiNumber() : "-",
Age = item.Age != null ? item.Age.ToThaiNumber() : "-",
Telephone = item.Telephone != null ? item.Telephone.ToThaiNumber() : "-",
Num = num.ToString(),
PositionName = item.PositionName != null && item.PositionLevelName != null ? $"{item.PositionName} {item.PositionLevelName}" : "-",
FullName = item.FullName != null ? item.FullName : "-",
Nationality = item.Nationality != null ? item.Nationality : "-",
ReligionName = item.ReligionName != null ? item.ReligionName : "-",
DateOfBirth = item.DateOfBirth != null ? item.DateOfBirth : "-",
Age = item.Age != null ? item.Age : "-",
Telephone = item.Telephone != null ? item.Telephone : "-",
Email = item.Email != null ? item.Email : "-",
CitizenId = item.CitizenId != null ? item.CitizenId.ToThaiNumber() : "-",
CitizenId = item.CitizenId != null ? item.CitizenId : "-",
EducationLevelExamName = education.EducationLevelExamName == null ? "-" : education.EducationLevelExamName.ToThaiNumber(),
EducationName = education.EducationName == null ? "-" : education.EducationName.ToThaiNumber(),
EducationMajor = education.EducationMajor == null ? "-" : education.EducationMajor.ToThaiNumber(),
EducationLocation = education.EducationLocation == null ? "-" : education.EducationLocation.ToThaiNumber(),
EducationEndDate = education.EducationEndDate == null ? "-" : (education.EducationEndDate == null ? "-" : education.EducationEndDate.Value.Date.ToThaiShortDate().ToThaiNumber()),
EducationScores = education.EducationScores == null ? "-" : education.EducationScores.ToThaiNumber(),
EducationType = education.EducationType == null ? "-" : education.EducationType.ToThaiNumber(),
EducationLevelHighName = education.EducationLevelHighName == null ? "-" : education.EducationLevelHighName.ToThaiNumber(),
EducationLevelExamName = education.EducationLevelExamName == null ? "-" : education.EducationLevelExamName,
EducationName = education.EducationName == null ? "-" : education.EducationName,
EducationMajor = education.EducationMajor == null ? "-" : education.EducationMajor,
EducationLocation = education.EducationLocation == null ? "-" : education.EducationLocation,
EducationEndDate = education.EducationEndDate == null ? "-" : (education.EducationEndDate == null ? "-" : education.EducationEndDate.Value.Date.ToThaiShortDate()),
EducationScores = education.EducationScores == null ? "-" : education.EducationScores,
EducationType = education.EducationType == null ? "-" : education.EducationType.,
EducationLevelHighName = education.EducationLevelHighName == null ? "-" : education.EducationLevelHighName,
OccupationPositionType = item.OccupationPositionType == null ? "-" : GenerateStatusOccupation(item.OccupationPositionType),
OccupationPosition = item.OccupationPosition == null ? "-" : item.OccupationPosition.ToThaiNumber(),
OccupationSalary = item.OccupationSalary == null ? "-" : item.OccupationSalary.ToString().ToThaiNumber(),
OccupationGroup = item.OccupationGroup == null ? "-" : item.OccupationGroup.ToThaiNumber(),
OccupationPile = item.OccupationPile == null ? "-" : item.OccupationPile.ToThaiNumber(),
OccupationOrg = item.OccupationOrg == null ? "-" : item.OccupationOrg.ToThaiNumber(),
OccupationTelephone = item.OccupationTelephone == null ? "-" : item.OccupationTelephone.ToThaiNumber(),
OccupationPosition = item.OccupationPosition == null ? "-" : item.OccupationPosition,
OccupationSalary = item.OccupationSalary == null ? "-" : item.OccupationSalary.ToString(),
OccupationGroup = item.OccupationGroup == null ? "-" : item.OccupationGroup,
OccupationPile = item.OccupationPile == null ? "-" : item.OccupationPile,
OccupationOrg = item.OccupationOrg == null ? "-" : item.OccupationOrg,
OccupationTelephone = item.OccupationTelephone == null ? "-" : item.OccupationTelephone,
Position = "-",
Type = "-",
@ -2376,38 +2376,38 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
DurationEnd = "-",
RangeDate = "-",
CurrentAddress = item.CurrentAddress == null ? "-" : item.CurrentAddress.ToThaiNumber(),
CurrentProvinceName = item.CurrentProvinceName == null ? "-" : item.CurrentProvinceName.ToThaiNumber(),
CurrentDistrictName = item.CurrentDistrictName == null ? "-" : item.CurrentDistrictName.ToThaiNumber(),
CurrentSubDistrictName = item.CurrentSubDistrictName == null ? "-" : item.CurrentSubDistrictName.ToThaiNumber(),
CurrentZipCode = item.CurrentZipCode == null ? "-" : item.CurrentZipCode.ToThaiNumber(),
CurrentAddress = item.CurrentAddress == null ? "-" : item.CurrentAddress,
CurrentProvinceName = item.CurrentProvinceName == null ? "-" : item.CurrentProvinceName,
CurrentDistrictName = item.CurrentDistrictName == null ? "-" : item.CurrentDistrictName,
CurrentSubDistrictName = item.CurrentSubDistrictName == null ? "-" : item.CurrentSubDistrictName,
CurrentZipCode = item.CurrentZipCode == null ? "-" : item.CurrentZipCode,
RegistAddress = item.RegistAddress == null ? "-" : item.RegistAddress.ToThaiNumber(),
RegistProvinceName = item.RegistProvinceName == null ? "-" : item.RegistProvinceName.ToThaiNumber(),
RegistDistrictName = item.RegistDistrictName == null ? "-" : item.RegistDistrictName.ToThaiNumber(),
RegistSubDistrictName = item.RegistSubDistrictName == null ? "-" : item.RegistSubDistrictName.ToThaiNumber(),
RegistZipCode = item.RegistZipCode == null ? "-" : item.RegistZipCode.ToThaiNumber(),
RegistAddress = item.RegistAddress == null ? "-" : item.RegistAddress,
RegistProvinceName = item.RegistProvinceName == null ? "-" : item.RegistProvinceName,
RegistDistrictName = item.RegistDistrictName == null ? "-" : item.RegistDistrictName,
RegistSubDistrictName = item.RegistSubDistrictName == null ? "-" : item.RegistSubDistrictName,
RegistZipCode = item.RegistZipCode == null ? "-" : item.RegistZipCode,
ContactFullName = item.ContactFullName == null ? "-" : item.ContactFullName.ToThaiNumber(),
ContactRelations = item.ContactRelations == null ? "-" : item.ContactRelations.ToThaiNumber(),
ContactTel = item.ContactTel == null ? "-" : item.ContactTel.ToThaiNumber(),
ContactFullName = item.ContactFullName == null ? "-" : item.ContactFullName,
ContactRelations = item.ContactRelations == null ? "-" : item.ContactRelations,
ContactTel = item.ContactTel == null ? "-" : item.ContactTel,
CandidateStatus = GenerateStatusCandidate(item.Status),
Number = item.Number == null ? "-" : item.Number.ToThaiNumber(),
ExamIdenNumber = item.ExamIdenNumber == null ? "-" : item.ExamIdenNumber.ToThaiNumber(),
SeatNumber = item.SeatNumber == null ? "-" : item.SeatNumber.ToThaiNumber(),
PointTotalA = item.PointTotalA == null ? "-" : item.PointTotalA.ToThaiNumber(),
PointA = item.PointA == null ? "-" : item.PointA.ToThaiNumber(),
ResultA = item.ResultA == null ? "-" : item.ResultA.ToThaiNumber(),
PointTotalB = item.PointTotalB == null ? "-" : item.PointTotalB.ToThaiNumber(),
PointB = item.PointB == null ? "-" : item.PointB.ToThaiNumber(),
ResultB = item.ResultB == null ? "-" : item.ResultB.ToThaiNumber(),
PointTotalC = item.PointTotalC == null ? "-" : item.PointTotalC.ToThaiNumber(),
PointC = item.PointC == null ? "-" : item.PointC.ToThaiNumber(),
ResultC = item.ResultC == null ? "-" : item.ResultC.ToThaiNumber(),
Pass = item.Pass == null ? "-" : item.Pass.ToThaiNumber(),
CreatedAt = item.CreatedAt.Date == null ? "-" : item.CreatedAt.Date.ToThaiShortDate().ToThaiNumber(),
RegisterDate = item.RegisterDate.Value.Date == null ? "-" : $"{item.RegisterDate.Value.Date.ToThaiShortDate()} {item.RegisterDate.Value.ToString("HH:mm:ss.ffff")}".ToThaiNumber()
Number = item.Number == null ? "-" : item.Number,
ExamIdenNumber = item.ExamIdenNumber == null ? "-" : item.ExamIdenNumber,
SeatNumber = item.SeatNumber == null ? "-" : item.SeatNumber,
PointTotalA = item.PointTotalA == null ? "-" : item.PointTotalA,
PointA = item.PointA == null ? "-" : item.PointA,
ResultA = item.ResultA == null ? "-" : item.ResultA,
PointTotalB = item.PointTotalB == null ? "-" : item.PointTotalB,
PointB = item.PointB == null ? "-" : item.PointB,
ResultB = item.ResultB == null ? "-" : item.ResultB,
PointTotalC = item.PointTotalC == null ? "-" : item.PointTotalC,
PointC = item.PointC == null ? "-" : item.PointC,
ResultC = item.ResultC == null ? "-" : item.ResultC,
Pass = item.Pass == null ? "-" : item.Pass,
CreatedAt = item.CreatedAt.Date == null ? "-" : item.CreatedAt.Date.ToThaiShortDate(),
RegisterDate = item.RegisterDate.Value.Date == null ? "-" : $"{item.RegisterDate.Value.Date.ToThaiShortDate()} {item.RegisterDate.Value.ToString("HH:mm:ss.ffff")}"
});
}