From dc78b6f8b3165ec1e14b33917ba1eea1797406f0 Mon Sep 17 00:00:00 2001
From: Sherwin Gaddis <sherwingaddis@gmail.com>
Date: Wed, 20 Sep 2017 08:46:30 +0000
Subject: [PATCH] POS default selection for encounter (#1088)

---
 interface/forms/newpatient/common.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/interface/forms/newpatient/common.php b/interface/forms/newpatient/common.php
index 84358fb71..f960c167e 100644
--- a/interface/forms/newpatient/common.php
+++ b/interface/forms/newpatient/common.php
@@ -274,6 +274,9 @@ if ($viewmode) {
 $facilities = $facilityService->getAllServiceLocations();
 if ($facilities) {
     foreach ($facilities as $iter) {
+        if ($iter['billing_location'] == 1) {
+            $posCode = $iter['pos_code'];
+        }
     ?>
        <option value="<?php echo attr($iter['id']); ?>" <?php if ($def_facility == $iter['id']) {
             echo "selected";
@@ -306,7 +309,7 @@ if ($facilities) {
 
                 foreach ($pc->get_pos_ref() as $pos) {
                     echo "<option value=\"" . attr($pos["code"]) . "\" ";
-                    if ($pos["code"] == $result['pos_code']) {
+                    if ($pos["code"] == $result['pos_code'] || $pos["code"] == $posCode) {
                         echo "selected";
                     }
 
-- 
2.11.4.GIT