From ad248577201508655ee612e73d3a857791653033 Mon Sep 17 00:00:00 2001
From: DevSoftTech Server <info.devsofttech@gmail.com>
Date: Tue, 31 Mar 2026 03:31:26 +0530
Subject: [PATCH] feat: align consult Rx medicine controls with Rx-Group
 Add/Edit masters

- consult form medicine Dose/When/Freq changed to dropdowns from dose masters
- added Where dropdown in consult medicine editor and table display
- consult now loads options from Opd_prescription/rx_group_dose_masters
- medicine add/update payload now includes dosage_where
- medicine list now returns dosage_where_label for readable table output
- edit mode supports existing values not present in current master set
- quick chips now map into select options (with safe fallback)
---
 app/Controllers/Opd_prescription.php         |   6 +
 app/Views/billing/opd_prescription_basic.php | 134 +++++++++++++++++--
 2 files changed, 127 insertions(+), 13 deletions(-)

diff --git a/app/Controllers/Opd_prescription.php b/app/Controllers/Opd_prescription.php
index 72ee6ac..8441c37 100644
--- a/app/Controllers/Opd_prescription.php
+++ b/app/Controllers/Opd_prescription.php
@@ -3921,11 +3921,13 @@ class Opd_prescription extends BaseController
         $doseMap = $this->getDoseMasterLabelMap('opd_dose_shed', ['dose_shed_id', 'id'], ['dose_show_sign', 'dose_sign', 'dose_sign_desc', 'name']);
         $whenMap = $this->getDoseMasterLabelMap('opd_dose_when', ['dose_when_id', 'id'], ['dose_sign', 'dose_sign_desc', 'name']);
         $freqMap = $this->getDoseMasterLabelMap('opd_dose_frequency', ['dose_freq_id', 'id'], ['dose_sign', 'dose_sign_desc', 'name']);
+        $whereMap = $this->getDoseMasterLabelMap('opd_dose_where', ['dose_where_id', 'id'], ['dose_sign', 'dose_sign_desc', 'name']);
 
         foreach ($rows as &$row) {
             $row['dosage_label'] = $this->resolveDoseMasterLabel($row['dosage'] ?? '', $doseMap);
             $row['dosage_when_label'] = $this->resolveDoseMasterLabel($row['dosage_when'] ?? '', $whenMap);
             $row['dosage_freq_label'] = $this->resolveDoseMasterLabel($row['dosage_freq'] ?? '', $freqMap);
+            $row['dosage_where_label'] = $this->resolveDoseMasterLabel($row['dosage_where'] ?? '', $whereMap);
         }
         unset($row);
 
@@ -3985,6 +3987,9 @@ class Opd_prescription extends BaseController
         if (in_array('dosage_freq', $fields, true)) {
             $insert['dosage_freq'] = trim((string) $this->request->getPost('dosage_freq'));
         }
+        if (in_array('dosage_where', $fields, true)) {
+            $insert['dosage_where'] = trim((string) $this->request->getPost('dosage_where'));
+        }
         if (in_array('no_of_days', $fields, true)) {
             $insert['no_of_days'] = trim((string) $this->request->getPost('no_of_days'));
         }
@@ -4180,6 +4185,7 @@ class Opd_prescription extends BaseController
             'dosage' => trim((string) $this->request->getPost('dosage')),
             'dosage_when' => trim((string) $this->request->getPost('dosage_when')),
             'dosage_freq' => trim((string) $this->request->getPost('dosage_freq')),
+            'dosage_where' => trim((string) $this->request->getPost('dosage_where')),
             'no_of_days' => trim((string) $this->request->getPost('no_of_days')),
             'qty' => trim((string) $this->request->getPost('qty')),
             'remark' => strtoupper(trim((string) $this->request->getPost('remark'))),
