Merge branch 'develop' into dev
All checks were successful
Build & Deploy on Dev / build (push) Successful in 44s

This commit is contained in:
harid 2025-11-21 17:20:50 +07:00
commit c0be72b81a

View file

@ -2291,7 +2291,7 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
foreach (var candidate in candidates) foreach (var candidate in candidates)
{ {
if (candidate.Status.Trim().ToUpper() != "CHECKSEAT") if (candidate.Status.Trim().ToUpper() != "CHECKSEAT" || (candidate.PeriodExam.Fee > 0 && candidate.Status.Trim().ToUpper() != "CHECKPOINT"))
continue; continue;
candidate.IsShowExamInfo = true; candidate.IsShowExamInfo = true;
@ -2621,10 +2621,10 @@ namespace BMA.EHR.Recurit.Exam.Service.Services
int calStp2 = cal % 11; int calStp2 = cal % 11;
int chkDigit = 11 - calStp2; int chkDigit = 11 - calStp2;
if (chkDigit == 10) if (chkDigit >= 10)
chkDigit = 1; {
else if (chkDigit == 11) chkDigit = 0;
chkDigit = chkDigit % 10; }
if (citizenIdDigits[12] != chkDigit) if (citizenIdDigits[12] != chkDigit)
throw new Exception(GlobalMessages.CitizenIncorrect); throw new Exception(GlobalMessages.CitizenIncorrect);