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

fix(abdm): ensure m2LinkInit captures all careContexts and resolves accurate gender

Browse Source
This commit is contained in:
DevSoftTech Server 2026-10-23 10:34:23 +05:30
parent 42241beceb
commit 9236ff1da9
1 changed files with 27 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
app/Controllers/AbdmGateway.php
View File

@ -6759,6 +6759,17 @@ class AbdmGateway extends BaseController
$abhaAddress = ''; $abhaAddress = '';
$careContexts = []; $careContexts = [];
// 1. First, check careContexts or care_contexts directly passed in payload
$passedContexts = $payload['careContexts'] ?? $payload['care_contexts'] ?? [];
if (is_array($passedContexts) && ! empty($passedContexts)) {
foreach ($passedContexts as $cc) {
if (is_array($cc) && ! empty($cc['referenceNumber'])) {
$careContexts[] = $cc;
}
}
}
// 2. Also extract from rawPatient (can be array of patient objects or single patient object)
if (is_array($rawPatient)) { if (is_array($rawPatient)) {
if (isset($rawPatient[0]) && is_array($rawPatient[0])) { if (isset($rawPatient[0]) && is_array($rawPatient[0])) {
foreach ($rawPatient as $pItem) { foreach ($rawPatient as $pItem) {
@ -6782,39 +6793,26 @@ class AbdmGateway extends BaseController
$patientRef = trim((string) ($rawPatient['referenceNumber'] ?? $rawPatient['id'] ?? '')); $patientRef = trim((string) ($rawPatient['referenceNumber'] ?? $rawPatient['id'] ?? ''));
$abhaAddress = trim((string) ($rawPatient['id'] ?? $rawPatient['abhaAddress'] ?? $rawPatient['abha_address'] ?? '')); $abhaAddress = trim((string) ($rawPatient['id'] ?? $rawPatient['abhaAddress'] ?? $rawPatient['abha_address'] ?? ''));
if (! empty($rawPatient['careContexts']) && is_array($rawPatient['careContexts'])) { if (! empty($rawPatient['careContexts']) && is_array($rawPatient['careContexts'])) {
$careContexts = $rawPatient['careContexts']; foreach ($rawPatient['careContexts'] as $cc) {
if (is_array($cc) && ! empty($cc['referenceNumber'])) {
$careContexts[] = $cc;
}
}
} }
} }
} }
if ($patientRef === '') { // 3. Deduplicate careContexts by referenceNumber
$patientRef = trim((string) ( $dedupContexts = [];
$payload['patientRef'] $seenRefs = [];
?? $payload['patient_ref'] foreach ($careContexts as $cc) {
?? $payload['referenceNumber'] $ref = trim((string) ($cc['referenceNumber'] ?? $cc['ref'] ?? $cc['careContextId'] ?? ''));
?? $payload['patient_id'] if ($ref !== '' && ! isset($seenRefs[$ref])) {
?? '' $seenRefs[$ref] = true;
)); $dedupContexts[] = $cc;
}
if ($abhaAddress === '') {
$abhaAddress = trim((string) (
$payload['abhaAddress']
?? $payload['abha_address']
?? $payload['abhaId']
?? $payload['abha_id']
?? ''
));
}
if (empty($careContexts)) {
$careContexts = $payload['careContexts']
?? $payload['care_contexts']
?? [];
if (! is_array($careContexts)) {
$careContexts = [];
} }
} }
$careContexts = $dedupContexts;
if ($patientRef === '') { if ($patientRef === '') {
return $this->response->setStatusCode(400)->setJSON([ return $this->response->setStatusCode(400)->setJSON([
@ -13782,14 +13780,14 @@ class AbdmGateway extends BaseController
} }
// Auto-resolve Gender from patient_master // Auto-resolve Gender from patient_master
if (empty($body['gender']) && ! empty($patientRow)) { if (! empty($patientRow)) {
$genderCode = (int) ($patientRow['gender'] ?? 0); $genderCode = (int) ($patientRow['gender'] ?? 0);
$rawGender = strtoupper(trim((string) ($patientRow['gender'] ?? ''))); $rawGender = strtoupper(trim((string) ($patientRow['gender'] ?? '')));
if ($genderCode === 1 || $rawGender === 'M' || $rawGender === 'MALE') { if ($genderCode === 1 || $rawGender === 'M' || $rawGender === 'MALE') {
$body['gender'] = 'M'; $body['gender'] = 'M';
} elseif ($genderCode === 2 || $rawGender === 'F' || $rawGender === 'FEMALE') { } elseif ($genderCode === 2 || $rawGender === 'F' || $rawGender === 'FEMALE') {
$body['gender'] = 'F'; $body['gender'] = 'F';
} else { } elseif (empty($body['gender'])) {
$body['gender'] = 'O'; $body['gender'] = 'O';
} }
} }