From ca4b4195aac4e82676aadd558f74500ba64df31d Mon Sep 17 00:00:00 2001
From: DevSoftTech Server <info.devsofttech@gmail.com>
Date: Mon, 6 Apr 2026 12:51:11 +0530
Subject: [PATCH] fix: keep new OPD appointments in booked list

---
 app/Controllers/Opd.php                       | 34 -------------------
 app/Views/billing/opd_appointment_list.php    |  8 ++---
 .../billing/opd_appointment_list_table.php    | 23 +++----------
 3 files changed, 8 insertions(+), 57 deletions(-)

diff --git a/app/Controllers/Opd.php b/app/Controllers/Opd.php
index 1eba0f0..47f7ab1 100644
--- a/app/Controllers/Opd.php
+++ b/app/Controllers/Opd.php
@@ -845,7 +845,6 @@ class Opd extends BaseController
 
         $opdList0 = [];
         $opdList1 = [];
-        $opdListWaitingAll = [];
         $opdList2 = [];
         $opdList3 = [];
 
@@ -864,13 +863,11 @@ class Opd extends BaseController
 
             if ($status === 1 && ! $hasPrescription) {
                 $opdList0[] = $row;
-                $opdListWaitingAll[] = $row;
                 continue;
             }
 
             if ($status === 1 && $hasPrescription) {
                 $opdList1[] = $row;
-                $opdListWaitingAll[] = $row;
                 continue;
             }
 
@@ -906,36 +903,6 @@ class Opd extends BaseController
             return ((int) ($left->opd_id ?? 0)) <=> ((int) ($right->opd_id ?? 0));
         });
 
-        usort($opdListWaitingAll, static function ($left, $right): int {
-            $leftHasPrescription = (int) ($left->has_prescription ?? 0);
-            $rightHasPrescription = (int) ($right->has_prescription ?? 0);
-            if ($leftHasPrescription !== $rightHasPrescription) {
-                return $rightHasPrescription <=> $leftHasPrescription;
-            }
-
-            if ($leftHasPrescription === 1) {
-                $leftVitals = (int) ($left->has_vitals ?? 0);
-                $rightVitals = (int) ($right->has_vitals ?? 0);
-                if ($leftVitals !== $rightVitals) {
-                    return $leftVitals <=> $rightVitals;
-                }
-
-                $leftQueue = (int) ($left->queue_no ?? 0);
-                $rightQueue = (int) ($right->queue_no ?? 0);
-                if ($leftQueue !== $rightQueue) {
-                    return $leftQueue <=> $rightQueue;
-                }
-            }
-
-            $leftConfirmed = (int) ($left->is_confirmed_for_queue ?? 0);
-            $rightConfirmed = (int) ($right->is_confirmed_for_queue ?? 0);
-            if ($leftConfirmed !== $rightConfirmed) {
-                return $rightConfirmed <=> $leftConfirmed;
-            }
-
-            return ((int) ($left->opd_id ?? 0)) <=> ((int) ($right->opd_id ?? 0));
-        });
-
         usort($opdList2, static function ($left, $right): int {
             return ((int) ($left->opd_id ?? 0)) <=> ((int) ($right->opd_id ?? 0));
         });
@@ -956,7 +923,6 @@ class Opd extends BaseController
             'doc_master' => $docMaster,
             'opd_list_0' => $opdList0,
             'opd_list_1' => $opdList1,
-            'opd_list_waiting_all' => $opdListWaitingAll,
             'opd_list_2' => $opdList2,
             'opd_list_3' => $opdList3,
         ]);
diff --git a/app/Views/billing/opd_appointment_list.php b/app/Views/billing/opd_appointment_list.php
index fb95369..6f71ea3 100644
--- a/app/Views/billing/opd_appointment_list.php
+++ b/app/Views/billing/opd_appointment_list.php
@@ -33,7 +33,7 @@
                     <label class="form-check-label" for="toggle_missing_vitals_only">Only Missing Vitals</label>
                 </div>
             </div>
-            <?= view('billing/opd_appointment_list_table', ['rows' => $opd_list_waiting_all ?? $opd_list_1, 'showQueue' => true, 'tabType' => 'waiting', 'opd_date' => $opd_date, 'doc_id' => $doc_id]) ?>
+            <?= view('billing/opd_appointment_list_table', ['rows' => $opd_list_1, 'showQueue' => true, 'tabType' => 'waiting', 'opd_date' => $opd_date, 'doc_id' => $doc_id]) ?>
             <div id="waitingNoRowsHint" class="small text-muted mt-2 d-none">All waiting patients already have vitals.</div>
         </div>
         <div class="tab-pane fade" id="tab_visited">
