From 7e6b272af86b97e99f986f19a35a26bf5d709b32 Mon Sep 17 00:00:00 2001
From: Rod Roark <rod@sunsetsystems.com>
Date: Mon, 21 Nov 2011 11:47:27 -0800
Subject: [PATCH] Fixes for encounter date display when showing historical LBF
 data.

---
 interface/forms/LBF/new.php                     | 20 ++++++++++++++------
 interface/patient_file/summary/lbf_fragment.php | 14 ++++++++++----
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/interface/forms/LBF/new.php b/interface/forms/LBF/new.php
index a4c25eecb..b269681e6 100644
--- a/interface/forms/LBF/new.php
+++ b/interface/forms/LBF/new.php
@@ -12,6 +12,7 @@ require_once("$srcdir/forms.inc");
 require_once("$srcdir/options.inc.php");
 require_once("$srcdir/patient.inc");
 require_once("$srcdir/formdata.inc.php");
+require_once("$srcdir/formatting.inc.php");
 
 $CPR = 4; // cells per row
 
@@ -326,14 +327,21 @@ function sel_related() {
         echo "<td colspan='$CPR' align='right' class='bold'>";
         if (empty($is_lbf)) echo htmlspecialchars(xl('Current'));
         echo "</td>\n";
-        $hres = sqlStatement("SELECT date, form_id FROM forms WHERE " .
-          "pid = '$pid' AND formdir = '$formname' AND " .
-          "form_id != '$formid' AND deleted = 0 " .
-          "ORDER BY date DESC LIMIT $formhistory");
+        $hres = sqlStatement("SELECT f.form_id, fe.date " .
+          "FROM forms AS f, form_encounter AS fe WHERE " .
+          "f.pid = ? AND f.formdir = ? AND " .
+          "f.form_id != ? AND f.deleted = 0 AND " .
+          "fe.pid = f.pid AND fe.encounter = f.encounter " .
+          "ORDER BY fe.date DESC, f.encounter DESC, f.date DESC " .
+          "LIMIT ?",
+          array($pid, $formname, $formid, $formhistory));
+        // For some readings like vitals there may be multiple forms per encounter.
+        // We sort these sensibly, however only the encounter date is shown here;
+        // at some point we may wish to show also the data entry date/time.
         while ($hrow = sqlFetchArray($hres)) {
           $historical_ids[$hrow['form_id']] = '';
-          echo "<td colspan='$CPR' align='right' class='bold'>&nbsp;" . $hrow['date'] . "</td>\n";
-          // TBD: Format date per globals.
+          echo "<td colspan='$CPR' align='right' class='bold'>&nbsp;" .
+            oeFormatShortDate(substr($hrow['date'], 0, 10)) . "</td>\n";
         }
         echo " </tr>";
       }
diff --git a/interface/patient_file/summary/lbf_fragment.php b/interface/patient_file/summary/lbf_fragment.php
index 3e0a25af4..040a3d988 100644
--- a/interface/patient_file/summary/lbf_fragment.php
+++ b/interface/patient_file/summary/lbf_fragment.php
@@ -25,6 +25,7 @@ $sanitize_all_escapes = true;
 $fake_register_globals = false;
 
 require_once("../../globals.php");
+require_once("$srcdir/formatting.inc.php");
 
 $lbf_form_id = $_GET['formname'];
 ?>
@@ -32,10 +33,15 @@ $lbf_form_id = $_GET['formname'];
 <br />
 <?php
 // Retrieve most recent instance of this form for this patient.
-$result = sqlQuery("SELECT date, form_id, form_name FROM forms WHERE pid = ? " .
-  "AND formdir = ? AND deleted = 0 ORDER BY date DESC LIMIT 1",
+$result = sqlQuery("SELECT f.form_id, f.form_name, fe.date " .
+  "FROM forms AS f, form_encounter AS fe WHERE " .
+  "f.pid = ? AND f.formdir = ? AND " .
+  "f.deleted = 0 AND " .
+  "fe.pid = f.pid AND fe.encounter = f.encounter " .
+  "ORDER BY fe.date DESC, f.encounter DESC, f.date DESC " .
+  "LIMIT 1",
   array($pid, $lbf_form_id));
-    
+
 if (!$result) { //If there are none
 ?>
   <span class='text'> <?php echo htmlspecialchars(xl("None have been documented"), ENT_NOQUOTES); ?>
@@ -44,7 +50,7 @@ if (!$result) { //If there are none
   <span class='text'><b>
 <?php
   echo htmlspecialchars(xl('Most recent from') . ": " .
-    substr($result['date'], 0, 10), ENT_NOQUOTES);
+    oeFormatShortDate(substr($result['date'], 0, 10)), ENT_NOQUOTES);
 ?>
   </b></span>
   <br />
-- 
2.11.4.GIT