From 50118df8fc4d4de8ec158cf83843916beb9c97eb Mon Sep 17 00:00:00 2001
From: sunsetsystems <sunsetsystems>
Date: Mon, 6 Jun 2005 18:04:01 +0000
Subject: [PATCH] implemented customization of billing code types

---
 custom/code_types.inc.php                          |  40 ++++
 interface/billing/billing_report.php               |   4 +-
 interface/billing/sl_eob_invoice.php               |  70 +++++-
 interface/forms/fee_sheet/codes.php                |  23 +-
 interface/forms/fee_sheet/new.php                  | 112 +++++-----
 interface/forms/fee_sheet/view.php                 | 112 +++++-----
 interface/patient_file/encounter/coding.php        |  18 +-
 interface/patient_file/encounter/search_code.php   |  97 +++++++++
 .../patient_file/encounter/superbill_codes.php     | 236 +++++++++------------
 .../encounter/superbill_custom_full.php            |  77 ++++---
 interface/reports/appt_encounter_report.php        |   7 +-
 11 files changed, 482 insertions(+), 314 deletions(-)
 create mode 100644 custom/code_types.inc.php
 create mode 100644 interface/patient_file/encounter/search_code.php
 rewrite interface/patient_file/encounter/superbill_codes.php (64%)

diff --git a/custom/code_types.inc.php b/custom/code_types.inc.php
new file mode 100644
index 000000000..2a5aed715
--- /dev/null
+++ b/custom/code_types.inc.php
@@ -0,0 +1,40 @@
+<?
+// This array provides abstraction of billing code types.  This is desirable
+// because different countries or fields of practice use different methods for
+// coding diagnoses, procedures and supplies.  Fees will not be relevant where
+// medical care is socialized.  Attribues are:
+//
+// id   - the numeric identifier of this code type in the codes table
+// fee  - 1 if fees are used, else 0
+// mod  - the maximum length of a modifier, 0 if modifiers are not used
+// just - the code type used for justification, empty if none
+//
+$code_types = array(
+
+ // USA Clinics:
+ 'ICD9'  => array('id' => 2, 'fee' => 0, 'mod' => 2, 'just' => ''    ),
+ 'CPT4'  => array('id' => 1, 'fee' => 1, 'mod' => 2, 'just' => 'ICD9'),
+ 'HCPCS' => array('id' => 3, 'fee' => 1, 'mod' => 2, 'just' => 'ICD9')
+
+ /* UK Sports Medicine:
+ 'ICD10' => array('id' => 4, 'fee' => 0, 'mod' => 0, 'just' => ''    ),
+ 'OSICS' => array('id' => 5, 'fee' => 0, 'mod' => 4, 'just' => ''    ),
+ 'OPCS'  => array('id' => 6, 'fee' => 0, 'mod' => 0, 'just' => ''    ) */
+);
+
+$default_search_type = 'ICD9'; // US
+// $default_search_type = 'OSICS'; // UK
+
+function fees_are_used() {
+ global $code_types;
+ foreach ($code_types as $value) { if ($value['fee']) return true; }
+ return false;
+}
+
+function modifiers_are_used() {
+ global $code_types;
+ foreach ($code_types as $value) { if ($value['mod']) return true; }
+ return false;
+}
+
+?>
diff --git a/interface/billing/billing_report.php b/interface/billing/billing_report.php
index ebfb68c5f..5f8e4526f 100644
--- a/interface/billing/billing_report.php
+++ b/interface/billing/billing_report.php
@@ -1,6 +1,7 @@
 <?
 include_once("../globals.php");
 include_once("../../library/acl.inc");
+include_once("../../custom/code_types.inc.php");
 
 include_once("$srcdir/patient.inc");
 include_once("$srcdir/billrep.inc");
