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

Match ABHA patients by exact identifier or demographics

Browse Source
This commit is contained in:
DevSoftTech Server 2026-08-13 19:23:46 +05:30
parent bc5fdb8c63
commit 7cb57b5b28
1 changed files with 40 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
app/Controllers/Abha.php
View File

@ -1127,7 +1127,6 @@ class Abha extends BaseController
string $abhaNumClean
): array {
$genderDb = $this->toPatientGenderValue($genderRaw);
$ageYears = $this->computeAgeYears($dob);
// ABHA sends DOB as DD-MM-YYYY, patient_master stores YYYY-MM-DD.
$birthYear = $this->extractBirthYear($dob);
$nameUp = strtoupper(trim($name));
@ -1147,33 +1146,54 @@ class Abha extends BaseController
$select .= ',' . $abhaField;
}
$builder = $db->table('patient_master')->select($select);
$builder->groupStart();
$any = false;
foreach ($nameTokens as $tok) {
$builder->orLike('p_fname', $tok);
$any = true;
}
if ($mobile !== '') {
$builder->orWhere('mphone1', $mobile);
$any = true;
// Two targeted passes: exact identifiers can never be crowded out by a
// common name, and gender alone is a filter (see scoring) not a selector.
$rows = [];
$collect = static function (callable $applyConditions) use ($db, $select, &$rows): void {
$builder = $db->table('patient_master')->select($select);
$builder->groupStart();
$applyConditions($builder);
$builder->groupEnd();
foreach ($builder->orderBy('insert_date', 'DESC')->limit(200)->get()->getResultArray() as $row) {
$rows[(int) ($row['id'] ?? 0)] = $row;
}
};
$exactMatches = [];
if ($abhaField !== null && $abhaNumClean !== '') {
$exactMatches[$abhaField] = $abhaNumClean;
}
if ($aadhaar !== '') {
$builder->orWhere('udai', $aadhaar);
$any = true;
$exactMatches['udai'] = $aadhaar;
}
if ($ageYears !== null && $genderDb > 0) {
$builder->orWhere('gender', $genderDb);
$any = true;
if ($mobile !== '') {
$exactMatches['mphone1'] = $mobile;
}
$builder->groupEnd();
if (! $any) {
if ($exactMatches !== []) {
$collect(static function ($builder) use ($exactMatches): void {
foreach ($exactMatches as $column => $value) {
$builder->orWhere($column, $value);
}
});
}
if ($nameTokens !== []) {
$hasLastName = in_array('p_lname', $fields, true);
$collect(static function ($builder) use ($nameTokens, $hasLastName): void {
foreach ($nameTokens as $token) {
$builder->orLike('p_fname', $token);
if ($hasLastName) {
$builder->orLike('p_lname', $token);
}
}
});
}
if ($rows === []) {
return [];
}
$rows = $builder->orderBy('insert_date', 'DESC')->limit(40)->get()->getResultArray();
$candidates = [];
foreach ($rows as $row) {
$rowName = strtoupper(trim((string) ($row['p_fname'] ?? '') . ' ' . (string) ($row['p_lname'] ?? '')));