d_s_bisht/devsofttech_hms_ci4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix ABHA patient matching for DD-MM-YYYY dates

Browse Source
This commit is contained in:
DevSoftTech Server 2026-08-13 19:14:00 +05:30
parent 167a68362a
commit bc5fdb8c63
1 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
app/Controllers/Abha.php
View File

@ -1056,6 +1056,24 @@ class Abha extends BaseController
return null; return null;
} }
/**
* ABHA returns DOB as DD-MM-YYYY while patient_master stores YYYY-MM-DD.
*/
private function extractBirthYear(string $dob): string
{
$dob = trim($dob);
if ($dob === '') {
return '';
}
$normalized = $this->normalizeDobToDb($dob);
if ($normalized !== '' && preg_match('/^(\d{4})/', $normalized, $match) === 1) {
return $match[1];
}
return preg_match('/(?<!\d)(\d{4})(?!\d)/', $dob, $match) === 1 ? $match[1] : '';
}
/** /**
* Compute whole-years age from a dob string ('DD-MM-YYYY' or 'YYYY-MM-DD'). * Compute whole-years age from a dob string ('DD-MM-YYYY' or 'YYYY-MM-DD').
*/ */
@ -1110,7 +1128,8 @@ class Abha extends BaseController
): array { ): array {
$genderDb = $this->toPatientGenderValue($genderRaw); $genderDb = $this->toPatientGenderValue($genderRaw);
$ageYears = $this->computeAgeYears($dob); $ageYears = $this->computeAgeYears($dob);
$birthYear = preg_match('/^(\d{4})/', trim($dob), $birthYearMatch) === 1 ? $birthYearMatch[1] : ''; // ABHA sends DOB as DD-MM-YYYY, patient_master stores YYYY-MM-DD.
$birthYear = $this->extractBirthYear($dob);
$nameUp = strtoupper(trim($name)); $nameUp = strtoupper(trim($name));
$nameTokens = array_values(array_filter(preg_split('/\s+/', $nameUp) ?: [], fn ($t) => strlen($t) >= 3)); $nameTokens = array_values(array_filter(preg_split('/\s+/', $nameUp) ?: [], fn ($t) => strlen($t) >= 3));
$aadhaar = preg_replace('/\D/', '', $aadhaar); $aadhaar = preg_replace('/\D/', '', $aadhaar);
@ -1174,7 +1193,7 @@ class Abha extends BaseController
$rowAgeYears = (int) $row['age']; $rowAgeYears = (int) $row['age'];
} }
$rowBirthYear = preg_match('/^(\d{4})/', $rowDob, $rowBirthYearMatch) === 1 ? $rowBirthYearMatch[1] : ''; $rowBirthYear = $this->extractBirthYear($rowDob);
$birthYearMatch = $birthYear !== '' && $rowBirthYear !== '' && $rowBirthYear === $birthYear; $birthYearMatch = $birthYear !== '' && $rowBirthYear !== '' && $rowBirthYear === $birthYear;
$ageMatch = $birthYearMatch; $ageMatch = $birthYearMatch;
$genderMatch = $genderDb > 0 && (int) ($row['gender'] ?? 0) === $genderDb; $genderMatch = $genderDb > 0 && (int) ($row['gender'] ?? 0) === $genderDb;