This commit is contained in:
Your Name
2026-07-09 17:58:02 +08:00
parent a650747fd3
commit f5a89b4310
290 changed files with 478 additions and 332 deletions
@@ -1453,7 +1453,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
->column('revisit_slot_start_offset', 'id');
$offsetMap = [];
foreach ($offsetRows as $id => $offset) {
$offsetMap[(int) $id] = max(1, min(20, (int) $offset));
$offsetMap[(int) $id] = max(0, min(20, (int) $offset));
}
/** @var array<int, int> $seqByOrderId order_id => global seq within diagnosis */
@@ -1475,7 +1475,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
$oid = (int) ($row['id'] ?? 0);
$did = (int) ($row['diagnosis_id'] ?? 0);
$seq = (int) ($seqByOrderId[$oid] ?? 0);
$offset = (int) ($offsetMap[$did] ?? 1);
$offset = (int) ($offsetMap[$did] ?? 0);
$effectiveSlot = $seq > 0 ? $seq + $offset : 0;
$row['global_visit_seq'] = $effectiveSlot > 0 ? $effectiveSlot : null;
$row['raw_visit_seq'] = $seq > 0 ? $seq : null;