Visit history - correct count for displaying ALL results on a page (o…

…penemr#7386) * display correct count values for ALL - issue openemr#7385 * delete blank line * escape strings on line 317 * correct style --------- Co-authored-by: Jerry Padgett <[email protected]>
DiscoverAndChange · May 26, 2024 · 885ee27 · 885ee27
1 parent 5c52818
commit 885ee27
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/interface/patient_file/history/encounters.php b/interface/patient_file/history/encounters.php
@@ -314,7 +314,7 @@ function changePageSize() {
  $name = getPatientNameFirstLast($pid);
  $dob = text(oeFormatShortDate(getPatientData($pid, "DOB")['DOB']));
  $external_id = getPatientData($pid, "pubpid")['pubpid'];
- echo text($name)  . " (" . text($external_id) . ")" . "&nbsp; &nbsp; DOB: " . $dob ;
+ echo text($name) . " (" . text($external_id) . ")" . "&nbsp; &nbsp; DOB: " . $dob ;
  }
  ?>
  </span>
@@ -437,7 +437,8 @@ function changePageSize() {
  if (($pagesize > 0) && ($pagestart > 0)) {
  generatePageElement($pagestart - $pagesize, $pagesize, $billing_view, $issue, "&lArr;" . htmlspecialchars(xl("Prev"), ENT_NOQUOTES) . " ");
  }
- echo ($pagestart + 1) . "-" . $upper . " " . htmlspecialchars(xl('of'), ENT_NOQUOTES) . " " . $numRes;
+ echo (($pagesize > 0) ? ($pagestart + 1) : "1") . "-" . $upper . " " . htmlspecialchars(xl('of'), ENT_NOQUOTES) . " " . $numRes;
+
  if (($pagesize > 0) && ($pagestart + $pagesize <= $numRes)) {
  generatePageElement($pagestart + $pagesize, $pagesize, $billing_view, $issue, " " . htmlspecialchars(xl("Next"), ENT_NOQUOTES) . "&rArr;");
  }