feat(abdm-opd): duplicate-aware Register OPD flow with existing/new patient confirmation

This commit is contained in:
DevSoftTech Server 2026-05-24 07:04:42 +05:30
parent fc50158418
commit b352073ec6
2 changed files with 298 additions and 86 deletions

View File

@ -197,13 +197,22 @@ class AbdmOpdQueue extends BaseController
return $this->response->setStatusCode(400)->setJSON(['ok' => 0, 'error_text' => 'AJAX only']);
}
$action = strtolower(trim((string) ($this->request->getPost('action') ?? 'auto')));
// Fields come from the token row already rendered in the queue table
$abhaRaw = preg_replace('/\D/', '', (string) ($this->request->getPost('abha_number') ?? ''));
$abhaAddr = trim((string) ($this->request->getPost('abha_address') ?? ''));
$aadhaarRaw = preg_replace('/\D/', '', (string) (
$this->request->getPost('aadhaar_number')
?? $this->request->getPost('aadhar_number')
?? $this->request->getPost('udai')
?? ''
));
$name = trim((string) ($this->request->getPost('patient_name') ?? ''));
$phone = trim((string) ($this->request->getPost('phone') ?? ''));
$gender = strtoupper(trim((string) ($this->request->getPost('gender') ?? '')));
$dob = trim((string) ($this->request->getPost('dob') ?? '')); // YYYY-MM-DD from gateway
$existingPatientId = (int) ($this->request->getPost('existing_patient_id') ?? 0);
if ($name === '' && $abhaRaw === '' && $phone === '') {
return $this->response->setJSON(['ok' => 0, 'error_text' => 'Insufficient patient data in token']);
@ -213,79 +222,87 @@ class AbdmOpdQueue extends BaseController
$fields = $db->getFieldNames('patient_master') ?? [];
// Detect ABHA column
$abhaField = null;
foreach (['abha_id', 'abha_no', 'abha', 'abha_address'] as $f) {
if (in_array($f, $fields, true)) { $abhaField = $f; break; }
$abhaField = $this->resolveFirstExistingColumn($fields, ['abha_id', 'abha_no', 'abha', 'abha_address']);
$aadhaarField = $this->resolveFirstExistingColumn($fields, ['udai', 'aadhar_no', 'aadhaar_no', 'aadhaar', 'adhar_no']);
$matches = $this->findPatientMatches($db, $abhaField, $aadhaarField, $abhaRaw, $abhaAddr, $aadhaarRaw, $phone);
if ($action === 'check') {
return $this->response->setJSON([
'ok' => 1,
'requires_confirmation' => count($matches) > 0 ? 1 : 0,
'matches' => $matches,
'token_data' => [
'id' => $tokenId,
'abha_number' => $abhaRaw,
'abha_address' => $abhaAddr,
'aadhaar_number'=> $aadhaarRaw,
'patient_name' => $name,
'phone' => $phone,
'gender' => $gender,
'dob' => $dob,
],
]);
}
$existing = null;
// 1. Search by ABHA number (14-digit)
if ($abhaField && $abhaRaw !== '' && strlen($abhaRaw) === 14) {
$existing = $db->table('patient_master')
->where($abhaField, $abhaRaw)
->get()->getRowArray();
}
// 2. Search by ABHA address
if (! $existing && $abhaField && $abhaAddr !== '') {
$existing = $db->table('patient_master')
->where($abhaField, $abhaAddr)
->get()->getRowArray();
}
// 3. Fallback: mobile
if (! $existing && $phone !== '') {
$existing = $db->table('patient_master')
->where('mphone1', $phone)
->get()->getRowArray();
if (($action === '' || $action === 'auto') && count($matches) > 1) {
return $this->response->setJSON([
'ok' => 1,
'requires_confirmation' => 1,
'matches' => $matches,
'token_data' => [
'id' => $tokenId,
'abha_number' => $abhaRaw,
'abha_address' => $abhaAddr,
'aadhaar_number'=> $aadhaarRaw,
'patient_name' => $name,
'phone' => $phone,
'gender' => $gender,
'dob' => $dob,
],
]);
}
$patientId = 0;
$pCode = '';
$isNew = false;
if ($existing) {
if ($action === 'link_existing') {
if ($existingPatientId <= 0) {
return $this->response->setJSON(['ok' => 0, 'error_text' => 'Please select an existing patient']);
}
$existing = $db->table('patient_master')
->select('id,p_code,mphone1' . ($abhaField ? ',' . $abhaField . ' AS patient_abha' : '') . ($aadhaarField ? ',' . $aadhaarField . ' AS patient_aadhaar' : ''))
->where('id', $existingPatientId)
->get()->getRowArray();
if (! $existing) {
return $this->response->setJSON(['ok' => 0, 'error_text' => 'Selected patient record not found']);
}
$patientId = (int) ($existing['id'] ?? 0);
$pCode = (string) ($existing['p_code'] ?? '');
// Backfill ABHA if empty
if ($abhaField && empty($existing[$abhaField]) && $abhaRaw !== '') {
$db->table('patient_master')->where('id', $patientId)->update([$abhaField => $abhaRaw]);
$backfill = [];
if ($abhaField && trim((string) ($existing['patient_abha'] ?? '')) === '' && $abhaRaw !== '') {
$backfill[$abhaField] = $abhaRaw;
}
if ($aadhaarField && trim((string) ($existing['patient_aadhaar'] ?? '')) === '' && $aadhaarRaw !== '') {
$backfill[$aadhaarField] = $aadhaarRaw;
}
if (trim((string) ($existing['mphone1'] ?? '')) === '' && $phone !== '') {
$backfill['mphone1'] = $phone;
}
if (! empty($backfill)) {
$db->table('patient_master')->where('id', $patientId)->update($backfill);
}
} elseif (($action === '' || $action === 'auto') && count($matches) === 1) {
$existing = $matches[0];
$patientId = (int) ($existing['id'] ?? 0);
$pCode = (string) ($existing['p_code'] ?? '');
} else {
// Create new patient
$genderDb = ($gender === 'F' || $gender === '2') ? 2 : 1;
// Convert DOB: YYYY-MM-DD (gateway) → already correct for MySQL
$dobDb = '';
if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dob)) {
$dobDb = $dob;
}
$insertData = [
'p_fname' => strtoupper($name !== '' ? $name : 'ABHA PATIENT'),
'mphone1' => $phone,
'gender' => $genderDb,
'blood_group' => 'Not Define',
'estimate_dob' => $dobDb !== '' ? 0 : 1,
];
if ($dobDb !== '') {
$insertData['dob'] = $dobDb;
} else {
$insertData['age'] = 0;
$insertData['age_in_month'] = 0;
}
if ($abhaField && $abhaRaw !== '') {
$insertData[$abhaField] = $abhaRaw;
}
// Generate p_code
$today = date('y') . date('m');
$countRow = $db->query("SELECT COUNT(*) as cnt FROM patient_master WHERE p_code LIKE 'P{$today}%'")->getRow();
$seq = str_pad(((int) ($countRow->cnt ?? 0)) + 1, 4, '0', STR_PAD_LEFT);
$insertData['p_code'] = 'P' . $today . $seq;
$db->table('patient_master')->insert($insertData);
$patientId = (int) $db->insertID();
$pCode = $insertData['p_code'];
$created = $this->createPatientFromToken($db, $abhaField, $aadhaarField, $name, $phone, $gender, $dob, $abhaRaw, $aadhaarRaw);
$patientId = (int) ($created['patient_id'] ?? 0);
$pCode = (string) ($created['p_code'] ?? '');
$isNew = true;
}
@ -293,15 +310,7 @@ class AbdmOpdQueue extends BaseController
return $this->response->setStatusCode(500)->setJSON(['ok' => 0, 'error_text' => 'Failed to resolve patient record']);
}
// Update local DB record: link patient
$db->table('abdm_opd_tokens')
->where('gateway_token_id', $tokenId)
->update([
'patient_id' => $patientId,
'status' => 'CALLED',
'processed_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'),
]);
$this->attachPatientToToken($db, $tokenId, $patientId);
// Mark token as CALLED on gateway (non-blocking)
try {
@ -319,6 +328,136 @@ class AbdmOpdQueue extends BaseController
]);
}
private function resolveFirstExistingColumn(array $fields, array $candidates): ?string
{
foreach ($candidates as $candidate) {
if (in_array($candidate, $fields, true)) {
return $candidate;
}
}
return null;
}
private function findPatientMatches(
\CodeIgniter\Database\BaseConnection $db,
?string $abhaField,
?string $aadhaarField,
string $abhaRaw,
string $abhaAddr,
string $aadhaarRaw,
string $phone
): array {
$select = 'id,p_code,p_fname,mphone1';
if ($abhaField) {
$select .= ',' . $abhaField . ' AS patient_abha';
}
if ($aadhaarField) {
$select .= ',' . $aadhaarField . ' AS patient_aadhaar';
}
$bucket = [];
$append = static function (array $rows, string $reason) use (&$bucket): void {
foreach ($rows as $row) {
$id = (int) ($row['id'] ?? 0);
if ($id <= 0) {
continue;
}
if (! isset($bucket[$id])) {
$row['match_reasons'] = [];
$bucket[$id] = $row;
}
if (! in_array($reason, $bucket[$id]['match_reasons'], true)) {
$bucket[$id]['match_reasons'][] = $reason;
}
}
};
if ($abhaField && $abhaRaw !== '') {
$rows = $db->table('patient_master')->select($select)->where($abhaField, $abhaRaw)->limit(10)->get()->getResultArray();
$append($rows, 'ABHA No');
}
if ($abhaField && $abhaAddr !== '' && $abhaAddr !== $abhaRaw) {
$rows = $db->table('patient_master')->select($select)->where($abhaField, $abhaAddr)->limit(10)->get()->getResultArray();
$append($rows, 'ABHA Address');
}
if ($aadhaarField && $aadhaarRaw !== '') {
$rows = $db->table('patient_master')->select($select)->where($aadhaarField, $aadhaarRaw)->limit(10)->get()->getResultArray();
$append($rows, 'Aadhaar');
}
if ($phone !== '') {
$rows = $db->table('patient_master')->select($select)->where('mphone1', $phone)->limit(10)->get()->getResultArray();
$append($rows, 'Phone');
}
return array_values($bucket);
}
private function createPatientFromToken(
\CodeIgniter\Database\BaseConnection $db,
?string $abhaField,
?string $aadhaarField,
string $name,
string $phone,
string $gender,
string $dob,
string $abhaRaw,
string $aadhaarRaw
): array {
$genderDb = ($gender === 'F' || $gender === '2') ? 2 : 1;
$dobDb = '';
if (preg_match('/^\d{4}-\d{2}-\d{2}$/', $dob)) {
$dobDb = $dob;
}
$insertData = [
'p_fname' => strtoupper($name !== '' ? $name : 'ABHA PATIENT'),
'mphone1' => $phone,
'gender' => $genderDb,
'blood_group' => 'Not Define',
'estimate_dob' => $dobDb !== '' ? 0 : 1,
];
if ($dobDb !== '') {
$insertData['dob'] = $dobDb;
} else {
$insertData['age'] = 0;
$insertData['age_in_month'] = 0;
}
if ($abhaField && $abhaRaw !== '') {
$insertData[$abhaField] = $abhaRaw;
}
if ($aadhaarField && $aadhaarRaw !== '') {
$insertData[$aadhaarField] = $aadhaarRaw;
}
$today = date('y') . date('m');
$countRow = $db->query("SELECT COUNT(*) as cnt FROM patient_master WHERE p_code LIKE 'P{$today}%'")->getRow();
$seq = str_pad(((int) ($countRow->cnt ?? 0)) + 1, 4, '0', STR_PAD_LEFT);
$insertData['p_code'] = 'P' . $today . $seq;
$db->table('patient_master')->insert($insertData);
return [
'patient_id' => (int) $db->insertID(),
'p_code' => (string) $insertData['p_code'],
];
}
private function attachPatientToToken(\CodeIgniter\Database\BaseConnection $db, int $tokenId, int $patientId): void
{
$db->table('abdm_opd_tokens')
->where('gateway_token_id', $tokenId)
->update([
'patient_id' => $patientId,
'status' => 'CALLED',
'processed_at' => date('Y-m-d H:i:s'),
'updated_at' => date('Y-m-d H:i:s'),
]);
}
// -------------------------------------------------------------------------
// Private: merge local DB HMS data into gateway token array
// -------------------------------------------------------------------------

