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

OPD template: split opd fee into amount and description placeholders

Browse Source
This commit is contained in:
DevSoftTech Server 2026-07-02 09:40:25 +05:30
parent 0f8bd43e72
commit e85bfd85e1
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Controllers/Opd.php
View File

@ -120,7 +120,7 @@ class Opd extends BaseController
// Patient // Patient
'pName', 'pRelative', 'age_sex', 'phoneno', 'p_address', 'pName', 'pRelative', 'age_sex', 'phoneno', 'p_address',
'uhid_no', 'opd_sr_no', 'opd_no', 'opd_date', 'exp_date', 'uhid_no', 'opd_sr_no', 'opd_no', 'opd_date', 'exp_date',
'opd_fee_desc', 'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date', 'opd_fee_amount', 'opd_fee_desc', 'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date',
// General Examination (raw values) // General Examination (raw values)
'bp', 'bp_diastolic', 'pulse', 'temp', 'spo2', 'rr_min', 'bp', 'bp_diastolic', 'pulse', 'temp', 'spo2', 'rr_min',
'height', 'weight', 'waist', 'height', 'weight', 'waist',
@ -2543,7 +2543,9 @@ class Opd extends BaseController
$specName = trim((string) ($doctor->SpecName ?? $opd->doc_spec ?? '')); $specName = trim((string) ($doctor->SpecName ?? $opd->doc_spec ?? ''));
$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 ?? ''))); $opdFeeAmount = trim((string) ($opd->opd_fee_amount ?? ''));
$opdFeeDescription = trim((string) ($opd->opd_fee_desc ?? ''));
$opdFeeDisplay = trim($opdFeeAmount . ' ' . $opdFeeDescription);
$totalNoVisit = $this->resolveTotalOpdVisitCountForPrint($opd); $totalNoVisit = $this->resolveTotalOpdVisitCountForPrint($opd);
$lastVisitDate = ''; $lastVisitDate = '';
$lastVisitText = ''; $lastVisitText = '';
@ -3022,7 +3024,7 @@ class Opd extends BaseController
. '</td>' . '</td>'
. '<td width="33.3%" valign="top">' . '<td width="33.3%" valign="top">'
. '<b>DEPARTMENT :</b><br>' . esc($specName) . '<br>' . '<b>DEPARTMENT :</b><br>' . esc($specName) . '<br>'
. esc($opdFeeDesc) . '<br>' . esc($opdFeeDisplay) . '<br>'
. '<b>No. of Visit</b> : ' . esc($totalNoVisit) . '<br>' . '<b>No. of Visit</b> : ' . esc($totalNoVisit) . '<br>'
. esc($lastVisitText) . '<br>' . esc($lastVisitText) . '<br>'
. 'Book Time : ' . esc($bookTime) . 'Book Time : ' . esc($bookTime)
@ -3054,7 +3056,8 @@ class Opd extends BaseController
'SpecName' => $specName, 'SpecName' => $specName,
'short_description' => $doctorShortDescription, 'short_description' => $doctorShortDescription,
'doctor_short_description' => $doctorShortDescription, 'doctor_short_description' => $doctorShortDescription,
'opd_fee_desc' => $opdFeeDesc, 'opd_fee_amount' => $opdFeeAmount,
'opd_fee_desc' => $opdFeeDescription,
'total_no_visit' => $totalNoVisit, 'total_no_visit' => $totalNoVisit,
'last_opdvisit_date' => $lastVisitDate, 'last_opdvisit_date' => $lastVisitDate,
'str_opd_book_date' => $bookTime, 'str_opd_book_date' => $bookTime,

2
app/Views/billing/opd_template_builder.php
View File

@ -39,7 +39,7 @@ $patientSet = [
]; ];
$opdMasterSet = [ $opdMasterSet = [
'opd_sr_no', 'opd_no', 'opd_date', 'exp_date', 'opd_fee_desc', 'opd_sr_no', 'opd_no', 'opd_date', 'exp_date', 'opd_fee_amount', 'opd_fee_desc',
'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date', 'total_no_visit', 'last_opdvisit_date', 'str_opd_book_date',
'doctor_name', 'doctor_full_name', 'doctor_title', 'doctor_name', 'doctor_full_name', 'doctor_title',
'doctor_reg_no', 'doctor_registration', 'doctor_reg_no', 'doctor_registration',