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

Preserve investigation profile test master order

Browse Source
This commit is contained in:
DevSoftTech Server 2026-06-11 19:22:09 +05:30
parent 0c2e1385cb
commit eefda96dca
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_prescription.php
View File

@ -3925,6 +3925,7 @@ class Opd_prescription extends BaseController
$jPrintOrder = $this->resolveFirstField($jFields, ['printOrder', 'print_order', 'id']);
$iCode = $this->resolveFirstField($iFields, ['Code', 'code']);
$iName = $this->resolveFirstField($iFields, ['Name', 'name']);
$iSortOrder = $this->resolveFirstField($iFields, ['sort_id', 'sort_order', 'id', 'Code', 'code']);
if ($pCode === null || $pName === null || $jProfileCode === null || $jInvestCode === null || $iCode === null || $iName === null) {
return [];
@ -3946,7 +3947,9 @@ class Opd_prescription extends BaseController
$params[] = '%' . $filter . '%';
}
$sql .= 'ORDER BY p.`' . $pName . '` ASC';
if ($jPrintOrder !== null) {
if ($iSortOrder !== null) {
$sql .= ', i.`' . $iSortOrder . '` ASC';
} elseif ($jPrintOrder !== null) {
$sql .= ', j.`' . $jPrintOrder . '` ASC';
}
@ -6991,10 +6994,13 @@ class Opd_prescription extends BaseController
$jPrintOrder = $this->resolveFirstField($jFields, ['printOrder', 'print_order', 'id']);
$iCode = $this->resolveFirstField($iFields, ['Code', 'code']);
$iName = $this->resolveFirstField($iFields, ['Name', 'name']);
$iSortOrder = $this->resolveFirstField($iFields, ['sort_id', 'sort_order', 'id', 'Code', 'code']);
if ($pCode !== null && $pName !== null && $jProfileCode !== null && $jInvestCode !== null && $iCode !== null && $iName !== null) {
$orderExpr = 'p.`' . $pName . '` ASC';
if ($jPrintOrder !== null) {
if ($iSortOrder !== null) {
$orderExpr .= ', i.`' . $iSortOrder . '` ASC';
} elseif ($jPrintOrder !== null) {
$orderExpr .= ', j.`' . $jPrintOrder . '` ASC';
}