View File

@ -257,6 +257,7 @@
if (!isLinked && (isPend || isCalled)) {
const pl = JSON.stringify({
id: t.id, abha_number: t.abha_number ?? '', abha_address: t.abha_address ?? '',
aadhaar_number: t.aadhaar_number ?? t.aadhar_number ?? t.udai ?? '',
patient_name: t.patient_name ?? '', phone: t.phone ?? '',
gender: t.gender ?? '', dob: t.dob ?? ''
}).replace(/'/g, '&#39;');
@ -314,30 +315,47 @@
<div class="d-flex justify-content-center">
<div class="spinner-border text-primary" role="status"><span class="visually-hidden">Processing…</span></div>
</div>
<p class="text-center text-muted small mt-2">Finding / creating patient record…</p>`;
<p class="text-center text-muted small mt-2">Checking existing HMS patient records…</p>`;
new bootstrap.Modal(document.getElementById('abdmQueueModalProcess')).show();
post(BASE + 'AbdmOpdQueue/process_token/' + t.id, {
action: 'check',
abha_number: t.abha_number ?? '', abha_address: t.abha_address ?? '',
aadhaar_number: t.aadhaar_number ?? '',
patient_name: t.patient_name ?? '', phone: t.phone ?? '',
gender: t.gender ?? '', dob: t.dob ?? '',
}).then(r => {
if (r.ok) {
body.innerHTML = `
<div class="alert alert-success py-2 small mb-2">
${r.is_new ? '<strong>New patient created.</strong>' : '<strong>Existing patient found.</strong>'}
</div>
<div class="card mb-3"><div class="card-body py-2 small">
<div class="fw-bold">${esc(t.patient_name || '—')}</div>
<div class="text-muted">HMS ID: <strong>${esc(r.p_code)}</strong></div>
</div></div>
<a href="${r.redirect_url}" class="btn btn-sm btn-primary w-100">Open OPD Registration →</a>
<button class="btn btn-sm btn-outline-secondary w-100 mt-2" data-bs-dismiss="modal" onclick="loadQueue()">Back to Queue</button>`;
loadQueue();
} else {
if (!r.ok) {
body.innerHTML = `<div class="alert alert-danger small">${esc(r.error_text ?? 'Failed to process token')}</div>
<button class="btn btn-sm btn-secondary w-100" data-bs-dismiss="modal">Close</button>`;
return;
}
if (r.requires_confirmation) {
const matches = Array.isArray(r.matches) ? r.matches : [];
const cards = matches.map(m => {
const reasons = Array.isArray(m.match_reasons) ? m.match_reasons.join(', ') : '';
return `<div class="card mb-2 border-warning">
<div class="card-body py-2 px-3 small">
<div class="fw-bold">${esc(m.p_code || 'UHID N/A')} - ${esc(m.p_fname || 'Unnamed')}</div>
<div class="text-muted">Phone: ${esc(m.mphone1 || '—')} | ABHA: ${esc(m.patient_abha || '—')} | Aadhaar: ${esc(m.patient_aadhaar || '—')}</div>
<div class="text-warning">Matched by: ${esc(reasons || 'Data match')}</div>
<button class="btn btn-sm btn-outline-primary mt-2" onclick="abdmQResolveExisting(${Number(t.id) || 0}, ${Number(m.id) || 0}, '${encodeURIComponent(JSON.stringify(t))}')">Use This Patient</button>
</div>
</div>`;
}).join('');
body.innerHTML = `
<div class="alert alert-warning py-2 small mb-2">
Similar patient records found. Confirm existing patient or create a new record.
</div>
${cards}
<button class="btn btn-sm btn-success w-100 mt-2" onclick="abdmQCreateNewPatient(${Number(t.id) || 0}, '${encodeURIComponent(JSON.stringify(t))}')">Create New Patient</button>
<a href="${BASE}billing/patient" class="btn btn-sm btn-outline-secondary w-100 mt-2" target="_blank">Open Manual Patient Registration (/billing/patient)</a>
<button class="btn btn-sm btn-outline-secondary w-100 mt-2" data-bs-dismiss="modal">Close</button>`;
} else {
abdmQCreateNewPatient(t.id, encodeURIComponent(JSON.stringify(t)), true);
}
}).catch(err => {
body.innerHTML = `<div class="alert alert-danger small">Request error: ${esc(err.message)}</div>
@ -345,6 +363,61 @@
});
};
window.abdmQResolveExisting = function (tokenId, patientId, encodedPayload) {
const t = JSON.parse(decodeURIComponent(encodedPayload));
const body = document.getElementById('abdmProcessTokenBody');
body.innerHTML = '<p class="text-muted small mb-0">Linking token to selected patient…</p>';
post(BASE + 'AbdmOpdQueue/process_token/' + tokenId, {
action: 'link_existing',
existing_patient_id: patientId,
abha_number: t.abha_number ?? '', abha_address: t.abha_address ?? '',
aadhaar_number: t.aadhaar_number ?? '',
patient_name: t.patient_name ?? '', phone: t.phone ?? '',
gender: t.gender ?? '', dob: t.dob ?? '',
}).then(handleProcessResult).catch(err => {
body.innerHTML = `<div class="alert alert-danger small">Request error: ${esc(err.message)}</div>`;
});
};
window.abdmQCreateNewPatient = function (tokenId, encodedPayload, skipConfirm) {
const t = JSON.parse(decodeURIComponent(encodedPayload));
const body = document.getElementById('abdmProcessTokenBody');
if (!skipConfirm && !confirm('Create a new patient record for this token?')) {
return;
}
body.innerHTML = '<p class="text-muted small mb-0">Creating new patient record…</p>';
post(BASE + 'AbdmOpdQueue/process_token/' + tokenId, {
action: 'create_new',
abha_number: t.abha_number ?? '', abha_address: t.abha_address ?? '',
aadhaar_number: t.aadhaar_number ?? '',
patient_name: t.patient_name ?? '', phone: t.phone ?? '',
gender: t.gender ?? '', dob: t.dob ?? '',
}).then(handleProcessResult).catch(err => {
body.innerHTML = `<div class="alert alert-danger small">Request error: ${esc(err.message)}</div>`;
});
};
function handleProcessResult(r) {
const body = document.getElementById('abdmProcessTokenBody');
if (r.ok) {
body.innerHTML = `
<div class="alert alert-success py-2 small mb-2">
${r.is_new ? '<strong>New patient created.</strong>' : '<strong>Existing patient linked.</strong>'}
</div>
<div class="card mb-3"><div class="card-body py-2 small">
<div class="text-muted">HMS ID: <strong>${esc(r.p_code || '—')}</strong></div>
</div></div>
<a href="${r.redirect_url}" class="btn btn-sm btn-primary w-100">Open OPD Registration →</a>
<button class="btn btn-sm btn-outline-secondary w-100 mt-2" data-bs-dismiss="modal" onclick="loadQueue()">Back to Queue</button>`;
loadQueue();
return;
}
body.innerHTML = `<div class="alert alert-danger small">${esc(r.error_text ?? r.message ?? 'Failed to process token')}</div>
<button class="btn btn-sm btn-secondary w-100" data-bs-dismiss="modal">Close</button>`;
}
document.getElementById('btnAddTokenSubmit').addEventListener('click', function () {
const name = document.getElementById('at_name').value.trim();
const alertBox = document.getElementById('abdmAddTokenAlert');