diff --git a/app/Controllers/Patient.php b/app/Controllers/Patient.php index 4f3f345..7a354fe 100644 --- a/app/Controllers/Patient.php +++ b/app/Controllers/Patient.php @@ -914,9 +914,33 @@ class Patient extends BaseController ]; } + // Resolve patient profile picture + $profileFilePath = '/assets/images/no_image.svg'; + $profilePicturePath = ''; + if ($this->db->fieldExists('profile_picture', 'patient_master')) { + $profilePicturePath = trim((string) ($patient->profile_picture ?? '')); + } + $profileFileId = (int) ($patient->profile_file_id ?? 0); + if ($profileFileId > 0 && $this->db->tableExists('file_upload_data')) { + $fileRow = $this->db->table('file_upload_data') + ->select('full_path') + ->where('id', $profileFileId) + ->get(1) + ->getRow(); + $fullPath = trim((string) ($fileRow->full_path ?? '')); + if ($fullPath !== '') { + $pos = strpos($fullPath, '/uploads/', 1); + $profileFilePath = $pos !== false ? substr($fullPath, $pos) : $fullPath; + } + } elseif ($profilePicturePath !== '') { + $pos = strpos($profilePicturePath, '/uploads/', 1); + $profileFilePath = $pos !== false ? substr($profilePicturePath, $pos) : $profilePicturePath; + } + return view('billing/Patient_Profile_Opd_V', [ 'patient' => $patient, 'opdGroups' => $opdGroups, + 'profile_file_path' => $profileFilePath, ]); } diff --git a/app/Views/billing/Patient_Profile_Opd_V.php b/app/Views/billing/Patient_Profile_Opd_V.php index 65f5b81..d02dce2 100644 --- a/app/Views/billing/Patient_Profile_Opd_V.php +++ b/app/Views/billing/Patient_Profile_Opd_V.php @@ -121,15 +121,22 @@
Patient Information
-
-
- Name: - +
+ +
+ Patient Photo
-
- Relation: - + +
+
+
+ +
+ +
+
Age: @@ -139,6 +146,7 @@
+
diff --git a/app/Views/billing/opd_prescription_basic.php b/app/Views/billing/opd_prescription_basic.php index c0b4aab..08a43c7 100644 --- a/app/Views/billing/opd_prescription_basic.php +++ b/app/Views/billing/opd_prescription_basic.php @@ -410,7 +410,10 @@
-
Name:
+
Patient Name:
+ +
+
UHID: p_code ?? '') ?>
Age: str_age ?? '') ?>
Gender: xgender ?? '') ?>