diff --git a/app/Controllers/Opd_prescription.php b/app/Controllers/Opd_prescription.php index 534234f..3e48b36 100644 --- a/app/Controllers/Opd_prescription.php +++ b/app/Controllers/Opd_prescription.php @@ -2278,6 +2278,12 @@ class Opd_prescription extends BaseController $data[$restrictionField] = trim((string) $this->request->getPost('dosage_restriction')); } + foreach (['dosage', 'dosage_when', 'dosage_freq', 'dosage_where', 'no_of_days', 'qty', 'remark'] as $dosageField) { + if (in_array($dosageField, $fields, true)) { + $data[$dosageField] = trim((string) $this->request->getPost($dosageField)); + } + } + if ($id > 0) { $this->db->table($table)->where('id', $id)->update($data); $savedId = $id; diff --git a/app/Views/billing/ipd/discharge_create.php b/app/Views/billing/ipd/discharge_create.php index 5486d58..a2f8700 100644 --- a/app/Views/billing/ipd/discharge_create.php +++ b/app/Views/billing/ipd/discharge_create.php @@ -749,20 +749,18 @@ $allergyStatusNoKnown = in_array($allergyStatusNormalized, ['no known drug aller
Drug Allergy / ADR (NABH)
-
Required: Drug Allergy Status is mandatory. If status is Known, Drug Allergy Details are mandatory.
- +
- +
@@ -3476,8 +3474,8 @@ $allergyStatusNoKnown = in_array($allergyStatusNormalized, ['no known drug aller var status = (statusEl.value || '').trim(); var details = detailsEl ? (detailsEl.value || '').trim() : ''; if (status === '') { - markNabhFieldError(form, '#drug_allergy_status', 'Drug Allergy Status is required as per NABH documentation.'); - return false; + statusEl.value = 'Allergies Not Known'; + status = 'Allergies Not Known'; } if (status.toLowerCase() === 'known' && details === '') { markNabhFieldError(form, '#drug_allergy_details', 'Drug Allergy Details are required when Drug Allergy Status is Known.'); diff --git a/app/Views/billing/opd_medicince_workspace.php b/app/Views/billing/opd_medicince_workspace.php index 4f0407f..a104a59 100644 --- a/app/Views/billing/opd_medicince_workspace.php +++ b/app/Views/billing/opd_medicince_workspace.php @@ -100,6 +100,39 @@
+
+
Prescription Defaults (auto-fills on consult form)
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
@@ -224,6 +257,7 @@ function clearForm() { $('#med_id').val('0'); $('#med_item_name,#med_formulation,#med_genericname,#med_salt_name,#med_dosage_restriction,#med_company_name').val(''); + $('#med_default_dosage,#med_default_when,#med_default_freq,#med_default_where,#med_default_days,#med_default_qty,#med_default_remark').val(''); } function buildMedicinePayload() { @@ -234,7 +268,14 @@ genericname: ($('#med_genericname').val() || '').trim(), salt_name: ($('#med_salt_name').val() || '').trim(), dosage_restriction: ($('#med_dosage_restriction').val() || '').trim(), - company_name: ($('#med_company_name').val() || '').trim() + company_name: ($('#med_company_name').val() || '').trim(), + dosage: ($('#med_default_dosage').val() || '').trim(), + dosage_when: ($('#med_default_when').val() || '').trim(), + dosage_freq: ($('#med_default_freq').val() || '').trim(), + dosage_where: ($('#med_default_where').val() || '').trim(), + no_of_days: ($('#med_default_days').val() || '').trim(), + qty: ($('#med_default_qty').val() || '').trim(), + remark: ($('#med_default_remark').val() || '').trim() }; } @@ -268,6 +309,13 @@ $('#med_salt_name').val(row.salt_name || row.sal_name || row.salt || row.saltname || ''); $('#med_dosage_restriction').val(row.dosage_restriction || row.dose_restriction || row.restriction_note || row.restriction || ''); $('#med_company_name').val(row.company_name || ''); + $('#med_default_dosage').val(row.dosage || ''); + $('#med_default_when').val(row.dosage_when || ''); + $('#med_default_freq').val(row.dosage_freq || ''); + $('#med_default_where').val(row.dosage_where || ''); + $('#med_default_days').val(row.no_of_days || ''); + $('#med_default_qty').val(row.qty || ''); + $('#med_default_remark').val(row.remark || ''); } function loadOne(medId) { diff --git a/app/Views/billing/opd_prescription_basic.php b/app/Views/billing/opd_prescription_basic.php index cc45f18..328996a 100644 --- a/app/Views/billing/opd_prescription_basic.php +++ b/app/Views/billing/opd_prescription_basic.php @@ -482,21 +482,19 @@
Drug Allergy / ADR (NABH)
-
Required: Drug Allergy Status is mandatory. If status is Known, Drug Allergy Details are mandatory.
- + drug_allergy_status ?? ''))); ?>
- +
@@ -2275,14 +2273,11 @@ var allergyStatusNorm = allergyStatus.toLowerCase().replace(/\s+/g, ' '); if (allergyStatus === '') { - var msgStatus = 'Drug Allergy Status is required as per NABH documentation.'; - setStatus('error', 'Drug Allergy Status is required'); - $('.jsError').removeClass('text-muted text-success').addClass('text-danger').text(msgStatus); - markNabhFieldError('#drug_allergy_status', msgStatus); - if (typeof done === 'function') { - done(false, { update: 0, error_text: msgStatus }); + allergyStatus = 'Allergies Not Known'; + allergyStatusNorm = 'allergies not known'; + if ($('#drug_allergy_status').length) { + $('#drug_allergy_status').val('Allergies Not Known'); } - return; } if ((allergyStatusNorm === 'known' || allergyStatusNorm === 'yes' || allergyStatusNorm === 'present') && allergyDetails === '') {