@@ -431,7 +432,8 @@ if ($ret = getBillsBetween($from_date,$to_date,$my_authorized,$unbilled,"%")) {
 		$oldcode = $iter['code_type'];
 		$rhtml .= "</td>\n";
 		$justify = "";
-		if ($iter['code_type'] == "CPT4" || $iter['code_type'] == "HCPCS") {
+//	if ($iter['code_type'] == "CPT4" || $iter['code_type'] == "HCPCS") {
+		if ($code_types[$iter['code_type']]['just']) {
 			$js = split(":",$iter['justify']);
 			$counter = 0;
 			foreach ($js as $j) {
diff --git a/interface/billing/sl_eob_invoice.php b/interface/billing/sl_eob_invoice.php
index d35d13f8a..e6b3a8852 100644
--- a/interface/billing/sl_eob_invoice.php
+++ b/interface/billing/sl_eob_invoice.php
@@ -14,9 +14,26 @@
   include_once("../../library/forms.inc");
   include_once("../../library/sql-ledger.inc");
   include_once("../../library/invoice_summary.inc.php");
+  include_once("../../custom/code_types.inc.php");
 
   $debug = 0; // set to 1 for debugging mode
 
+  $reasons = array(
+    "Ins adjust",
+    "Coll w/o",
+    "Pt released",
+    "Sm debt w/o",
+    "To ded'ble",
+    "To copay",
+    "Bad debt",
+    "Discount",
+    "Hardship w/o",
+    "Ins refund",
+    "Pt refund",
+    "Ins overpaid",
+    "Pt overpaid"
+  );
+
   $info_msg = "";
 
   // Format money for display.
@@ -58,10 +75,10 @@
 
   // Insert a row into the invoice table.
   //
-  function addLineItem($invid, $serialnumber, $amount, $adjdate, $insplan) {
+  function addLineItem($invid, $serialnumber, $amount, $adjdate, $insplan, $reason) {
     global $sl_err, $services_id, $debug;
     $adjdate = fixDate($adjdate);
-    $description = "Adjustment $adjdate";
+    $description = "Adjustment $adjdate $reason";
     $query = "INSERT INTO invoice ( " .
       "trans_id, "          .
       "parts_id, "          .
@@ -233,6 +250,8 @@
       // Set the billing code type and description.
       $code_type = "";
       $code_text = "";
+
+      /****
       if (preg_match("/CPT/", $row['serialnumber'])) {
         $code_type = "CPT4";
         $code_text = "Procedure $code";
@@ -254,6 +273,28 @@
           $proc_ins_id = 0;
         }
       }
+      ****/
+
+      foreach ($code_types as $key => $value) {
+        if (preg_match("/$key/", $row['serialnumber'])) {
+          $code_type = $key;
+          if ($value['fee']) {
+            $code_text = "Procedure $code";
+          } else {
+            $code_text = "Diagnosis $code";
+            if ($proc_ins_id) {
+              $query = "UPDATE billing SET justify = '$code' WHERE id = $proc_ins_id";
+              if ($debug) {
+                echo $query . "<br>\n";
+              } else {
+                sqlQuery($query);
+              }
+              $proc_ins_id = 0;
+            }
+          }
+          break;
+        }
+      }
 
       // Skip adjustments.
       if (! $code_type) continue;
@@ -392,6 +433,9 @@ function validate(f) {
         $thispay  = trim($cdata['pay']);
         $thisadj  = trim($cdata['adj']);
         $thisins  = trim($cdata['ins']);
+        $reason   = trim($cdata['reason']);
+        if (strpos(strtolower($reason), 'ins') !== false)
+          $reason .= ' ' . $_POST['form_insurance'];
         if (! $thisins) $thisins = 0;
         if ($thispay) {
           // Post a payment: add to ar, subtract from cash.
@@ -402,7 +446,7 @@ function validate(f) {
         }
         if ($thisadj) {
           // Post an adjustment: add negative invoice item, add to ar, subtract from income
-          addLineItem($trans_id, $code, 0 - $thisadj, $thisdate, $thisins);
+          addLineItem($trans_id, $code, 0 - $thisadj, $thisdate, $thisins, $reason);
           addTransaction($trans_id, $chart_id_ar, $thisadj, $thisdate, "InvAdj $thissrc", $code, $thisins);
           addTransaction($trans_id, $chart_id_income, 0 - $thisadj, $thisdate, "InvAdj $thissrc", $code, $thisins);
           updateAR($trans_id, 0 - $thisadj);
@@ -458,7 +502,7 @@ function validate(f) {
   <td>
    <?echo $arrow['name'] ?>
   </td>
-  <td colspan="2" rowspan="4">
+  <td colspan="2" rowspan="3">
    <textarea name="form_notes" cols="50" style="height:100%"><?echo $arrow['notes'] ?></textarea>
   </td>
  </tr>
@@ -485,6 +529,12 @@ function validate(f) {
   <td>
    <?echo $arrow['transdate'] ?>
   </td>
+  <td colspan="2">
+   Now posting for:&nbsp;
+   <input type='radio' name='form_insurance' value='Primary' checked />Ins1&nbsp;
+   <input type='radio' name='form_insurance' value='Secondary' />Ins2&nbsp;
+   <input type='radio' name='form_insurance' value='Tertiary' />Ins3
+  </td>
  </tr>
  <tr>
   <td>
@@ -532,6 +582,9 @@ function validate(f) {
   <td class="dehead">
    Adjust
   </td>
+  <td class="dehead">
+   Reason
+  </td>
  </tr>
 <?
   foreach ($codes as $code => $cdata) {
@@ -561,6 +614,15 @@ function validate(f) {
    <input type="text" name="form_line[<? echo $code ?>][adj]" size="10">
    &nbsp; <a href="" onclick="return writeoff('<? echo $code ?>')">W</a>
   </td>
+  <td class="detail">
+   <select name="form_line[<? echo $code ?>][reason]">
+<?
+ foreach ($reasons as $value) {
+  echo "    <option value=\"$value\">$value</option>\n";
+ }
+?>
+   </select>
+  </td>
  </tr>
 <?
   }
diff --git a/interface/forms/fee_sheet/codes.php b/interface/forms/fee_sheet/codes.php
index 4ae91188d..419531ca9 100644
--- a/interface/forms/fee_sheet/codes.php
+++ b/interface/forms/fee_sheet/codes.php
@@ -1,10 +1,12 @@
 <?php
-$cpt = array();
+$bcodes = array();
+
+$bcodes['CPT4']  = array();
 
 // These are the commonly used CPT codes for YOUR practice.
 // Change them to suit your needs.
 //
-$cpt['Established Patient'] = array(
+$bcodes['CPT4']['Established Patient'] = array(
 	'99211' => 'Brief',
 	'99212' => 'Limited',
 	'99213' => 'Detailed',
@@ -18,7 +20,7 @@ $cpt['Established Patient'] = array(
 	'99396' => 'Well Exam 40-64 Yrs (V72.31/V70.0)',
 	'99397' => 'Well Exam 65+ Yrs (V72.31/V70.0)',
 );
-$cpt['New Patient'] = array(
+$bcodes['CPT4']['New Patient'] = array(
 	'99201' => 'Brief',
 	'99202' => 'Limited',
 	'99203' => 'Detailed',
@@ -32,7 +34,7 @@ $cpt['New Patient'] = array(
 	'99386' => 'Well Exam 40-64 Yrs (V72.31/V70.0)',
 	'99387' => 'Well Exam 65+ Yrs (V72.31/V70.0)',
 );
-$cpt['Procedures'] = array(
+$bcodes['CPT4']['Procedures'] = array(
 	'10040' => 'Cyst Removal',
 	'10060' => 'I & D simple/single',
 	'10061' => 'I & D abscess multiple/complex',
@@ -70,7 +72,7 @@ $cpt['Procedures'] = array(
 	'93233' => 'Holter Monitor Review',
 	'93272' => 'Event monitor interpretation',
 );
-$cpt['Lab'] = array(
+$bcodes['CPT4']['Lab'] = array(
 	'82962' => 'Accucheck',
 	'90788' => 'Admin of Antibiotic',
 	'90782' => 'Admin of Injection',
@@ -97,10 +99,9 @@ $cpt['Lab'] = array(
 	'81002' => 'Urinalysis w/o micro',
 	'81025' => 'Urine pregnancy losl/BHCG',
 	'36415' => 'Venipuncture',
-# 'G0001' => 'Venipuncture - Medicare',
 	'G0107' => 'Screening Hemoccult - Medicare',
 );
-$cpt['Immunizations'] = array(
+$bcodes['CPT4']['Immunizations'] = array(
 	'90471' => 'Single Immunization Admin',
 	'90472' => 'Additional Immunization Admin',
 	'G0008' => 'Flu shot / medicare (V06.6)',
@@ -110,7 +111,7 @@ $cpt['Immunizations'] = array(
 	'90718' => 'Td (V06.5)',
 	'90703' => 'Tot Tox (V03.7)',
 );
-$cpt['Consultation and Review'] = array(
+$bcodes['CPT4']['Consultation and Review'] = array(
 	'99361' => 'Medical Conference 30 min',
 	'99371' => 'Telephone Consultation 1-10 min',
 	'99372' => 'Telephone Consultation 10-20 min',
@@ -120,9 +121,9 @@ $cpt['Consultation and Review'] = array(
 	'G0181' => 'Care Plan Oversight',
 );
 
-$hcpcs = array();
+$bcodes['HCPCS'] = array();
 
-$hcpcs['Therapeutic Injections'] = array(
+$bcodes['HCPCS']['Therapeutic Injections'] = array(
 	'J7619' => 'Albuterol unit dose 0.083%',
 	'J1200' => 'Benadryl up to 50 mg',
 	'J3420' => 'B-12 1000 mg',
@@ -141,4 +142,4 @@ $hcpcs['Therapeutic Injections'] = array(
 	'J2680' => 'Prolixin 25 mg',
 	'J3410' => 'Vistaril up to 25 mg',
 );
-?>
\ No newline at end of file
+?>
diff --git a/interface/forms/fee_sheet/new.php b/interface/forms/fee_sheet/new.php
index 30388dde1..70835b7e4 100644
--- a/interface/forms/fee_sheet/new.php
+++ b/interface/forms/fee_sheet/new.php
@@ -8,7 +8,7 @@
 // And if you check in a change to either module, be sure to check
 // in the other (identical) module also.
 //
-// This nonsense will go away when we are moved to subversion.
+// This nonsense will go away if we ever move to subversion.
 //////////////////////////////////////////////////////////////////////
 
 // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.com>
@@ -21,14 +21,7 @@
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
 include_once("codes.php");
-
-// Numeric code types used internally by OpenEMR.
-//
-$type_map = array(
-	'CPT4'  => '1',
-	'ICD9'  => '2',
-	'HCPCS' => '3'
-);
+include_once("../../../custom/code_types.inc.php");
 
 // If Save was clicked, save the new and modified billing lines;
 // then if no error, redirect to patient_encounter.php.
@@ -41,7 +34,7 @@ if ($_POST['bn_save']) {
 		$iter = $bill["$lino"];
 
 		// Skip disabled (billed) line items.
-		if (!isset($iter['fee'])) continue;
+		if ($iter['billed']) continue;
 
 		$id        = $iter['id'];
 		$code_type = $iter['code_type'];
@@ -67,7 +60,7 @@ if ($_POST['bn_save']) {
 		// Otherwise it's a new item...
 		else if (! $del) {
 			$query = "select code_text from codes where code_type = '" .
-				$type_map[$code_type] . "' and " .
+				$code_types[$code_type]['id'] . "' and " .
 				"code = '$code' and ";
 			if ($modifier) {
 				$query .= "modifier = '$modifier'";
@@ -119,35 +112,25 @@ function codeselect(selobj, newtype) {
 <?
 $i = 0;
 
-foreach ($cpt as $key1 => $value1) {
-	++$i;
-	echo ($i & 1) ? " <tr>\n" : "";
-	echo "  <td width='50%' align='center' nowrap>\n";
-	echo "   <select name='$key1' style='width:96%' onchange='codeselect(this, \"CPT4\")'>\n";
-	echo "    <option value=''> $key1\n";
-	foreach ($cpt[$key1] as $key2 => $value2) {
-		echo "    <option value='$key2'>$key2 $value2\n";
-	}
-	echo "   </select>\n";
-	echo "  </td>\n";
-	echo ($i & 1) ? "" : " </tr>\n";
-}
-
-foreach ($hcpcs as $key1 => $value1) {
-	++$i;
-	echo ($i & 1) ? " <tr>\n" : "";
-	echo "  <td width='50%' align='center' nowrap>\n";
-	echo "   <select name='$key1' style='width:96%' onchange='codeselect(this, \"HCPCS\")'>\n";
-	echo "    <option value=''> $key1\n";
-	foreach ($hcpcs[$key1] as $key2 => $value2) {
-		echo "    <option value='$key2'>$key2 $value2\n";
+// Create all the drop-lists of preselected codes.
+//
+foreach ($bcodes as $key0 => $value0) {
+	foreach ($value0 as $key1 => $value1) {
+		++$i;
+		echo ($i & 1) ? " <tr>\n" : "";
+		echo "  <td width='50%' align='center' nowrap>\n";
+		echo "   <select name='$key1' style='width:96%' onchange='codeselect(this, \"$key0\")'>\n";
+		echo "    <option value=''> $key1\n";
+		foreach ($value0[$key1] as $key2 => $value2) {
+			echo "    <option value='$key2'>$key2 $value2\n";
+		}
+		echo "   </select>\n";
+		echo "  </td>\n";
+		echo ($i & 1) ? "" : " </tr>\n";
 	}
-	echo "   </select>\n";
-	echo "  </td>\n";
-	echo ($i & 1) ? "" : " </tr>\n";
 }
 
-$search_type = "ICD9";
+$search_type = $default_search_type;
 if ($_POST['search_type']) $search_type = $_POST['search_type'];
 
 echo ($i & 1) ? "  <td></td>\n </tr>\n" : "";
@@ -162,7 +145,7 @@ if ($_POST['bn_search'] && $_POST['search_term']) {
 	$query = "select code, modifier, code_text from codes where " .
 		"(code_text like '%" . $_POST['search_term'] . "%' or " .
 		"code like '%" . $_POST['search_term'] . "%') and " .
-		"code_type = '" . $type_map[$search_type] . "' " .
+		"code_type = '" . $code_types[$search_type]['id'] . "' " .
 		"order by code";
 	$res = sqlStatement($query);
 	$numrows = mysql_num_rows($res); // FIXME - not portable!
@@ -194,9 +177,13 @@ echo " </tr>\n";
  <tr>
   <td>
    Search&nbsp;
-   <input type='radio' name='search_type' value='ICD9' checked>ICD-9&nbsp;
-   <input type='radio' name='search_type' value='CPT4'>CPT&nbsp;
-   <input type='radio' name='search_type' value='HCPCS'>HCPCS&nbsp;
+<?
+	foreach ($code_types as $key => $value) {
+		echo "   <input type='radio' name='search_type' value='$key'";
+		if ($key == $default_search_type) echo " checked";
+		echo " />$key&nbsp;\n";
+	}
+?>
    for&nbsp;
   </td>
   <td>
@@ -214,8 +201,12 @@ echo " </tr>\n";
  <tr>
   <td class='billcell'><b>Type</b></td>
   <td class='billcell'><b>Code</b></td>
+<? if (modifiers_are_used()) { ?>
   <td class='billcell'><b>Mod</b></td>
+<? } ?>
+<? if (fees_are_used()) { ?>
   <td class='billcell' align='right'><b>Fee</b>&nbsp;</td>
+<? } ?>
   <td class='billcell' align='center'><b>Auth</b></td>
   <td class='billcell' align='center'><b>Delete</b></td>
   <td class='billcell'><b>Description</b></td>
@@ -227,10 +218,10 @@ echo " </tr>\n";
 function echoLine($lino, $codetype, $code, $modifier, $auth = TRUE, $del = FALSE,
 	$fee = NULL, $id = NULL, $billed = FALSE, $code_text = NULL)
 {
-	global $type_map;
+	global $code_types;
 	if (! $code_text) {
 		$query = "select fee, code_text from codes where code_type = '" .
-			$type_map[$codetype] . "' and " .
+			$code_types[$codetype]['id'] . "' and " .
 			"code = '$code' and ";
 		if ($modifier) {
 			$query .= "modifier = '$modifier'";
@@ -250,21 +241,38 @@ function echoLine($lino, $codetype, $code, $modifier, $auth = TRUE, $del = FALSE
 	}
 	echo "<input type='hidden' name='bill[$lino][code_type]' value='$codetype'>";
 	echo "<input type='hidden' name='bill[$lino][code]' value='$code'>";
+	echo "<input type='hidden' name='bill[$lino][billed]' value='$billed'>";
 	echo "</td>\n";
 	echo "  <td class='billcell'>$strike1$code$strike2</td>\n";
 	if ($billed) {
-		echo "  <td class='billcell'>$strike1$modifier$strike2" .
-			"<input type='hidden' name='bill[$lino][mod]' value='$modifier'></td>\n";
-		echo "  <td class='billcell' align='right'>$fee</td>\n";
+		if (modifiers_are_used()) {
+			echo "  <td class='billcell'>$strike1$modifier$strike2" .
+				"<input type='hidden' name='bill[$lino][mod]' value='$modifier'></td>\n";
+		}
+		if (fees_are_used()) {
+			echo "  <td class='billcell' align='right'>$fee</td>\n";
+		}
 		echo "  <td class='billcell' align='center'><input type='checkbox'" .
 			($auth ? " checked" : "") . " disabled /></td>\n";
 		echo "  <td class='billcell' align='center'><input type='checkbox'" .
 			" disabled /></td>\n";
 	} else {
-		echo "  <td class='billcell'><input type='text' name='bill[$lino][mod]' " .
-			"value='$modifier' size='2'></td>\n";
-		echo "  <td class='billcell' align='right'><input type='text' name='bill[$lino][fee]' " .
-			"value='$fee' size='6' style='text-align:right'></td>\n";
+		if (modifiers_are_used()) {
+			if ($code_types[$codetype]['mod'] || $modifier) {
+				echo "  <td class='billcell'><input type='text' name='bill[$lino][mod]' " .
+					"value='$modifier' size='" . $code_types[$codetype]['mod'] . "'></td>\n";
+			} else {
+				echo "  <td class='billcell'>&nbsp;</td>\n";
+			}
+		}
+		if (fees_are_used()) {
+			if ($code_types[$codetype]['fee'] || $fee != 0) {
+				echo "  <td class='billcell' align='right'><input type='text' name='bill[$lino][fee]' " .
+					"value='$fee' size='6' style='text-align:right'></td>\n";
+			} else {
+				echo "  <td class='billcell'>&nbsp;</td>\n";
+			}
+		}
 		echo "  <td class='billcell' align='center'><input type='checkbox' name='bill[$lino][auth]' " .
 			"value='1'" . ($auth ? " checked" : "") . " /></td>\n";
 		echo "  <td class='billcell' align='center'><input type='checkbox' name='bill[$lino][del]' " .
@@ -305,8 +313,8 @@ if ($_POST['bill']) {
 	}
 }
 
-// If a new billing code was <select>ed, add its line here.
-// Allow HCPCS codes to be mixed in with the CPT codes.
+// If a new billing code was <select>ed, add its line here.  As a special
+// case allow HCPCS codes to be included in the CPT drop-lists.
 //
 if ($_POST['newcode']) {
 	list($code, $modifier) = explode("-", $_POST['newcode']);
diff --git a/interface/forms/fee_sheet/view.php b/interface/forms/fee_sheet/view.php
index 30388dde1..70835b7e4 100644
--- a/interface/forms/fee_sheet/view.php
+++ b/interface/forms/fee_sheet/view.php
@@ -8,7 +8,7 @@
 // And if you check in a change to either module, be sure to check
 // in the other (identical) module also.
 //
-// This nonsense will go away when we are moved to subversion.
+// This nonsense will go away if we ever move to subversion.
 //////////////////////////////////////////////////////////////////////
 
 // Copyright (C) 2005 Rod Roark <rod@sunsetsystems.com>
@@ -21,14 +21,7 @@
 include_once("../../globals.php");
 include_once("$srcdir/api.inc");
 include_once("codes.php");
-
-// Numeric code types used internally by OpenEMR.
-//
-$type_map = array(
-	'CPT4'  => '1',
-	'ICD9'  => '2',
-	'HCPCS' => '3'
-);
+include_once("../../../custom/code_types.inc.php");
 
 // If Save was clicked, save the new and modified billing lines;
 // then if no error, redirect to patient_encounter.php.
@@ -41,7 +34,7 @@ if ($_POST['bn_save']) {
 		$iter = $bill["$lino"];
 
 		// Skip disabled (billed) line items.
-		if (!isset($iter['fee'])) continue;
+		if ($iter['billed']) continue;
 
 		$id        = $iter['id'];
 		$code_type = $iter['code_type'];
@@ -67,7 +60,7 @@ if ($_POST['bn_save']) {
 		// Otherwise it's a new item...
 		else if (! $del) {
 			$query = "select code_text from codes where code_type = '" .
-				$type_map[$code_type] . "' and " .
+				$code_types[$code_type]['id'] . "' and " .
 				"code = '$code' and ";
 			if ($modifier) {
 				$query .= "modifier = '$modifier'";
@@ -119,35 +112,25 @@ function codeselect(selobj, newtype) {
 <?
 $i = 0;
 
-foreach ($cpt as $key1 => $value1) {
-	++$i;
-	echo ($i & 1) ? " <tr>\n" : "";
-	echo "  <td width='50%' align='center' nowrap>\n";
-	echo "   <select name='$key1' style='width:96%' onchange='codeselect(this, \"CPT4\")'>\n";
-	echo "    <option value=''> $key1\n";
-	foreach ($cpt[$key1] as $key2 => $value2) {
-		echo "    <option value='$key2'>$key2 $value2\n";
-	}
-	echo "   </select>\n";
-	echo "  </td>\n";
-	echo ($i & 1) ? "" : " </tr>\n";
-}
-
-foreach ($hcpcs as $key1 => $value1) {
-	++$i;
-	echo ($i & 1) ? " <tr>\n" : "";
-	echo "  <td width='50%' align='center' nowrap>\n";
-	echo "   <select name='$key1' style='width:96%' onchange='codeselect(this, \"HCPCS\")'>\n";
-	echo "    <option value=''> $key1\n";
-	foreach ($hcpcs[$key1] as $key2 => $value2) {
-		echo "    <option value='$key2'>$key2 $value2\n";
+// Create all the drop-lists of preselected codes.
+//
+foreach ($bcodes as $key0 => $value0) {
+	foreach ($value0 as $key1 => $value1) {
+		++$i;
+		echo ($i & 1) ? " <tr>\n" : "";
+		echo "  <td width='50%' align='center' nowrap>\n";
+		echo "   <select name='$key1' style='width:96%' onchange='codeselect(this, \"$key0\")'>\n";
+		echo "    <option value=''> $key1\n";
+		foreach ($value0[$key1] as $key2 => $value2) {
+			echo "    <option value='$key2'>$key2 $value2\n";
+		}
+		echo "   </select>\n";
+		echo "  </td>\n";
+		echo ($i & 1) ? "" : " </tr>\n";
 	}
-	echo "   </select>\n";
-	echo "  </td>\n";
-	echo ($i & 1) ? "" : " </tr>\n";
 }
 
-$search_type = "ICD9";
+$search_type = $default_search_type;
 if ($_POST['search_type']) $search_type = $_POST['search_type'];
 
 echo ($i & 1) ? "  <td></td>\n </tr>\n" : "";
@@ -162,7 +145,7 @@ if ($_POST['bn_search'] && $_POST['search_term']) {
 	$query = "select code, modifier, code_text from codes where " .
 		"(code_text like '%" . $_POST['search_term'] . "%' or " .
 		"code like '%" . $_POST['search_term'] . "%') and " .
-		"code_type = '" . $type_map[$search_type] . "' " .
+		"code_type = '" . $code_types[$search_type]['id'] . "' " .
 		"order by code";
 	$res = sqlStatement($query);
 	$numrows = mysql_num_rows($res); // FIXME - not portable!
@@ -194,9 +177,13 @@ echo " </tr>\n";
  <tr>
   <td>
    Search&nbsp;
-   <input type='radio' name='search_type' value='ICD9' checked>ICD-9&nbsp;
-   <input type='radio' name='search_type' value='CPT4'>CPT&nbsp;
-   <input type='radio' name='search_type' value='HCPCS'>HCPCS&nbsp;
+<?
+	foreach ($code_types as $key => $value) {
+		echo "   <input type='radio' name='search_type' value='$key'";
+		if ($key == $default_search_type) echo " checked";
+		echo " />$key&nbsp;\n";
+	}
+?>
    for&nbsp;
   </td>
   <td>
@@ -214,8 +201,12 @@ echo " </tr>\n";
  <tr>
   <td class='billcell'><b>Type</b></td>
   <td class='billcell'><b>Code</b></td>
+<? if (modifiers_are_used()) { ?>
   <td class='billcell'><b>Mod</b></td>
+<? } ?>
+<? if (fees_are_used()) { ?>
   <td class='billcell' align='right'><b>Fee</b>&nbsp;</td>
+<? } ?>
   <td class='billcell' align='center'><b>Auth</b></td>
   <td class='billcell' align='center'><b>Delete</b></td>
   <td class='billcell'><b>Description</b></td>
@@ -227,10 +218,10 @@ echo " </tr>\n";
 function echoLine($lino, $codetype, $code, $modifier, $auth = TRUE, $del = FALSE,
 	$fee = NULL, $id = NULL, $billed = FALSE, $code_text = NULL)
 {
-	global $type_map;
+	global $code_types;
 	if (! $code_text) {
 		$query = "select fee, code_text from codes where code_type = '" .
-			$type_map[$codetype] . "' and " .
+			$code_types[$codetype]['id'] . "' and " .
 			"code = '$code' and ";
 		if ($modifier) {
 			$query .= "modifier = '$modifier'";
@@ -250,21 +241,38 @@ function echoLine($lino, $codetype, $code, $modifier, $auth = TRUE, $del = FALSE
 	}
 	echo "<input type='hidden' name='bill[$lino][code_type]' value='$codetype'>";
 	echo "<input type='hidden' name='bill[$lino][code]' value='$code'>";
+	echo "<input type='hidden' name='bill[$lino][billed]' value='$billed'>";
 	echo "</td>\n";
 	echo "  <td class='billcell'>$strike1$code$strike2</td>\n";
 	if ($billed) {
-		echo "  <td class='billcell'>$strike1$modifier$strike2" .
-			"<input type='hidden' name='bill[$lino][mod]' value='$modifier'></td>\n";
-		echo "  <td class='billcell' align='right'>$fee</td>\n";
+		if (modifiers_are_used()) {
+			echo "  <td class='billcell'>$strike1$modifier$strike2" .
+				"<input type='hidden' name='bill[$lino][mod]' value='$modifier'></td>\n";
+		}
+		if (fees_are_used()) {
+			echo "  <td class='billcell' align='right'>$fee</td>\n";
+		}
 		echo "  <td class='billcell' align='center'><input type='checkbox'" .
 			($auth ? " checked" : "") . " disabled /></td>\n";
 		echo "  <td class='billcell' align='center'><input type='checkbox'" .
 			" disabled /></td>\n";
 	} else {
-		echo "  <td class='billcell'><input type='text' name='bill[$lino][mod]' " .
-			"value='$modifier' size='2'></td>\n";
-		echo "  <td class='billcell' align='right'><input type='text' name='bill[$lino][fee]' " .
-			"value='$fee' size='6' style='text-align:right'></td>\n";
+		if (modifiers_are_used()) {
+			if ($code_types[$codetype]['mod'] || $modifier) {
+				echo "  <td class='billcell'><input type='text' name='bill[$lino][mod]' " .
+					"value='$modifier' size='" . $code_types[$codetype]['mod'] . "'></td>\n";
+			} else {
+				echo "  <td class='billcell'>&nbsp;</td>\n";
+			}
+		}
+		if (fees_are_used()) {
+			if ($code_types[$codetype]['fee'] || $fee != 0) {
+				echo "  <td class='billcell' align='right'><input type='text' name='bill[$lino][fee]' " .
+					"value='$fee' size='6' style='text-align:right'></td>\n";
+			} else {
+				echo "  <td class='billcell'>&nbsp;</td>\n";
+			}
+		}
 		echo "  <td class='billcell' align='center'><input type='checkbox' name='bill[$lino][auth]' " .
 			"value='1'" . ($auth ? " checked" : "") . " /></td>\n";
 		echo "  <td class='billcell' align='center'><input type='checkbox' name='bill[$lino][del]' " .
@@ -305,8 +313,8 @@ if ($_POST['bill']) {
 	}
 }
 
-// If a new billing code was <select>ed, add its line here.
-// Allow HCPCS codes to be mixed in with the CPT codes.
+// If a new billing code was <select>ed, add its line here.  As a special
+// case allow HCPCS codes to be included in the CPT drop-lists.
 //
 if ($_POST['newcode']) {
 	list($code, $modifier) = explode("-", $_POST['newcode']);
diff --git a/interface/patient_file/encounter/coding.php b/interface/patient_file/encounter/coding.php
index 545d9357a..f0928d5fd 100644
--- a/interface/patient_file/encounter/coding.php
+++ b/interface/patient_file/encounter/coding.php
@@ -1,25 +1,21 @@
 <?
 include_once("../../globals.php");
-
+include_once("../../../custom/code_types.inc.php");
 ?>
-
 <html>
 <head>
-
-
 <link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
 </head>
 <body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
 
 <dl>
 <dt><span href="coding.php" class="title">Coding/Billing</span></dt>
 <dd><a class="text" href="superbill_codes.php" target="Main">Superbill</a></dd>
-<!--<dd><a class="text" href="icd9cm_codes_custom.php" target="Codes">ICD-9-CM Custom</a></dd>-->
-<dd><a class="text" href="icd9cm_codes.php" target="Codes">ICD-9-CM Search</a></dd>
-<!--<dd><a class="text" href="cpt_codes_custom.php" target="Codes">CPT Custom</a></dd>-->
-<dd><a class="text" href="cptcm_codes.php" target="Codes">CPT Search</a></dd>
-<dd><a class="text" href="hcpcs_codes.php" target="Codes">HCPCS Search</a></dd>
+
+<? foreach ($code_types as $key => $value) { ?>
+<dd><a class="text" href="search_code.php?type=<? echo $key ?>" target="Codes"><? echo $key ?> Search</a></dd>
+<? } ?>
+
 <dd><a class="text" href="copay.php" target="Codes">Copay</a></dd>
 <dd><a class="text" href="other.php" target="Codes">Other</a></dd><br />
 <dt><span href="coding.php" class="title">Prescriptions</span></dt>
@@ -27,7 +23,5 @@ include_once("../../globals.php");
 <dd><a class="text" href="<?=$GLOBALS['webroot']?>/controller.php?prescription&edit&id=&pid=<?=$pid?>" target="Codes">Add Prescription</a></dd>
 </dl>
 
-
-
 </body>
 </html>
diff --git a/interface/patient_file/encounter/search_code.php b/interface/patient_file/encounter/search_code.php
new file mode 100644
index 000000000..30458c3f2
--- /dev/null
+++ b/interface/patient_file/encounter/search_code.php
@@ -0,0 +1,97 @@
+<?
+
+////////////////////////////////////////////////////////////////////////////////
+// THIS MODULE REPLACES cptcm_codes.php, hcpcs_codes.php AND icd9cm_codes.php.
+////////////////////////////////////////////////////////////////////////////////
+
+include_once("../../globals.php");
+include_once("../../../custom/code_types.inc.php");
+include_once("$srcdir/sql.inc");
+
+//the maximum number of records to pull out with the search:
+$M = 30;
+
+//the number of records to display before starting a second column:
+$N = 15;
+
+$code_type = $_GET['type'];
+?>
+
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+</head>
+<body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+
+<table border=0 cellspacing=0 cellpadding=0 height=100%>
+<tr>
+<td background="<?echo $linepic;?>" width=7 height=100%>
+&nbsp;
+</td>
+<td valign=top>
+
+<form name='search_form' method='post' action='search_code.php?type=<? echo $code_type ?>'>
+<input type=hidden name=mode value="search">
+
+<span class="title" href="search_code.php"><? echo $code_type ?> Codes</span><br>
+
+<input type=entry size=15 name=text><a href="javascript:document.search_form.submit();" class="text">Search</a>
+</form>
+
+<?
+if (isset($_POST["mode"]) && $_POST["mode"] == "search") {
+	$sql = "select * from codes where (code_text like '%" . $_POST["text"] .
+		"%' or code like '%" . $_POST["text"] . "%') and code_type = '" .
+		$code_types[$code_type]['id'] . "' order by code limit " . ($M + 1);
+
+	if ($res = sqlStatement($sql) ) {
+		for($iter=0; $row=sqlFetchArray($res); $iter++)
+		{
+			$result[$iter] = $row;
+		}
+?>
+
+<table><tr><td valign=top>
+<?
+		$count = 0;
+		$total = 0;
+
+		if ($result) {
+			foreach ($result as $iter) {
+				if ($count == $N) {
+					echo "</td><td valign=top>\n";
+					$count = 0;
+				}
+
+				echo "<a target='Diagnosis' class='text' href='diagnosis.php?mode=add" .
+					"&type="     . urlencode($code_type) .
+					"&code="     . urlencode($iter{"code"}) .
+					"&modifier=" . urlencode($iter{"modifier"}) .
+					"&units="    . urlencode($iter{"units"}) .
+					"&fee="      . urlencode($iter{"fee"}) .
+					"&text="     . urlencode($iter{"code_text"}) .
+					"'>" .
+					ucwords("<b>" . strtoupper($iter{"code"}) . "&nbsp;" . $iter['modifier'] .
+					"</b>" . " " . strtolower($iter{"code_text"}))."</a><br>\n";
+		
+				$count++;
+				$total++;
+				if ($total == $M) {
+					echo "</span><span class=alert>Some codes were not displayed.\n";
+					break;
+				}
+			}
+		}
+?>
+</td></tr></table>
+<?
+	}
+}
+?>
+
+</td>
+</tr>
+</table>
+
+</body>
+</html>
diff --git a/interface/patient_file/encounter/superbill_codes.php b/interface/patient_file/encounter/superbill_codes.php
dissimilarity index 64%
index 65b95a1cb..f64713232 100644
--- a/interface/patient_file/encounter/superbill_codes.php
+++ b/interface/patient_file/encounter/superbill_codes.php
@@ -1,139 +1,97 @@
-<?
-include_once("../../globals.php");
-include_once("$srcdir/billing.inc");
-include_once("$srcdir/sql.inc");
-
-define("CODE_TYPE_CPT4",1);
-define("CODE_TYPE_ICD9",2);
-define("CODE_TYPE_HCPCS",3);
-
-$code_type_array = array("","CPT4","ICD9","HCPCS");
-
-//the number of rows to display before resetting and starting a new column:
-$N=10;
-$mode = $_GET['mode'];
-if (isset($mode)) {
-	if ($mode == "add") {
-		if (strtolower($type) == "copay") {
-			addBilling($encounter, $type, sprintf("%01.2f", $code), $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,sprintf("%01.2f", 0 - $code));
-		}
-		elseif (strtolower($type) == "other") {
-			addBilling($encounter, $type, $code, $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,sprintf("%01.2f", $fee));
-		}
-		else {
-			addBilling($encounter, $type, $code, $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,$fee);
-		}
-	}
-}
-?>
-
-<html>
-<head>
-
-
-<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
-
-</head>
-<body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
-
-<table border=0 cellspacing=0 cellpadding=0 >
-<tr>
-<!--<td background="<?echo $linepic;?>" width=7 height=100%>
-&nbsp;
-</td>-->
-<td valign=top>
-
-<dl>
-
-<dt><a href="superbill_custom_full.php" ><span class=title>Superbill</span><font class=more><?echo $tmore;?></font></a>
-<a href="patient_encounter.php?codefrom=superbill" ><font class=more><?echo $tback;?></font></a></dt>
-</td></tr>
-</table>
-
-<table border=0 width=100% cellpadding=0 cellspacing=1>
-<?
-$res = sqlStatement("select * from codes where superbill = 1 order by code_type,code,code_text");
-$cpt_count = 0;
-$icd9_count = 0;
-$hcpcs_count = 0;
-for ($iter = 0;$row = sqlFetchArray($res);$iter++){
-	//$all[$iter] = $row;
-	switch($row["code_type"]){
-		case CODE_TYPE_CPT4:
-			$cpts[$cpt_count++] = $row;
-			break;
-		case CODE_TYPE_ICD9:
-			$icd9s[$icd9_count++] = $row;
-			break;
-		case CODE_TYPE_HCPCS:
-			$hcpcs[$hcpcs_count++] = $row;
-			break;
-	}
-}
-$count=0;
-$index=0;
-if ($cpt_count > 0 || $icd9_count > 0 || $hcpcs_count > 0) {
-	print "<tr><th align=left>CPT Codes</th><th align=left>ICD9 Codes</th><th align=left>HCPCS Codes</th><tr>";
-	
-	while( $count < $iter ){
-		print "<tr><td valign=top>";
-		if( !empty( $cpts[$index] ) ){
-			$code = $cpts[$index];
-			print "<dd><a class=text target=Main href='superbill_codes.php?back=1&mode=add&type=".urlencode($code_type_array[$code{"code_type"}])."&modifier=".urlencode($code{"modifier"})."&units=".urlencode($code{"units"})."&fee=".urlencode($code{"fee"})."&code=".urlencode($code{"code"})."&text=".urlencode($code{"code_text"})."'>";
-			echo "<b>" . $code['code'] . "</b>" . "&nbsp;" . $code['modifier'] . "&nbsp;" . $code['code_text'] ;
-			echo "</a></dd>\n";
-			++$count;
-		}
-		print "</td><td valign=top>";
-		if( !empty( $icd9s[$index] ) ){
-			$code = $icd9s[$index];
-			print "<dd><a class=text target=Main href='superbill_codes.php?back=1&mode=add&type=".urlencode($code_type_array[$code{"code_type"}])."&modifier=".urlencode($code{"modifier"})."&units=".urlencode($code{"units"})."&fee=".urlencode($code{"fee"})."&code=".urlencode($code{"code"})."&text=".urlencode($code{"code_text"})."'>";
-			echo "<b>" . $code['code'] . "</b>" . "&nbsp;" . $code['modifier'] . "&nbsp;" . $code['code_text'] ;
-			echo "</a></dd>\n";
-			++$count;
-		}
-		print "</td><td valign=top>";
-		if( !empty( $hcpcs[$index] ) ){
-			$code = $hcpcs[$index];
-			print "<dd><a class=text target=Main href='superbill_codes.php?back=1&mode=add&type=".urlencode($code_type_array[$code{"code_type"}])."&modifier=".urlencode($code{"modifier"})."&units=".urlencode($code{"units"})."&fee=".urlencode($code{"fee"})."&code=".urlencode($code{"code"})."&text=".urlencode($code{"code_text"})."'>";
-			echo "<b>" . $code['code'] . "</b>" . "&nbsp;" . $code['modifier'] . "&nbsp;" . $code['code_text'] ;
-			echo "</a></dd>\n";
-			++$count;
-		}
-		print "</td></tr>";
-		++$index;
-	}
-	/*foreach($all as $iter) {
-		$count++;
-		print "<dd><a class=text target=Diagnosis href='diagnosis.php?mode=add&type=".urlencode($code_type_array[$iter{"code_type"}])."&modifier=".urlencode($iter{"modifier"})."&units=".urlencode($iter{"units"})."&fee=".urlencode($iter{"fee"})."&code=".urlencode($iter{"code"})."&text=".urlencode($iter{"code_text"})."'>";
-		echo "<b>" . $iter['code'] . "</b>" . "&nbsp;" . $iter['code_text'] ;
-		echo "</a></dd>\n";
-		if ($count == $N) {
-			print "</td><td valign=top>\n";
-			$count = 0;
-		}
-	}
-	*/
-}
-
-?>
-
-
-
-</table>
-
-
-
-</dl>
-
-
-<!--</td>
-</tr>-->
-<!--</table>-->
-
-
-
-
-</body>
-</html>
+<?
+include_once("../../globals.php");
+include_once("../../../custom/code_types.inc.php");
+include_once("$srcdir/billing.inc");
+include_once("$srcdir/sql.inc");
+
+//the number of rows to display before resetting and starting a new column:
+$N=10;
+$mode = $_GET['mode'];
+if (isset($mode)) {
+	if ($mode == "add") {
+		if (strtolower($type) == "copay") {
+			addBilling($encounter, $type, sprintf("%01.2f", $code), $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,sprintf("%01.2f", 0 - $code));
+		}
+		elseif (strtolower($type) == "other") {
+			addBilling($encounter, $type, $code, $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,sprintf("%01.2f", $fee));
+		}
+		else {
+			addBilling($encounter, $type, $code, $text, $pid, $userauthorized,$_SESSION['authUserID'],$modifier,$units,$fee);
+		}
+	}
+}
+?>
+<html>
+<head>
+<link rel=stylesheet href="<?echo $css_header;?>" type="text/css">
+</head>
+<body <?echo $bottom_bg_line;?> topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
+
+<table border=0 cellspacing=0 cellpadding=0 >
+<tr>
+<td valign=top>
+
+<dl>
+
+<dt><a href="superbill_custom_full.php" ><span class=title>Superbill</span><font class=more><?echo $tmore;?></font></a>
+<a href="patient_encounter.php?codefrom=superbill" ><font class=more><?echo $tback;?></font></a></dt>
+</td></tr>
+</table>
+
+<table border=0 width=100% cellpadding=0 cellspacing=1>
+<?
+$res = sqlStatement("select * from codes where superbill = 1 order by code_type, code, code_text");
+
+$codes = array();
+echo " <tr>\n";
+foreach ($code_types as $key => $value) {
+	$codes[$key] = array();
+	echo "  <th align='left'>$key Codes</th>\n";
+}
+echo " </tr>\n";
+
+for ($iter = 0; $row = sqlFetchArray($res); $iter++){
+	foreach ($code_types as $key => $value) {
+		if ($value['id'] == $row['code_type']) {
+			$codes[$key][] = $row;
+			break;
+		}
+	}
+}
+
+$index=0;
+
+$numlines = 0;
+foreach ($codes as $value)
+	$numlines = max($numlines, count($value));
+
+while ($index < $numlines) {
+	echo " <tr>\n";
+	foreach ($codes as $key => $value) {
+		echo "  <td valign='top'>\n";
+		if(!empty($value[$index])) {
+			$code = $value[$index];
+			echo "   <dd><a class='text' target='Main' href='superbill_codes.php?back=1&mode=add" .
+				"&type="     . urlencode($key) .
+				"&modifier=" . urlencode($code{"modifier"}) .
+				"&units="    . urlencode($code{"units"}) .
+				"&fee="      . urlencode($code{"fee"}) .
+				"&code="     . urlencode($code{"code"}) .
+				"&text="     . urlencode($code{"code_text"}) . "'>";
+			echo "<b>" . $code['code'] . "</b>" . "&nbsp;" . $code['modifier'] . "&nbsp;" . $code['code_text'] ;
+			echo "</a></dd>\n";
+		}
+		echo "  </td>\n";
+	}
+	echo " </tr>\n";
+	++$index;
+}
+
+?>
+
+</table>
+
+</dl>
+
+</body>
+</html>
diff --git a/interface/patient_file/encounter/superbill_custom_full.php b/interface/patient_file/encounter/superbill_custom_full.php
index 13fc4cdd4..f20cbf048 100644
--- a/interface/patient_file/encounter/superbill_custom_full.php
+++ b/interface/patient_file/encounter/superbill_custom_full.php
@@ -1,15 +1,12 @@
 <?
 include_once("../../globals.php");
+include_once("../../../custom/code_types.inc.php");
 include_once("$srcdir/sql.inc");
 
-define("CODE_TYPE_CPT4",1);
-define("CODE_TYPE_ICD9",2);
-define("CODE_TYPE_HCPCS",3);
+if (isset($mode)) {
 
-$code_type_array = array("","CPT4","ICD9","HCPCS");
+	// ERROR!  $id and other variables here are not set!
 
-if (isset($mode)) {
-	
 	if ($mode == "delete" ) {
 		sqlStatement("delete from codes where id='$id'");
 	} elseif ($mode == "add" ) {
@@ -68,9 +65,9 @@ $N = 12;
 	<td width="5" rowspan="7"></td>
 	<td>
 		<select name="code_type">
-			<option value="<?=CODE_TYPE_ICD9?>" <?if ($GLOBALS['code_type'] == CODE_TYPE_ICD9) echo "selected"?> >ICD9-CM</option>
-			<option value="<?=CODE_TYPE_CPT4?>" <?if ($GLOBALS['code_type'] == CODE_TYPE_CPT4) echo "selected"?>>CPT</option>
-			<option value="<?=CODE_TYPE_HCPCS?>" <?if ($GLOBALS['code_type'] == CODE_TYPE_HCPCS) echo "selected"?>>HCPCS</option>
+<? foreach ($code_types as $key => $value) { ?>
+			<option value="<? echo $value['id'] ?>"<?if ($GLOBALS['code_type'] == $value['id']) echo " selected" ?>><? echo $key ?></option>
+<? } ?>
 		</select>
 	</td>
 </tr>
@@ -111,7 +108,6 @@ elseif (!is_numeric($fstart)) {
 
 $fend = $fstart + 100;
 
-
 ?>
 
 </form>
@@ -132,15 +128,13 @@ $fend = $fstart + 100;
 <td>
 <a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=">ALL</a>&nbsp;&nbsp;
 </td>
+
+<? foreach ($code_types as $key => $value) { ?>
 <td>
-<a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=1">CPT</a>&nbsp;&nbsp;
-</td>
-<td>
-<a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=2">ICD9</a>&nbsp;&nbsp;
-</td>
-<td>
-<a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=3">HCPCS</a>&nbsp;&nbsp; <br>
+<a href="superbill_custom_full.php?fstart=<?=$_GET['fstart']?>&filter=<? echo $value['id'] ?>"><? echo $key ?></a>&nbsp;&nbsp;
 </td>
+<? } ?>
+
 <td>
 <input type="text" name="search" size="5">&nbsp;<input type="submit" name="go" value="search">
 </td>
@@ -160,63 +154,64 @@ $search = $_GET['search'];
 
 $sql = "select * from codes ";
 if (!is_numeric($filter) && empty($search)) {
-	$filter = "";	
+	$filter = "";
 }
 elseif (!empty($search)) {
-	$sql .= " where code like '%" . mysql_real_escape_string($search) . "%'" ;	
+	$sql .= " where code like '%" . mysql_real_escape_string($search) . "%'";
 }
 else {
 	$sql .= " where code_type = $filter ";	
 }
-$sql .= " order by code_type,code,units,code_text limit $fstart, $fend";
+$sql .= " order by code_type, code, units, code_text limit $fstart, $fend";
 
 $res = sqlStatement($sql);
 for ($iter = 0;$row = sqlFetchArray($res);$iter++)
 	$all[$iter] = $row;
 
-
 if ($all) {
 	$count =0;
 	foreach($all as $iter) {
 		$count++;
-		
-		//if ($count == $N) {
-		//	print "</td></tr></table></td><td valign=top><table border=0 cellpadding=5 cellspacing=0><th><td></td><td><span class=bold>Code</span></td><td><span class=bold>Type</span></td><td><span class=bold>Text</span></td><td><span class=bold>Modifier</span></td><td><span class=bold>Units</span></td><td><span class=bold>Fee</span></td><td></td></th>\n";
-		//}
-		
-		print "<tr><td></td><td><span class=text target=Diagnosis href='diagnosis.php?mode=add&type=".urlencode($iter{"code_type"})."&code=".urlencode($iter{"code"})."&text=".urlencode($iter{"code_text"})."'>";
-		print "</td><td><span class=text>" . $iter["code"] . "</span></td><td><span class=text" . $iter["modifier"] . "</span></td><td><span class=text>" . $code_type_array[$iter["code_type"]] . "</span></td><td><span class=text>" . $iter{"code_text"};
+
+		$has_fees = false;
+		foreach ($code_types as $key => $value) {
+			if ($value['id'] == $iter['code_type']) {
+				$has_fees = $value['fee'];
+				break;
+			}
+		}
+
+		print "<tr><td></td><td><span class=text target=Diagnosis href='diagnosis.php?mode=add" .
+			"&type=" . urlencode($iter{"code_type"}) .
+			"&code=" . urlencode($iter{"code"}) .
+			"&text=" . urlencode($iter{"code_text"})."'>";
+		print "</td><td><span class=text>" . $iter["code"] .
+			"</span></td><td><span class=text" .
+			$iter["modifier"] . "</span></td><td><span class=text>" .
+			$key .
+			"</span></td><td><span class=text>" . $iter{"code_text"};
 		print "</span></td><td>";
-		if ($iter['code_type'] != CODE_TYPE_ICD9) {
+		if ($has_fees) {
 			echo "<span class=text>" . $iter['modifier'] . "</span>";
 		}
 		echo "</td><td>";
-		if ($iter['code_type'] != CODE_TYPE_ICD9) {
+		if ($has_fees) {
 			echo "<span class=text>" . $iter['units'] . "</span>";
 		}
 		echo "</td><td>";
-		if ($iter['code_type'] != CODE_TYPE_ICD9) {
+		if ($has_fees) {
 			echo "<span class=text>$" . sprintf("%01.2f", $iter['fee']) . "</span>";
 		}
 		echo "</td><td><a class=link href='superbill_custom_full.php?mode=delete&id=".$iter{"id"}."'>[Delete]</a></td>\n";
 		echo "<td><a class=link href='superbill_custom_full.php?mode=edit&id=".$iter{"id"}."'>[Edit]</a></td></tr>\n";
-		
+
 	}
-	
 }
 
-
-
 ?>
 
 </td></tr></table>
 </table>
 
-
-
-
-
-
-
 </body>
 </html>
diff --git a/interface/reports/appt_encounter_report.php b/interface/reports/appt_encounter_report.php
index 4d22c7786..b4372e238 100644
--- a/interface/reports/appt_encounter_report.php
+++ b/interface/reports/appt_encounter_report.php
@@ -21,6 +21,7 @@
 
  include_once("../globals.php");
  include_once("../../library/patient.inc");
+ include_once("../../custom/code_types.inc.php");
 
  $alertmsg = ''; // not used yet but maybe later
 
@@ -158,10 +159,12 @@
    while ($brow = sqlFetchArray($bres)) {
     if (! $brow['billed']) $billed = "";
     if (! $brow['authorized']) $errmsg = "Needs Auth";
-    if ($brow['code_type'] == 'CPT4' || $brow['code_type'] == 'HCPCS') {
+    if ($code_types[$brow['code_type']]['just']) {
+     if (! $brow['justify']) $errmsg = "Needs Justify";
+    }
+    if ($code_types[$brow['code_type']]['fee']) {
      $charges += $brow['fee'];
      if ($brow['fee'] == 0 ) $errmsg = "Missing Fee";
-     if (! $brow['justify']) $errmsg = "Needs Justify";
     } else {
      if ($brow['fee'] != 0) $errmsg = "Misplaced Fee";
     }
-- 
2.11.4.GIT