@@ -158,8 +158,7 @@
 
         $rows.each(function() {
             var hasVitals = parseInt($(this).attr('data-has-vitals') || '0', 10) === 1;
-            var hasPrescription = parseInt($(this).attr('data-has-prescription') || '0', 10) === 1;
-            var show = !onlyMissing || (hasPrescription && !hasVitals);
+            var show = !onlyMissing || !hasVitals;
             $(this).toggle(show);
             if (show) {
                 visibleCount++;
@@ -174,8 +173,7 @@
         var missingCount = 0;
         $('#tab_waiting tbody tr[data-opd-id]').each(function() {
             var hasVitals = parseInt($(this).attr('data-has-vitals') || '0', 10) === 1;
-            var hasPrescription = parseInt($(this).attr('data-has-prescription') || '0', 10) === 1;
-            if (hasPrescription && !hasVitals) {
+            if (!hasVitals) {
                 missingCount++;
             }
         });
diff --git a/app/Views/billing/opd_appointment_list_table.php b/app/Views/billing/opd_appointment_list_table.php
index b732802..fa3dba6 100644
--- a/app/Views/billing/opd_appointment_list_table.php
+++ b/app/Views/billing/opd_appointment_list_table.php
@@ -22,20 +22,19 @@ if ($authUser) {
         <tbody>
         <?php if (!empty($rows)) : ?>
             <?php foreach ($rows as $row) : ?>
-                <tr data-opd-id="<?= esc((int) ($row->opd_id ?? 0)) ?>" data-has-vitals="<?= esc((int) ($row->has_vitals ?? 0)) ?>" data-has-prescription="<?= esc((int) ($row->has_prescription ?? 0)) ?>">
+                <tr data-opd-id="<?= esc((int) ($row->opd_id ?? 0)) ?>" data-has-vitals="<?= esc((int) ($row->has_vitals ?? 0)) ?>">
                     <td><?= esc($row->opd_code ?? '') ?></td>
                     <td><?= esc(($row->P_name ?? '') . ' { ' . ($row->p_rname ?? '') . ' }') ?></td>
-                    <?php if (!empty($showQueue)) : ?><td><?= (int) ($row->has_prescription ?? 0) === 1 ? esc((int) ($row->queue_no ?? 0)) : '-' ?></td><?php endif; ?>
+                    <?php if (!empty($showQueue)) : ?><td><?= esc((int) ($row->queue_no ?? 0)) ?></td><?php endif; ?>
                     <td><?= esc($row->p_code ?? '') ?></td>
                     <td><?= esc($row->opd_type ?? '') ?> / Amt: <?= esc($row->opd_fee_amount ?? '') ?></td>
                     <td>
                         <?php $hasVitals = isset($row->has_vitals) && (int) $row->has_vitals === 1; ?>
                         <?php $isBookedTab = ($tabType ?? '') === 'booking'; ?>
-                        <?php $isWaitingTab = ($tabType ?? '') === 'waiting'; ?>
                         <?php $isConfirmedForQueue = (int) ($row->is_confirmed_for_queue ?? 0) === 1; ?>
                         <?php $hasPrescription = (int) ($row->has_prescription ?? 0) === 1; ?>
 
-                        <?php if (! $hasPrescription) : ?>
+                        <?php if ($isBookedTab) : ?>
                             <?php if ($isConfirmedForQueue) : ?>
                                 <button type="button" class="btn btn-outline-success btn-sm btn-opd-create-queue" data-opdid="<?= esc((int) ($row->opd_id ?? 0)) ?>" title="Queue">
                                     Queue
@@ -45,9 +44,7 @@ if ($authUser) {
                                     Go For Payment
                                 </a>
                             <?php endif; ?>
-                        <?php endif; ?>
-
-                        <?php if ($hasPrescription) : ?>
+                        <?php else : ?>
                             <?php if ($canOpenPrescription) : ?>
                                 <a class="btn btn-outline-primary btn-sm" title="Consult" href="javascript:load_form('/Opd_prescription/Prescription/<?= esc((int) ($row->opd_id ?? 0)) ?>','Consult');">
                                     Consult
@@ -65,19 +62,9 @@ if ($authUser) {
                             <button type="button" class="btn btn-outline-dark btn-sm btn-opd-scan-list" title="Scan Document List" data-opdid="<?= esc((int) ($row->opd_id ?? 0)) ?>">
                                 Scan Doc List
                             </button>
-                        <?php elseif ($isWaitingTab) : ?>
-                            <button type="button" class="btn btn-outline-info btn-sm btn-opd-scan" title="Scan" data-opdid="<?= esc((int) ($row->opd_id ?? 0)) ?>">
-                                Scan
-                            </button>
-                            <button type="button" class="btn btn-outline-secondary btn-sm btn-opd-scan" title="Upload Scan" data-opdid="<?= esc((int) ($row->opd_id ?? 0)) ?>">
-                                Upload
-                            </button>
-                            <button type="button" class="btn btn-outline-dark btn-sm btn-opd-scan-list" title="Scan Document List" data-opdid="<?= esc((int) ($row->opd_id ?? 0)) ?>">
-                                Scan Doc List
-                            </button>
                         <?php endif; ?>
 
-                        <?php if (($tabType ?? '') === 'waiting' && $hasPrescription) : ?>
+                        <?php if (($tabType ?? '') === 'waiting') : ?>
                             <button type="button" class="btn btn-outline-success btn-sm btn-opd-status" data-opd-id="<?= esc((int) ($row->opd_id ?? 0)) ?>" data-opd-status="2" title="Visit Done">
                                 Visit Done
                             </button>