From d4c460aa2272c911c7d5cf9eab1cbdb0d3ae9a4b Mon Sep 17 00:00:00 2001
From: bradymiller <bradymiller@users.sourceforge.net>
Date: Sat, 19 Jan 2013 03:48:07 -0800
Subject: [PATCH] Bug fix and improvements to lab display on onsite patient
 portal

 -Fixed bug to show both order names and result names
 -Reorganized column ordering to clarify results
 -Added some more columns to clarify results
 -Internationalized the items for Abnormal,Units,Result/Report Status
---
 patients/get_lab_results.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/patients/get_lab_results.php b/patients/get_lab_results.php
index 2c2b09e73..e6afe49aa 100644
--- a/patients/get_lab_results.php
+++ b/patients/get_lab_results.php
@@ -32,7 +32,8 @@
         //
 
 	$ignoreAuth=true;
-	include_once('../interface/globals.php');
+	require_once('../interface/globals.php');
+        require_once('../library/options.inc.php');
 
 	$selects = "po.procedure_order_id, po.date_ordered, " .
   		"po.procedure_type_id AS order_type_id, pt1.name AS procedure_name, " .
@@ -76,10 +77,13 @@
   			<tr class="header">
   				<th><?php echo htmlspecialchars( xl('Order Date'),ENT_NOQUOTES); ?></th>
   				<th><?php echo htmlspecialchars( xl('Order Name'),ENT_NOQUOTES); ?></th>
-  				<th><?php echo htmlspecialchars( xl('Report Status'),ENT_NOQUOTES); ?></th>
-  				<th><?php echo htmlspecialchars( xl('Results Group'),ENT_NOQUOTES); ?></th>
+                                <th><?php echo htmlspecialchars( xl('Result Name'),ENT_NOQUOTES); ?></th>
   				<th><?php echo htmlspecialchars( xl('Abnormal'),ENT_NOQUOTES); ?></th>
   				<th><?php echo htmlspecialchars( xl('Value'),ENT_NOQUOTES); ?></th>
+                                <th><?php echo htmlspecialchars( xl('Range'),ENT_NOQUOTES); ?></th>
+                                <th><?php echo htmlspecialchars( xl('Units'),ENT_NOQUOTES); ?></th>
+                                <th><?php echo htmlspecialchars( xl('Result Status'),ENT_NOQUOTES); ?></th>
+                                <th><?php echo htmlspecialchars( xl('Report Status'),ENT_NOQUOTES); ?></th>
   			</tr>
   		<?php
   		$even=false;
@@ -95,10 +99,13 @@
   			echo "<tr class='".$class."'>";
   			echo "<td>".htmlspecialchars($date[1]."/".$date[2]."/".$date[0],ENT_NOQUOTES)."</td>";
   			echo "<td>".htmlspecialchars($row['procedure_name'],ENT_NOQUOTES)."</td>";
-  			echo "<td>".htmlspecialchars($row['report_status'],ENT_NOQUOTES)."</td>";
-  			echo "<td>".htmlspecialchars($row['result_status'],ENT_NOQUOTES)."</td>";
-  			echo "<td>".htmlspecialchars($row['abnormal'],ENT_NOQUOTES)."</td>";
+                        echo "<td>".htmlspecialchars($row['result_name'],ENT_NOQUOTES)."</td>";
+                        echo "<td>".generate_display_field(array('data_type'=>'1','list_id'=>'proc_res_abnormal'),$row['abnormal'])."</td>";
   			echo "<td>".htmlspecialchars($row['result'],ENT_NOQUOTES)."</td>";
+                        echo "<td>".htmlspecialchars($row['result_def_range'],ENT_NOQUOTES)."</td>";
+                        echo "<td>".generate_display_field(array('data_type'=>'1','list_id'=>'proc_unit'),$row['result_def_units'])."</td>";
+                        echo "<td>".generate_display_field(array('data_type'=>'1','list_id'=>'proc_res_status'),$row['result_status'])."</td>";
+                        echo "<td>".generate_display_field(array('data_type'=>'1','list_id'=>'proc_rep_status'),$row['report_status'])."</td>";
   			echo "</tr>";
   		}
 		echo "</table>";
-- 
2.11.4.GIT