diff --git a/app/Views/billing/opd_prescription_basic.php b/app/Views/billing/opd_prescription_basic.php
index ed2fec6..a911c1e 100644
--- a/app/Views/billing/opd_prescription_basic.php
+++ b/app/Views/billing/opd_prescription_basic.php
@@ -762,13 +762,19 @@
                                     <input type="text" class="form-control" id="med_type" placeholder="Type">
                                 </div>
                                 <div class="col-md-2">
-                                    <input type="text" class="form-control" id="med_dosage" placeholder="Dose">
+                                    <select class="form-select" id="med_dosage">
+                                        <option value="">Dose</option>
+                                    </select>
                                 </div>
                                 <div class="col-md-2">
-                                    <input type="text" class="form-control" id="med_when" placeholder="When">
+                                    <select class="form-select" id="med_when">
+                                        <option value="">When</option>
+                                    </select>
                                 </div>
                                 <div class="col-md-2">
-                                    <input type="text" class="form-control" id="med_freq" placeholder="Freq">
+                                    <select class="form-select" id="med_freq">
+                                        <option value="">Freq</option>
+                                    </select>
                                 </div>
                             </div>
                             <div class="row g-2 mb-3">
@@ -778,7 +784,12 @@
                                 <div class="col-md-2">
                                     <input type="text" class="form-control" id="med_qty" placeholder="Qty">
                                 </div>
-                                <div class="col-md-6">
+                                <div class="col-md-2">
+                                    <select class="form-select" id="med_where">
+                                        <option value="">Where</option>
+                                    </select>
+                                </div>
+                                <div class="col-md-4">
                                     <input type="text" class="form-control" id="med_remark" placeholder="Remark">
                                 </div>
                                 <div class="col-md-2 d-grid gap-2">
@@ -817,10 +828,10 @@
                                 <table class="table table-bordered table-sm rx-list-table" id="tbl_medicine">
                                     <thead>
                                         <tr>
-                                            <th>Medicine</th><th>Type</th><th>Dose</th><th>When</th><th>Freq</th><th>Days</th><th>Qty</th><th>Remark</th><th width="170">Action</th>
+                                            <th>Medicine</th><th>Type</th><th>Dose</th><th>When</th><th>Freq</th><th>Where</th><th>Days</th><th>Qty</th><th>Remark</th><th width="170">Action</th>
                                         </tr>
                                     </thead>
-                                    <tbody><tr><td colspan="9" class="text-muted">No medicine added</td></tr></tbody>
+                                    <tbody><tr><td colspan="10" class="text-muted">No medicine added</td></tr></tbody>
                                 </table>
                             </div>
                         </div>
@@ -987,6 +998,7 @@
     var investigationBatchActive = false;
     var activeMedicineScope = 'active';
     var medicineSuggestRows = [];
+    var medicineDoseMasterCache = { dose: [], when: [], freq: [], where: [] };
     var investigationProfiles = {
         cardiac: ['ECG', 'Lipid Profile', 'CBC'],
         viral_infection: ['CBC', 'LFT', 'KFT']
@@ -1023,6 +1035,84 @@
         }, 'json');
     }
 
