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

OPD template: keep {{investigation}} print order by sequence

Browse Source
This commit is contained in:
DevSoftTech Server 2026-07-02 19:34:41 +05:30
parent c832b3a3e2
commit c22c21d36c
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controllers/Opd.php
View File

@ -4936,10 +4936,16 @@ class Opd extends BaseController
$hasFilter = true;
}
if ($hasFilter) {
if (in_array('investigation_name', $invFields, true)) {
$invBuilder->orderBy('investigation_name', 'ASC');
if (in_array('order_id', $invFields, true)) {
$invBuilder->orderBy('CASE WHEN order_id IS NULL OR order_id = 0 THEN 1 ELSE 0 END', 'ASC', false);
$invBuilder->orderBy('order_id', 'ASC');
if (in_array('id', $invFields, true)) {
$invBuilder->orderBy('id', 'ASC');
}
} elseif (in_array('id', $invFields, true)) {
$invBuilder->orderBy('id', 'ASC');
} elseif (in_array('investigation_name', $invFields, true)) {
$invBuilder->orderBy('investigation_name', 'ASC');
}
$data['rx_investigations'] = $invBuilder->get()->getResultArray();
} else {