fixes for in-house dispensing

DiscoverAndChange · Oct 27, 2010 · 2c5abc2 · 2c5abc2
1 parent ec5bed3
commit 2c5abc2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/library/classes/Prescription.class.php b/library/classes/Prescription.class.php
@@ -622,6 +622,7 @@ function prescriptions_factory($patient_id,
  }
 
  function get_dispensation_count() {
+ if (empty($this->id)) return 0;
  $refills_row = sqlQuery("SELECT count(*) AS count FROM drug_sales " .
  "WHERE prescription_id = '" . $this->id . "' AND quantity > 0");
  return $refills_row['count'];

diff --git a/templates/prescription/general_edit.html b/templates/prescription/general_edit.html
@@ -143,7 +143,7 @@
  <td COLSPAN="1" class="text" ALIGN="right" VALIGN="MIDDLE" >&nbsp; {xl t='in-house'}</td>
  <td COLSPAN="2" ALIGN="LEFT" VALIGN="MIDDLE" >
  <select name="drug_id" onchange="drugselected(this)">
- {html_options values=$DRUG_ARRAY_VALUES output=$DRUG_ARRAY_OUTPUT}
+ {html_options values=$DRUG_ARRAY_VALUES output=$DRUG_ARRAY_OUTPUT selected=$prescription->get_drug_id()}
  </select>
  </td>
 </tr>