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

Fix all patient_master_exten references in pharmacy module

Browse Source 
- Replace all patient_master_exten checks with patient_master across Medical.php
- Fixes blank patient info in multiple pharmacy pages:
  * /Medical/ipd_print/{id}/credit - IPD print bills (UHID, Patient name)
  * Counter sale forms and invoice editing
  * Patient search functionality
  * IPD group print consolidated views
  * Auto UHID lookup endpoints
- patient_master_exten table exists but lacks core patient fields (p_fname, p_rname, p_code)
- Ensures consistent patient data display throughout pharmacy module
- Matches earlier fixes for billing and invoice list pages
This commit is contained in:
DevSoftTech Server 2026-06-10 13:53:15 +05:30
parent 1c87edcf03
commit 203481b8df
1 changed files with 16 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
app/Controllers/Medical.php
View File

@ -461,7 +461,7 @@ class Medical extends BaseController
} }
$search = preg_replace('/[^A-Za-z0-9 _.@\-]/', '', trim($searchRaw)); $search = preg_replace('/[^A-Za-z0-9 _.@\-]/', '', trim($searchRaw));
$table = $this->db->tableExists('patient_master_exten') ? 'patient_master_exten' : 'patient_master'; $table = 'patient_master';
if (! $this->db->tableExists($table)) { if (! $this->db->tableExists($table)) {
return view('medical/patient_search_result', [ return view('medical/patient_search_result', [
'patients' => [], 'patients' => [],
@ -905,7 +905,7 @@ class Medical extends BaseController
$docId = 0; $docId = 0;
if ($pno > 0) { if ($pno > 0) {
$patientTable = $this->db->tableExists('patient_master_exten') ? 'patient_master_exten' : 'patient_master'; $patientTable = 'patient_master';
if ($this->db->tableExists($patientTable)) { if ($this->db->tableExists($patientTable)) {
$patient = $this->db->table($patientTable)->where('id', $pno)->get()->getRow(); $patient = $this->db->table($patientTable)->where('id', $pno)->get()->getRow();
if ($patient) { if ($patient) {
@ -975,7 +975,7 @@ class Medical extends BaseController
return view('medical/placeholder', ['title' => 'Invalid patient']); return view('medical/placeholder', ['title' => 'Invalid patient']);
} }
$patientTable = $this->db->tableExists('patient_master_exten') ? 'patient_master_exten' : 'patient_master'; $patientTable = 'patient_master';
$patient = $this->db->table($patientTable)->where('id', $patientId)->get()->getRow(); $patient = $this->db->table($patientTable)->where('id', $patientId)->get()->getRow();
if (! $patient) { if (! $patient) {
return view('medical/placeholder', ['title' => 'Patient not found']); return view('medical/placeholder', ['title' => 'Patient not found']);
@ -1182,7 +1182,7 @@ class Medical extends BaseController
private function findPatientByIdOrCode($patientId, string $patientCode = ''): ?object private function findPatientByIdOrCode($patientId, string $patientCode = ''): ?object
{ {
$patientTable = $this->db->tableExists('patient_master_exten') ? 'patient_master_exten' : 'patient_master'; $patientTable = 'patient_master';
if (! $this->db->tableExists($patientTable)) { if (! $this->db->tableExists($patientTable)) {
return null; return null;
} }
@ -2131,9 +2131,7 @@ class Medical extends BaseController
} }
$patient = null; $patient = null;
if (! empty($invoice->patient_id) && $this->db->tableExists('patient_master_exten')) { if (! empty($invoice->patient_id) && $this->db->tableExists('patient_master')) {
$patient = $this->db->table('patient_master_exten')->where('id', (int) $invoice->patient_id)->get()->getRow();
} elseif (! empty($invoice->patient_id) && $this->db->tableExists('patient_master')) {
$patient = $this->db->table('patient_master')->where('id', (int) $invoice->patient_id)->get()->getRow(); $patient = $this->db->table('patient_master')->where('id', (int) $invoice->patient_id)->get()->getRow();
} }
@ -2483,12 +2481,10 @@ class Medical extends BaseController
} }
$patientId = (int) ($ipd->p_id ?? ($ipd->patient_id ?? 0)); $patientId = (int) ($ipd->p_id ?? ($ipd->patient_id ?? 0));
$patientTable = $this->db->tableExists('patient_master_exten') $patientTable = 'patient_master';
? 'patient_master_exten'
: ($this->db->tableExists('patient_master') ? 'patient_master' : null);
$patient = null; $patient = null;
if ($patientId > 0 && $patientTable) { if ($patientId > 0 && $this->db->tableExists($patientTable)) {
$patient = $this->db->table($patientTable)->where('id', $patientId)->get()->getRow(); $patient = $this->db->table($patientTable)->where('id', $patientId)->get()->getRow();
} }
@ -2954,10 +2950,8 @@ class Medical extends BaseController
$patient = null; $patient = null;
$patientId = (int) ($ipd->p_id ?? ($ipd->patient_id ?? 0)); $patientId = (int) ($ipd->p_id ?? ($ipd->patient_id ?? 0));
$patientTable = $this->db->tableExists('patient_master_exten') $patientTable = 'patient_master';
? 'patient_master_exten' if ($patientId > 0 && $this->db->tableExists($patientTable)) {
: ($this->db->tableExists('patient_master') ? 'patient_master' : null);
if ($patientId > 0 && $patientTable) {
$patient = $this->db->table($patientTable)->where('id', $patientId)->get()->getRow(); $patient = $this->db->table($patientTable)->where('id', $patientId)->get()->getRow();
} }
@ -3277,9 +3271,7 @@ class Medical extends BaseController
} }
$patient = null; $patient = null;
if (! empty($invoice->patient_id) && $this->db->tableExists('patient_master_exten')) { if (! empty($invoice->patient_id) && $this->db->tableExists('patient_master')) {
$patient = $this->db->table('patient_master_exten')->where('id', (int) $invoice->patient_id)->get()->getRow();
} elseif (! empty($invoice->patient_id) && $this->db->tableExists('patient_master')) {
$patient = $this->db->table('patient_master')->where('id', (int) $invoice->patient_id)->get()->getRow(); $patient = $this->db->table('patient_master')->where('id', (int) $invoice->patient_id)->get()->getRow();
} }
@ -3745,12 +3737,10 @@ class Medical extends BaseController
} }
$patientId = (int) ($ipd->p_id ?? ($ipd->patient_id ?? 0)); $patientId = (int) ($ipd->p_id ?? ($ipd->patient_id ?? 0));
$patientTable = $this->db->tableExists('patient_master_exten') $patientTable = 'patient_master';
? 'patient_master_exten'
: ($this->db->tableExists('patient_master') ? 'patient_master' : null);
$patient = null; $patient = null;
if ($patientId > 0 && $patientTable) { if ($patientId > 0 && $this->db->tableExists($patientTable)) {
$patient = $this->db->table($patientTable)->where('id', $patientId)->get()->getRow(); $patient = $this->db->table($patientTable)->where('id', $patientId)->get()->getRow();
} }
@ -4543,11 +4533,9 @@ class Medical extends BaseController
return []; return [];
} }
$patientTable = $this->db->tableExists('patient_master_exten') $patientTable = 'patient_master';
? 'patient_master_exten'
: ($this->db->tableExists('patient_master') ? 'patient_master' : null);
if (! $patientTable) { if (! $this->db->tableExists($patientTable)) {
return []; return [];
} }
@ -8749,11 +8737,9 @@ class Medical extends BaseController
return $this->response->setStatusCode(400)->setBody('UHID is required.'); return $this->response->setStatusCode(400)->setBody('UHID is required.');
} }
$patientTable = $this->db->tableExists('patient_master_exten') $patientTable = 'patient_master';
? 'patient_master_exten'
: ($this->db->tableExists('patient_master') ? 'patient_master' : null);
if ($patientTable === null) { if (! $this->db->tableExists($patientTable)) {
return $this->response->setStatusCode(404)->setBody('Patient table not found.'); return $this->response->setStatusCode(404)->setBody('Patient table not found.');
} }