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

fix: populate last_opdvisit_date token in OPD print templates with previous visit date

Browse Source
This commit is contained in:
DevSoftTech Server 2026-04-06 10:42:03 +05:30
parent 2fc4fbd82c
commit 8a3157e579
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Controllers/Opd.php
View File

@ -1817,9 +1817,11 @@ class Opd extends BaseController
$doctorShortDescription = trim((string) ($doctor->doc_sign ?? $opd->doc_sign ?? '')); $doctorShortDescription = trim((string) ($doctor->doc_sign ?? $opd->doc_sign ?? ''));
$opdFeeDesc = trim((string) (($opd->opd_fee_amount ?? '') . ' ' . ($opd->opd_fee_desc ?? ''))); $opdFeeDesc = trim((string) (($opd->opd_fee_amount ?? '') . ' ' . ($opd->opd_fee_desc ?? '')));
$totalNoVisit = (string) ($opd->no_visit ?? ''); $totalNoVisit = (string) ($opd->no_visit ?? '');
$lastVisitDate = '';
$lastVisitText = ''; $lastVisitText = '';
if (!empty($data['old_opd'][0]->str_apointment_date ?? '')) { if (!empty($data['old_opd'][0]->str_apointment_date ?? '')) {
$lastVisitText = 'Last Visit : ' . (string) $data['old_opd'][0]->str_apointment_date; $lastVisitDate = (string) $data['old_opd'][0]->str_apointment_date;
$lastVisitText = 'Last Visit : ' . $lastVisitDate;
} }
$bookTime = (string) ($opd->apointment_date ?? ''); $bookTime = (string) ($opd->apointment_date ?? '');
@ -2218,7 +2220,7 @@ class Opd extends BaseController
'doctor_short_description' => $doctorShortDescription, 'doctor_short_description' => $doctorShortDescription,
'opd_fee_desc' => $opdFeeDesc, 'opd_fee_desc' => $opdFeeDesc,
'total_no_visit' => $totalNoVisit, 'total_no_visit' => $totalNoVisit,
'last_opdvisit_date' => $lastVisitText, 'last_opdvisit_date' => $lastVisitDate,
'str_opd_book_date' => $bookTime, 'str_opd_book_date' => $bookTime,
'Complaint' => $complaintText, 'Complaint' => $complaintText,
'complaint' => $complaintText, 'complaint' => $complaintText,
@ -3116,7 +3118,8 @@ class Opd extends BaseController
$pRow->age = get_age_1($pRow->dob ?? null, $pRow->age ?? '', $pRow->age_in_month ?? '', $pRow->estimate_dob ?? '', $opdRow->apointment_date ?? null); $pRow->age = get_age_1($pRow->dob ?? null, $pRow->age ?? '', $pRow->age_in_month ?? '', $pRow->estimate_dob ?? '', $opdRow->apointment_date ?? null);
} }
$sql = "select *,date_format(date_add(apointment_date,interval " . $noOpdDays . " day),'%d-%m-%Y') as opd_Exp_Date $sql = "select *,date_format(apointment_date,'%d-%m-%Y') as str_apointment_date,
date_format(date_add(apointment_date,interval " . $noOpdDays . " day),'%d-%m-%Y') as opd_Exp_Date
from opd_master where p_id=" . (int) $opdRow->p_id . " and opd_id < " . (int) $opdId . " order by opd_id desc limit 1"; from opd_master where p_id=" . (int) $opdRow->p_id . " and opd_id < " . (int) $opdId . " order by opd_id desc limit 1";
$query = $this->db->query($sql); $query = $this->db->query($sql);
$data['old_opd'] = $query->getResult(); $data['old_opd'] = $query->getResult();