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

fix: count OPD visits up to printed opd date

Browse Source
This commit is contained in:
DevSoftTech Server 2026-04-10 21:30:47 +05:30
parent 920f1033c0
commit f748224cd0
1 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/Controllers/Opd.php
View File

@ -2723,7 +2723,30 @@ class Opd extends BaseController
->where('p_id', $patientId);
$currentOpdId = (int) ($opdRow->opd_id ?? 0);
if ($currentOpdId > 0) {
$currentOpdDateTime = trim((string) ($opdRow->apointment_date ?? ''));
$currentOpdDate = '';
if ($currentOpdDateTime !== '') {
$ts = strtotime($currentOpdDateTime);
if ($ts !== false) {
$currentOpdDate = date('Y-m-d', $ts);
}
}
if ($currentOpdDate !== '') {
// Count visits up to the current OPD date; for same date, limit to current row id.
$builder->groupStart()
->where('date(apointment_date) <', $currentOpdDate)
->orGroupStart()
->where('date(apointment_date)', $currentOpdDate);
if ($currentOpdId > 0) {
$builder->where('opd_id <=', $currentOpdId);
}
$builder->groupEnd()
->groupEnd();
} elseif ($currentOpdId > 0) {
// Fallback for rows without appointment date.
$builder->where('opd_id <=', $currentOpdId);
}