From 314984c9e068544d1b557a999d78b53c7879f4d0 Mon Sep 17 00:00:00 2001
From: Rod Roark <rod@sunsetsystems.com>
Date: Wed, 20 Apr 2011 10:51:06 -0700
Subject: [PATCH] Fixed issue-specific encounters list to include documents
 that are linked to the issue.

---
 interface/patient_file/history/encounters.php | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/interface/patient_file/history/encounters.php b/interface/patient_file/history/encounters.php
index 20ff6c5a0..01d3063bc 100644
--- a/interface/patient_file/history/encounters.php
+++ b/interface/patient_file/history/encounters.php
@@ -231,13 +231,20 @@ else {
 
 <?php
 $drow = false;
-if (!$billing_view && !$issue) {
-    // Query the documents for this patient.
-    $dres = sqlStatement("SELECT d.id, d.type, d.url, d.docdate, d.list_id, c.name " .
-                    "FROM documents AS d, categories_to_documents AS cd, categories AS c WHERE " .
-                    "d.foreign_id = ? AND cd.document_id = d.id AND c.id = cd.category_id " .
-                    "ORDER BY d.docdate DESC, d.id DESC", array($pid) );
-    $drow = sqlFetchArray($dres);
+if (!$billing_view) {
+  // Query the documents for this patient.  If this list is issue-specific
+  // then also limit the query to documents that are linked to the issue.
+  $queryarr = array($pid);
+  $query = "SELECT d.id, d.type, d.url, d.docdate, d.list_id, c.name " .
+    "FROM documents AS d, categories_to_documents AS cd, categories AS c WHERE " .
+    "d.foreign_id = ? AND cd.document_id = d.id AND c.id = cd.category_id ";
+  if ($issue) {
+    $query .= "AND d.list_id = ? ";
+    $queryarr[] = $issue;
+  }
+  $query .= "ORDER BY d.docdate DESC, d.id DESC";
+  $dres = sqlStatement($query, $queryarr);
+  $drow = sqlFetchArray($dres);
 }
 
 // $count = 0;
-- 
2.11.4.GIT