+    function renderMedicineMasterSelectOptions($select, rows, placeholder) {
+        var html = '<option value="">' + $('<div>').text(placeholder || 'Select').html() + '</option>';
+        (rows || []).forEach(function(row) {
+            var id = (row && row.id !== undefined) ? String(row.id) : '';
+            var label = (row && row.label !== undefined) ? String(row.label) : '';
+            if (!id || !label) {
+                return;
+            }
+            html += '<option value="' + $('<div>').text(id).html() + '">' + $('<div>').text(label).html() + '</option>';
+        });
+        $select.html(html);
+    }
+
+    function ensureMedicineMasterOption($select, value) {
+        value = (value || '').toString().trim();
+        if (!value) {
+            return;
+        }
+
+        if ($select.find('option[value="' + value.replace(/"/g, '&quot;') + '"]').length) {
+            return;
+        }
+
+        $select.append('<option value="' + $('<div>').text(value).html() + '">' + $('<div>').text(value + ' (Current)').html() + '</option>');
+    }
+
+    function setMedicineSelectByLabel(selectId, labelText) {
+        var $sel = $('#' + selectId);
+        if (!$sel.length) {
+            return;
+        }
+
+        var probe = (labelText || '').toString().trim().toLowerCase();
+        if (!probe) {
+            $sel.val('').trigger('change');
+            return;
+        }
+
+        var matchedVal = '';
+        $sel.find('option').each(function() {
+            var txt = ($(this).text() || '').toString().trim().toLowerCase();
+            if (!txt) {
+                return;
+            }
+            if (txt === probe || txt.indexOf(probe) !== -1) {
+                matchedVal = ($(this).val() || '').toString();
+                return false;
+            }
+        });
+
+        if (!matchedVal) {
+            ensureMedicineMasterOption($sel, labelText);
+            matchedVal = labelText;
+        }
+
+        $sel.val(matchedVal).trigger('change');
+    }
+
+    function loadMedicineDoseMasters(done) {
+        apiGet('<?= base_url('Opd_prescription/rx_group_dose_masters') ?>', function(data) {
+            medicineDoseMasterCache = {
+                dose: (data && data.dose) ? data.dose : [],
+                when: (data && data.when) ? data.when : [],
+                freq: (data && data.freq) ? data.freq : [],
+                where: (data && data.where) ? data.where : []
+            };
+
+            renderMedicineMasterSelectOptions($('#med_dosage'), medicineDoseMasterCache.dose, 'Dose');
+            renderMedicineMasterSelectOptions($('#med_when'), medicineDoseMasterCache.when, 'When');
+            renderMedicineMasterSelectOptions($('#med_freq'), medicineDoseMasterCache.freq, 'Freq');
+            renderMedicineMasterSelectOptions($('#med_where'), medicineDoseMasterCache.where, 'Where');
+
+            if (typeof done === 'function') {
+                done();
+            }
+        });
+    }
+
     function getCsrfPair() {
         var input = document.querySelector('input[name="<?= csrf_token() ?>"]');
         if (!input) {
@@ -3731,6 +3821,7 @@
     refreshCustomProfileSelect();
     loadInvestigationShortcutsFromLegacy();
     initInvestigationPicker();
+    loadMedicineDoseMasters();
     $('#advise_investigation_notes').val($('#investigation').val() || '');
 
     $(document).on('click', '.btn-del-invest', function() {
@@ -3744,7 +3835,7 @@
         var $tb = $('#tbl_medicine tbody');
         $tb.empty();
         if (!rows || rows.length === 0) {
-            $tb.html('<tr><td colspan="9" class="text-muted">No medicine added</td></tr>');
+            $tb.html('<tr><td colspan="10" class="text-muted">No medicine added</td></tr>');
             return;
         }
         function esc(v) {
@@ -3755,17 +3846,19 @@
             var dosageText = row.dosage_label || row.dosage || '';
             var whenText = row.dosage_when_label || row.dosage_when || '';
             var freqText = row.dosage_freq_label || row.dosage_freq || '';
+            var whereText = row.dosage_where_label || row.dosage_where || '';
             $tb.append('<tr>' +
                 '<td>' + esc(row.med_name) + '</td>' +
                 '<td>' + esc(row.med_type) + '</td>' +
                 '<td>' + esc(dosageText) + '</td>' +
                 '<td>' + esc(whenText) + '</td>' +
                 '<td>' + esc(freqText) + '</td>' +
+                '<td>' + esc(whereText) + '</td>' +
                 '<td>' + esc(row.no_of_days) + '</td>' +
                 '<td>' + esc(row.qty) + '</td>' +
                 '<td>' + esc(row.remark) + '</td>' +
                 '<td>' +
-                    '<button type="button" class="btn btn-sm btn-outline-primary btn-edit-med me-1" data-id="' + rowId + '" data-name="' + esc(row.med_name) + '" data-type="' + esc(row.med_type) + '" data-dose="' + esc(row.dosage) + '" data-when="' + esc(row.dosage_when) + '" data-freq="' + esc(row.dosage_freq) + '" data-days="' + esc(row.no_of_days) + '" data-qty="' + esc(row.qty) + '" data-remark="' + esc(row.remark) + '">Edit</button>' +
+                    '<button type="button" class="btn btn-sm btn-outline-primary btn-edit-med me-1" data-id="' + rowId + '" data-name="' + esc(row.med_name) + '" data-type="' + esc(row.med_type) + '" data-dose="' + esc(row.dosage) + '" data-when="' + esc(row.dosage_when) + '" data-freq="' + esc(row.dosage_freq) + '" data-where="' + esc(row.dosage_where) + '" data-days="' + esc(row.no_of_days) + '" data-qty="' + esc(row.qty) + '" data-remark="' + esc(row.remark) + '">Edit</button>' +
                     '<button type="button" class="btn btn-sm btn-danger btn-del-med" data-id="' + rowId + '">Remove</button>' +
                 '</td>' +
             '</tr>');
@@ -3773,7 +3866,8 @@
     }
 
     function clearMedicineForm(resetEdit) {
-        $('#med_name,#med_type,#med_dosage,#med_when,#med_freq,#med_days,#med_qty,#med_remark').val('');
+        $('#med_name,#med_type,#med_days,#med_qty,#med_remark').val('');
+        $('#med_dosage,#med_when,#med_freq,#med_where').val('');
         $('#med_name').removeData('med-id');
         $('#substitute_box').hide();
         $('#substitute_rows').empty();
@@ -3791,9 +3885,14 @@
         $('#med_name').val(row.name || '');
         $('#med_name').removeData('med-id');
         $('#med_type').val(row.type || '');
-        $('#med_dosage').val(row.dose || '');
-        $('#med_when').val(row.when || '');
-        $('#med_freq').val(row.freq || '');
+        ensureMedicineMasterOption($('#med_dosage'), row.dose || '');
+        ensureMedicineMasterOption($('#med_when'), row.when || '');
+        ensureMedicineMasterOption($('#med_freq'), row.freq || '');
+        ensureMedicineMasterOption($('#med_where'), row.where || '');
+        $('#med_dosage').val((row.dose || '').toString());
+        $('#med_when').val((row.when || '').toString());
+        $('#med_freq').val((row.freq || '').toString());
+        $('#med_where').val((row.where || '').toString());
         $('#med_days').val(row.days || '');
         $('#med_qty').val(row.qty || '');
         $('#med_remark').val(row.remark || '');
@@ -4246,6 +4345,7 @@
                 dosage: $('#med_dosage').val(),
                 dosage_when: $('#med_when').val(),
                 dosage_freq: $('#med_freq').val(),
+                dosage_where: $('#med_where').val(),
                 no_of_days: $('#med_days').val(),
                 qty: $('#med_qty').val(),
                 remark: $('#med_remark').val()
@@ -4276,6 +4376,7 @@
             dose: $(this).data('dose') || '',
             when: $(this).data('when') || '',
             freq: $(this).data('freq') || '',
+            where: $(this).data('where') || '',
             days: $(this).data('days') || '',
             qty: $(this).data('qty') || '',
             remark: $(this).data('remark') || ''
@@ -4329,7 +4430,13 @@
         if (!target || !$('#' + target).length) {
             return;
         }
-        $('#' + target).val(value).trigger('change').focus();
+        var $target = $('#' + target);
+        if ($target.is('select')) {
+            setMedicineSelectByLabel(target, value);
+            $target.focus();
+            return;
+        }
+        $target.val(value).trigger('change').focus();
     });
 
     $(document).on('click', '.btn-substitute-use', function() {
@@ -4375,6 +4482,7 @@
                 dosage: $('#med_dosage').val(),
                 dosage_when: $('#med_when').val(),
                 dosage_freq: $('#med_freq').val(),
+                dosage_where: $('#med_where').val(),
                 no_of_days: $('#med_days').val(),
                 qty: $('#med_qty').val(),
                 remark: $('#med_remark').val()