diff --git a/_rest_routes.inc.php b/_rest_routes.inc.php
index 6683d1b2735..b335e9538c5 100644
--- a/_rest_routes.inc.php
+++ b/_rest_routes.inc.php
@@ -43,22 +43,21 @@
     },
     "GET /api/facility" => function () {
         RestConfig::authorization_check("admin", "users");
-        return (new FacilityRestController())->getAll();
+        return (new FacilityRestController())->getAll($_GET);
     },
-    "GET /api/facility/:fid" => function ($fid) {
+    "GET /api/facility/:fuuid" => function ($fuuid) {
         RestConfig::authorization_check("admin", "users");
-        return (new FacilityRestController())->getOne($fid);
+        return (new FacilityRestController())->getOne($fuuid);
     },
     "POST /api/facility" => function () {
         RestConfig::authorization_check("admin", "super");
         $data = (array) (json_decode(file_get_contents("php://input")));
         return (new FacilityRestController())->post($data);
     },
-    "PUT /api/facility/:fid" => function ($fid) {
+    "PATCH /api/facility/:fuuid" => function ($fuuid) {
         RestConfig::authorization_check("admin", "super");
         $data = (array) (json_decode(file_get_contents("php://input")));
-        $data["fid"] = $fid;
-        return (new FacilityRestController())->put($data);
+        return (new FacilityRestController())->patch($fuuid, $data);
     },
     "GET /api/patient" => function () {
         RestConfig::authorization_check("patients", "demo");
@@ -417,10 +416,20 @@
         return (new FhirPractitionerRestController())->patch($id, $data);
     },
     "GET /fhir/Organization" => function () {
-        return (new FhirOrganizationRestController(null))->getAll($_GET);
+        return (new FhirOrganizationRestController())->getAll($_GET);
     },
     "GET /fhir/Organization/:id" => function ($id) {
-        return (new FhirOrganizationRestController(null))->getOne($id);
+        return (new FhirOrganizationRestController())->getOne($id);
+    },
+    "POST /fhir/Organization" => function () {
+        RestConfig::authorization_check("admin", "super");
+        $data = (array) (json_decode(file_get_contents("php://input"), true));
+        return (new FhirOrganizationRestController())->post($data);
+    },
+    "PATCH /fhir/Organization/:id" => function ($id) {
+        RestConfig::authorization_check("admin", "super");
+        $data = (array) (json_decode(file_get_contents("php://input"), true));
+        return (new FhirOrganizationRestController())->patch($id, $data);
     },
     "GET /fhir/AllergyIntolerance" => function () {
         RestConfig::authorization_check("patients", "med");
diff --git a/interface/batchcom/batch_phone_notification.php b/interface/batchcom/batch_phone_notification.php
index 83c9c5accf0..5d918af4e76 100644
--- a/interface/batchcom/batch_phone_notification.php
+++ b/interface/batchcom/batch_phone_notification.php
@@ -222,7 +222,7 @@ function cron_getFacilitiesMap()
     $facility_phone_map = array();
     //get facilities from the database
 
-    $facilities = $facilityService->getAll();
+    $facilities = $facilityService->getAllFacility();
     foreach ($facilities as $prow) {
         $facility_msg_map[$prow['id']] = $message_map[$prow['name']];
         $facility_phone_map[$prow['id']] = $prow['phone'];
diff --git a/interface/login/login.php b/interface/login/login.php
index 3f365f57df3..b410a7f6cf3 100644
--- a/interface/login/login.php
+++ b/interface/login/login.php
@@ -208,7 +208,7 @@ function transmit_form(element) {
 
                 if ($GLOBALS['login_into_facility']) {
                     $facilityService = new FacilityService();
-                    $facilities = $facilityService->getAll();
+                    $facilities = $facilityService->getAllFacility();
                     $facilitySelected = ($GLOBALS['set_facility_cookie'] && isset($_COOKIE['pc_facility'])) ? $_COOKIE['pc_facility'] : null;
                 }
                 ?>
diff --git a/interface/orders/pending_followup.php b/interface/orders/pending_followup.php
index 343d0b1477b..15f779f0efe 100644
--- a/interface/orders/pending_followup.php
+++ b/interface/orders/pending_followup.php
@@ -131,7 +131,7 @@ function thisLineItem($row, $codetype, $code)
     <?php
   // Build a drop-down list of facilities.
   //
-    $fres = $facilityService->getAll();
+    $fres = $facilityService->getAllFacility();
     echo "   <select name='form_facility'>\n";
     echo "    <option value=''>-- All Facilities --\n";
     foreach ($fres as $frow) {
diff --git a/interface/reports/appt_encounter_report.php b/interface/reports/appt_encounter_report.php
index 02fb88f9167..127704ad258 100644
--- a/interface/reports/appt_encounter_report.php
+++ b/interface/reports/appt_encounter_report.php
@@ -255,7 +255,7 @@ function endDoctor(&$docrow)
                 <?php
                  // Build a drop-down list of facilities.
                  //
-                $fres = $facilityService->getAll();
+                $fres = $facilityService->getAllFacility();
                 echo "   <select name='form_facility' class='form-control'>\n";
                 echo "    <option value=''>-- " . xlt('All Facilities') . " --\n";
                 foreach ($fres as $frow) {
diff --git a/interface/reports/daily_summary_report.php b/interface/reports/daily_summary_report.php
index b66156501bb..8699e72e6ca 100644
--- a/interface/reports/daily_summary_report.php
+++ b/interface/reports/daily_summary_report.php
@@ -160,7 +160,7 @@ class='datepicker form-control'
         $whereTotalVisitConditions = $whereTotalPaymentConditions = $wherePaidConditions = $whereNewPatientConditions = '1 = 1 ';
 
         // fetch all facility from the table
-        $facilityRecords = $facilityService->getAll();
+        $facilityRecords = $facilityService->getAllFacility();
         foreach ($facilityRecords as $facilityList) {
             if (1 === $facilitySet && $facilityList['id'] == $selectedFacility) {
                 $facilities[$facilityList['id']] = $facilityList['name'];
diff --git a/interface/reports/ippf_daily.php b/interface/reports/ippf_daily.php
index a5f206913bc..ed9f3bac863 100644
--- a/interface/reports/ippf_daily.php
+++ b/interface/reports/ippf_daily.php
@@ -176,7 +176,7 @@ function genNumCell($num, $cnum)
     <?php
  // Build a drop-down list of facilities.
  //
-    $fres = $facilityService->getAll();
+    $fres = $facilityService->getAllFacility();
     echo "   <select name='form_facility'>\n";
     echo "    <option value=''>-- All Facilities --\n";
     foreach ($fres as $frow) {
diff --git a/interface/reports/ippf_statistics.php b/interface/reports/ippf_statistics.php
index 59d57a3c77d..aa8913f03fc 100644
--- a/interface/reports/ippf_statistics.php
+++ b/interface/reports/ippf_statistics.php
@@ -1210,7 +1210,7 @@ function selreport() {
     <?php
 // Build a drop-down list of facilities.
 //
-    $fres = $facilityService->getAll();
+    $fres = $facilityService->getAllFacility();
     echo "      <select name='form_facility'>\n";
     echo "       <option value=''>-- All Facilities --\n";
     foreach ($fres as $frow) {
diff --git a/interface/usergroup/facilities.php b/interface/usergroup/facilities.php
index c795d3f78e4..f87ab9b15fd 100644
--- a/interface/usergroup/facilities.php
+++ b/interface/usergroup/facilities.php
@@ -64,7 +64,7 @@
         "info" => trim(isset($_POST["info"]) ? $_POST["info"] : '')
     );
 
-    $insert_id = $facilityService->insert($newFacility);
+    $insert_id = $facilityService->insertFacility($newFacility);
     exit(); // sjp 12/20/17 for ajax save
 }
 
@@ -105,7 +105,7 @@
         "info" => trim(isset($_POST["info"]) ? $_POST["info"] : '')
     );
 
-    $facilityService->update($newFacility);
+    $facilityService->updateFacility($newFacility);
 
     // Update facility name for all users with this facility.
     // This is necassary because some provider based code uses facility name for lookups instead of facility id.
@@ -183,7 +183,7 @@ function refreshme() {
                         <tbody>
                             <?php
                             $fres = 0;
-                            $fres = $facilityService->getAll();
+                            $fres = $facilityService->getAllFacility();
                             if ($fres) {
                                 $result2 = array();
                                 for ($iter3 = 0; $iter3 < sizeof($fres); $iter3++) {
diff --git a/library/options.inc.php b/library/options.inc.php
index 09524e82d8b..5fb4343e128 100644
--- a/library/options.inc.php
+++ b/library/options.inc.php
@@ -3657,7 +3657,7 @@ function dropdown_facility(
     global $facilityService;
 
     $have_selected = false;
-    $fres = $facilityService->getAll();
+    $fres = $facilityService->getAllFacility();
 
     echo "   <select class='form-control' name='" . attr($name) . "' id='" . attr($name) . "'";
     if ($onchange) {
diff --git a/library/patient.inc b/library/patient.inc
index ceb31da6625..5bc134986b4 100644
--- a/library/patient.inc
+++ b/library/patient.inc
@@ -249,7 +249,7 @@ function getFacilities($first = '')
 {
     global $facilityService;
 
-    $fres = $facilityService->getAll();
+    $fres = $facilityService->getAllFacility();
 
     if ($first == 'first') {
         return $fres[0]['id'];
diff --git a/modules/sms_email_reminder/batch_phone_notification.php b/modules/sms_email_reminder/batch_phone_notification.php
index d7384aa9bb2..16ddee19b70 100644
--- a/modules/sms_email_reminder/batch_phone_notification.php
+++ b/modules/sms_email_reminder/batch_phone_notification.php
@@ -224,7 +224,7 @@ function cron_getFacilitiesMap()
     $facility_msg_map = array();
     $facility_phone_map = array();
     //get facilities from the database
-    $fres = $facilityService->getAll();
+    $fres = $facilityService->getAllFacility();
     foreach ($fres as $frow) {
         $facility_msg_map[$frow['id']] = $message_map[$frow['name']];
         $facility_phone_map[$frow['id']] = $frow['phone'];
diff --git a/sql/5_0_2-to-6_0_0_upgrade.sql b/sql/5_0_2-to-6_0_0_upgrade.sql
index c211373ee4e..09ccbcba676 100644
--- a/sql/5_0_2-to-6_0_0_upgrade.sql
+++ b/sql/5_0_2-to-6_0_0_upgrade.sql
@@ -750,3 +750,14 @@ ALTER TABLE `facility_user_ids` ADD `uuid` binary(16) DEFAULT NULL;
 #IfNotIndex facility_user_ids uuid
 CREATE INDEX `uuid` ON `facility_user_ids` (`uuid`);
 #EndIf
+
+#IfMissingColumn facility uuid
+ALTER TABLE `facility` ADD `uuid` binary(16) DEFAULT NULL;
+#EndIf
+
+#IfUuidNeedUpdate facility
+#EndIf
+
+#IfNotIndex facility uuid
+CREATE UNIQUE INDEX `uuid` ON `facility` (`uuid`);
+#EndIf
diff --git a/sql/database.sql b/sql/database.sql
index e43cb4ead87..3e041a398d4 100644
--- a/sql/database.sql
+++ b/sql/database.sql
@@ -1578,6 +1578,7 @@ CREATE TABLE `standardized_tables_track` (
 DROP TABLE IF EXISTS `facility`;
 CREATE TABLE `facility` (
   `id` int(11) NOT NULL auto_increment,
+  `uuid` binary(16) DEFAULT NULL,
   `name` varchar(255) default NULL,
   `phone` varchar(30) default NULL,
   `fax` varchar(30) default NULL,
@@ -1611,6 +1612,7 @@ CREATE TABLE `facility` (
   `oid` VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'HIEs CCDA and FHIR an OID is required/wanted',
   `iban` varchar(50) default NULL,
   `info` TEXT,
+  UNIQUE KEY `uuid` (`uuid`),
   PRIMARY KEY  (`id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=4;
 
@@ -1618,7 +1620,7 @@ CREATE TABLE `facility` (
 -- Inserting data for table `facility`
 --
 
-INSERT INTO `facility` VALUES (3, 'Your Clinic Name Here', '000-000-0000', '000-000-0000', '', '', '', '', '', '', NULL, NULL, 1, 1, 0, NULL, '', '', '', '', '', '','#99FFFF','0', '', '1', '', '', '', '', '', '', '', '');
+INSERT INTO `facility` VALUES (3, NULL, 'Your Clinic Name Here', '000-000-0000', '000-000-0000', '', '', '', '', '', '', NULL, NULL, 1, 1, 0, NULL, '', '', '', '', '', '','#99FFFF','0', '', '1', '', '', '', '', '', '', '', '');
 
 -- --------------------------------------------------------
 
diff --git a/src/RestControllers/FHIR/FhirOrganizationRestController.php b/src/RestControllers/FHIR/FhirOrganizationRestController.php
index 72dd9d4aad7..e413bd3a0f6 100644
--- a/src/RestControllers/FHIR/FhirOrganizationRestController.php
+++ b/src/RestControllers/FHIR/FhirOrganizationRestController.php
@@ -7,70 +7,105 @@
 use OpenEMR\Services\FHIR\FhirResourcesService;
 use OpenEMR\RestControllers\RestControllerHelper;
 use OpenEMR\FHIR\R4\FHIRResource\FHIRBundle\FHIRBundleEntry;
+use OpenEMR\Validators\ProcessingResult;
 
+require_once(__DIR__ . '/../../../_rest_config.php');
+/**
+ * FHIR Organization Service
+ *
+ * @coversDefaultClass OpenEMR\Services\FHIR\FhirOrganizationService
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786@gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ *
+ */
 class FhirOrganizationRestController
 {
     private $fhirOrganizationService;
     private $fhirService;
     private $fhirValidationService;
     
-    public function __construct($pid)
+    public function __construct()
     {
-        $this->fhirOrganizationService = new FhirOrganizationService();
-        $this->fhirOrganizationService->setId($pid);
         $this->fhirService = new FhirResourcesService();
+        $this->fhirOrganizationService = new FhirOrganizationService();
         $this->fhirValidationService = new FhirValidationService();
     }
 
-    public function getAll($search)
+    /**
+     * Queries for FHIR organization resources using various search parameters.
+     * Search parameters include:
+     * - address (street, postal_code, city, country_code or state)
+     * - address-city
+     * - address-postalcode
+     * - address-state
+     * - email
+     * - name
+     * - phone (work)
+     * - telecom (email, phone)
+     * @return FHIR bundle with query results, if found
+     */
+    public function getAll($searchParams)
     {
-        $result = $this->fhirOrganizationService->getAll();
-        if (!$result) {
-            $statusCode = 400;
-            $result = $this->fhirValidationService->operationOutcomeResourceService(
-                'error',
-                'invalid',
-                false,
-                "Invalid Parameter"
-            );
-        } else {
-            $statusCode = 200;
-            $entries = array();
-            foreach ($result as $org) {
-                $entryResource = $this->fhirOrganizationService->createOrganizationResource(
-                    $org['id'],
-                    $org,
-                    false,
-                    $org['code'],
-                    $org['display']
-                );
-                $entry = array(
-                    'fullUrl' => $resourceURL . "/" . $org['id'],
-                    'resource' => $entryResource
-                );
-                $entries[] = new FHIRBundleEntry($entry);
-            }
-            $result = $this->fhirService->createBundle('Organization', $entries, false);
+        $processingResult = $this->fhirOrganizationService->getAll($searchParams);
+        $bundleEntries = array();
+        foreach ($processingResult->getData() as $index => $searchResult) {
+            $bundleEntry = [
+                'fullUrl' =>  \RestConfig::$REST_FULL_URL . '/' . $searchResult->getId(),
+                'resource' => $searchResult
+            ];
+            $fhirBundleEntry = new FHIRBundleEntry($bundleEntry);
+            array_push($bundleEntries, $fhirBundleEntry);
         }
-        return RestControllerHelper::responseHandler($result, null, $statusCode);
+        $bundleSearchResult = $this->fhirService->createBundle('Organization', $bundleEntries, false);
+        $searchResponseBody = RestControllerHelper::responseHandler($bundleSearchResult, null, 200);
+        return $searchResponseBody;
+    }
+
+
+    /**
+     * Queries for a single FHIR organization resource by FHIR id
+     * @param $fhirId The FHIR organization resource id (uuid)
+     * @returns 200 if the operation completes successfully
+     */
+    public function getOne($fhirId)
+    {
+        $processingResult = $this->fhirOrganizationService->getOne($fhirId, true);
+        return RestControllerHelper::handleProcessingResult($processingResult, 200);
+    }
+
+    /**
+     * Creates a new FHIR organization resource
+     * @param $fhirJson The FHIR organization resource
+     * @returns 201 if the resource is created, 400 if the resource is invalid
+     */
+    public function post($fhirJson)
+    {
+        $fhirValidationService = $this->fhirValidationService->validate($fhirJson);
+        if (!empty($fhirValidationService)) {
+            return RestControllerHelper::responseHandler($fhirValidationService, null, 400);
+        }
+
+        $processingResult = $this->fhirOrganizationService->insert($fhirJson);
+        return RestControllerHelper::handleProcessingResult($processingResult, 201);
     }
 
-    public function getOne($oid)
+    /**
+     * Updates an existing FHIR organization resource
+     * @param $fhirId The FHIR organization resource id (uuid)
+     * @param $fhirJson The updated FHIR organization resource (complete resource)
+     * @returns 200 if the resource is created, 400 if the resource is invalid
+     */
+    public function patch($fhirId, $fhirJson)
     {
-        $result = $this->fhirOrganizationService->getOne($oid);
-        if ($result) {
-            $resource = $this->fhirOrganizationService->createOrganizationResource($result['id'], $result, false, $result['code'], $result['display']);
-            $statusCode = 200;
-        } else {
-            $statusCode = 404;
-            $resource = $this->fhirValidationService->operationOutcomeResourceService(
-                'error',
-                'invalid',
-                false,
-                "Resource Id $pid does not exist"
-            );
+        $fhirValidationService = $this->fhirValidationService->validate($fhirJson);
+        if (!empty($fhirValidationService)) {
+            return RestControllerHelper::responseHandler($fhirValidationService, null, 400);
         }
 
-        return RestControllerHelper::responseHandler($resource, null, $statusCode);
+        $processingResult = $this->fhirOrganizationService->update($fhirId, $fhirJson);
+        return RestControllerHelper::handleProcessingResult($processingResult, 200);
     }
 }
diff --git a/src/RestControllers/FacilityRestController.php b/src/RestControllers/FacilityRestController.php
index 4457caa7639..b6cad0a642a 100644
--- a/src/RestControllers/FacilityRestController.php
+++ b/src/RestControllers/FacilityRestController.php
@@ -19,44 +19,83 @@ class FacilityRestController
 {
     private $facilityService;
 
+    /**
+     * White list of facility search fields
+     */
+    private const WHITELISTED_FIELDS = array(
+        "name",
+        "phone",
+        "fax",
+        "street",
+        "city",
+        "state",
+        "postal_code",
+        "country_code",
+        "federal_ein",
+        "website",
+        "email",
+        "domain_identifier",
+        "facility_npi",
+        "facility_taxonomy",
+        "facility_code",
+        "billing_location",
+        "accepts_assignment",
+        "oid",
+        "service_location"
+    );
+
     public function __construct()
     {
         $this->facilityService = new FacilityService();
     }
 
-    public function getOne($id)
+    /**
+     * Fetches a single facility resource by id.
+     * @param $uuid - The facility uuid identifier in string format.
+     */
+    public function getOne($uuid)
     {
-        $serviceResult = $this->facilityService->getById($id);
-        return RestControllerHelper::responseHandler($serviceResult, null, 200);
+        $processingResult = $this->facilityService->getOne($uuid);
+
+        if (!$processingResult->hasErrors() && count($processingResult->getData()) == 0) {
+            return RestControllerHelper::handleProcessingResult($processingResult, 404);
+        }
+
+        return RestControllerHelper::handleProcessingResult($processingResult, 200);
     }
 
-    public function getAll()
+    /**
+     * Returns facility resources which match an optional search criteria.
+     */
+    public function getAll($search = array())
     {
-        $serviceResult = $this->facilityService->getAll();
-        return RestControllerHelper::responseHandler($serviceResult, null, 200);
+        $validSearchFields = $this->facilityService->filterData($search, self::WHITELISTED_FIELDS);
+        $processingResult = $this->facilityService->getAll($validSearchFields);
+        return RestControllerHelper::handleProcessingResult($processingResult, 200, true);
     }
 
+    /**
+     * Process a HTTP POST request used to create a facility record.
+     * @param $data - array of facility fields.
+     * @return a 201/Created status code and the facility identifier if successful.
+     */
     public function post($data)
     {
-        $validationResult = $this->facilityService->validate($data);
-        $validationHandlerResult = RestControllerHelper::validationHandler($validationResult);
-        if (is_array($validationHandlerResult)) {
-            return $validationHandlerResult;
-        }
-
-        $serviceResult = $this->facilityService->insert($data);
-        return RestControllerHelper::responseHandler($serviceResult, array('fid' => $serviceResult), 201);
+        $filteredData = $this->facilityService->filterData($data, self::WHITELISTED_FIELDS);
+        $processingResult = $this->facilityService->insert($filteredData);
+        return RestControllerHelper::handleProcessingResult($processingResult, 201);
     }
 
-    public function put($data)
+    /**
+     * Processes a HTTP PUT request used to update an existing facility record.
+     * @param $puuidString - The facility uuid identifier in string format.
+     * @param $data - array of facility fields (full resource).
+     * @return a 200/Ok status code and the facility resource.
+     */
+    public function patch($uuid, $data)
     {
-        $validationResult = $this->facilityService->validate($data);
-        $validationHandlerResult = RestControllerHelper::validationHandler($validationResult);
-        if (is_array($validationHandlerResult)) {
-            return $validationHandlerResult;
-        }
-
-        $serviceResult = $this->facilityService->update($data);
-        return RestControllerHelper::responseHandler($serviceResult, array('fid' => $data['fid']), 200);
+        $filteredData = $this->facilityService->filterData($data, self::WHITELISTED_FIELDS);
+        $processingResult = $this->facilityService->update($uuid, $filteredData);
+        return RestControllerHelper::handleProcessingResult($processingResult, 200);
     }
 }
diff --git a/src/Services/FHIR/FhirOrganizationService.php b/src/Services/FHIR/FhirOrganizationService.php
index b2667cdc96f..7f51c83df75 100644
--- a/src/Services/FHIR/FhirOrganizationService.php
+++ b/src/Services/FHIR/FhirOrganizationService.php
@@ -4,107 +4,279 @@
 
 use OpenEMR\FHIR\R4\FHIRDomainResource\FHIROrganization;
 use OpenEMR\FHIR\R4\FHIRElement\FHIRAddress;
-use OpenEMR\FHIR\R4\FHIRElement\FHIRCodeableConcept;
-use OpenEMR\FHIR\R4\FHIRElement\FHIRCoding;
 use OpenEMR\FHIR\R4\FHIRElement\FHIRId;
-use OpenEMR\FHIR\R4\FHIRElement\FHIRMeta;
-use OpenEMR\FHIR\R4\FHIRElement\FHIRReference;
-use OpenEMR\FHIR\R4\FHIRResource\FHIRBundle;
-use OpenEMR\FHIR\R4\FHIRResource\FHIRBundle\FHIRBundleLink;
-use OpenEMR\FHIR\R4\PHPFHIRResponseParser;
+use OpenEMR\Services\FacilityService;
 
-class FhirOrganizationService
+/**
+ * FHIR Organization Service
+ *
+ * @coversDefaultClass OpenEMR\Services\FHIR\FhirOrganizationService
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786@gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ *
+ */
+class FhirOrganizationService extends FhirServiceBase
 {
-    
-    private $id;
-    
+    /**
+     * @var FacilityService
+     */
+    private $organizationService;
+
     public function __construct()
     {
+        parent::__construct();
+        $this->organizationService = new FacilityService();
     }
-    
-    public function setId($id)
-    {
-        $this->id = $id;
-    }
-    
-    public function getAll()
+
+    /**
+     * Returns an array mapping FHIR Organization Resource search parameters to OpenEMR Organization search parameters
+     * @return array The search parameters
+     */
+    protected function loadSearchParameters()
     {
-        $facilitySQL = "SELECT id,
-                            name,
-                            phone,
-                            street,
-                            city,
-                            state,
-                            postal_code,
-                            country_code as country,
-                            email
-                        FROM facility;";
-
-        $facilityResults = sqlStatement($facilitySQL);
-        $results = array();
-        while ($row = sqlFetchArray($facilityResults)) {
-            $row['code'] = 'prov';
-            $row['display'] = "Healthcare Provider";
-            array_push($results, $row);
-        }
-        return $results;
+        return  [
+            "email" => ["email"],
+            "phone" => ["phone"],
+            "telecom" => ["email", "phone",],
+            "address" => ["street", "postal_code", "city", "state", "country_code"],
+            "address-city" => ["city"],
+            "address-postalcode" => ["postal_code"],
+            "address-state" => ["state"],
+            "name" => ["name"],
+            "active" => ["service_location"]
+        ];
     }
 
-    public function getOne($oid)
+    /**
+     * Parses an OpenEMR organization record, returning the equivalent FHIR Organization Resource
+     *
+     * @param array $dataRecord The source OpenEMR data record
+     * @param boolean $encode Indicates if the returned resource is encoded into a string. Defaults to false.
+     * @return FHIROrganization
+     */
+    public function parseOpenEMRRecord($dataRecord = array(), $encode = false)
     {
-        $facilitySQL = "SELECT id, name, phone, street, city, state, postal_code, country_code as country, email FROM facility WHERE id = ?";
+        $organizationResource = new FHIROrganization();
 
-        $result = sqlQuery($facilitySQL, $oid);
-        $result['code'] = 'prov';
-        $result['display'] = "Healthcare Provider";
-        return $result;
-    }
+        $meta = array('versionId' => '1', 'lastUpdated' => gmdate('c'));
+        $organizationResource->setMeta($meta);
 
-    public function createOrganizationResource($oid = '', $data = '', $encode = true, $code = '', $display = '')
-    {
-        $id = new FhirId();
-        $id->setValue($oid);
-        $nowDate = date("Y-m-d\TH:i:s");
-        $meta = new FHIRMeta();
-        $meta->setVersionId('1');
-        $meta->setLastUpdated($nowDate);
-        $initResource = array(
-            'id' => $id,
-            'meta' => $meta
+        $organizationResource->setActive($dataRecord['service_location'] == "1" ? true : false);
+
+        $narrativeText = '';
+        if (isset($dataRecord['name'])) {
+            $narrativeText = $dataRecord['name'];
+        }
+        $text = array(
+            'status' => 'generated',
+            'div' => '<div xmlns="http://www.w3.org/1999/xhtml"> <p>' . $narrativeText . '</p></div>'
         );
-        
-        $initResource['active'] = true;
+        $organizationResource->setText($text);
+
+        $id = new FHIRId();
+        $id->setValue($dataRecord['uuid']);
+        $organizationResource->setId($id);
+
+        if (isset($dataRecord['name'])) {
+            $organizationResource->setName($dataRecord['name']);
+        }
+
         $address = new FHIRAddress();
-        $address->addLine($data['line1'] . ' ' . $data['line2']);
-        $address->setCity($data['city']);
-        $address->setState($data['state']);
-        $address->setCountry($data['country']);
-        $address->setPostalCode($data['postal_code']);
-        $initResource['address'] = array();
-        array_push($initResource['address'], $address->jsonSerialize());
-        $initResource['name'] = $data['name'];
-        $coding = new FHIRCoding();
-        $coding->setSystem("http://terminology.hl7.org/CodeSystem/organization-type");
-        $coding->setCode($code);
-        $coding->setDisplay($display);
-        $initResource['type'] = array();
-        array_push($initResource['type'], $coding->jsonSerialize());
-        $initResource['telecom'] = array();
-        $email = array(
-            'system' => 'email',
-            'value' => $data["email"]
-        );
-        $phone = array(
-            'system' => 'phone',
-            'value' => $data['phone']
-        );
-        array_push($initResource['telecom'], $email);
-        array_push($initResource['telecom'], $phone);
-        $resource = new FHIROrganization($initResource);
+        if (!empty($dataRecord['street'])) {
+            $address->addLine($dataRecord['street']);
+        }
+        if (!empty($dataRecord['city'])) {
+            $address->setCity($dataRecord['city']);
+        }
+        if (!empty($dataRecord['state'])) {
+            $address->setState($dataRecord['state']);
+        }
+        if (!empty($dataRecord['postal_code'])) {
+            $address->setPostalCode($dataRecord['postal_code']);
+        }
+        if (isset($dataRecord['country_code'])) {
+            $address->setCountry($dataRecord['country_code']);
+        }
+
+        $organizationResource->addAddress($address);
+
+        if (!empty($dataRecord['phone'])) {
+            $organizationResource->addTelecom(array(
+                'system' => 'phone',
+                'value' => $dataRecord['phone'],
+                'use' => 'work'
+            ));
+        }
+
+        if (isset($dataRecord['email'])) {
+            $organizationResource->addTelecom(array(
+                'system' => 'email',
+                'value' => $dataRecord['email'],
+                'use' => 'work'
+            ));
+        }
+
+        if (isset($dataRecord['fax'])) {
+            $organizationResource->addTelecom(array(
+                'system' => 'fax',
+                'value' => $dataRecord['fax'],
+                'use' => 'work'
+            ));
+        }
+
+        if (isset($dataRecord['facility_npi'])) {
+            $fhirIdentifier = [
+                'system' => "http://hl7.org/fhir/sid/us-npi",
+                'value' => $dataRecord['facility_npi']
+            ];
+            $organizationResource->addIdentifier($fhirIdentifier);
+        }
+
+        if (isset($dataRecord['domain_identifier'])) {
+            $fhirIdentifier = [
+                'system' => "urn:oid:2.16.840.1.113883.4.7",
+                'value' => $dataRecord['domain_identifier']
+            ];
+            $organizationResource->addIdentifier($fhirIdentifier);
+        }
+
         if ($encode) {
-            return json_encode($resource);
+            return json_encode($organizationResource);
         } else {
-            return $resource;
+            return $organizationResource;
+        }
+    }
+
+    /**
+     * Parses a FHIR Organization Resource, returning the equivalent OpenEMR organization record.
+     *
+     * @param array $fhirResource The source FHIR resource
+     * @return array a mapped OpenEMR data record (array)
+     */
+    public function parseFhirResource($fhirResource = array())
+    {
+        $data = array();
+
+        if (isset($fhirResource['id'])) {
+            $data['uuid'] = $fhirResource['id'];
+        }
+
+        if (isset($fhirResource['name'])) {
+            $data['name'] = $fhirResource['name'];
         }
+
+        if (isset($fhirResource['address'])) {
+            if (isset($fhirResource['address'][0]['line'][0])) {
+                $data['street'] = $fhirResource['address'][0]['line'][0];
+            }
+            if (isset($fhirResource['address'][0]['postalCode'][0])) {
+                $data['postal_code'] = $fhirResource['address'][0]['postalCode'];
+            }
+            if (isset($fhirResource['address'][0]['city'][0])) {
+                $data['city'] = $fhirResource['address'][0]['city'];
+            }
+            if (isset($fhirResource['address'][0]['state'][0])) {
+                $data['state'] = $fhirResource['address'][0]['state'];
+            }
+        }
+
+        if (isset($fhirResource['telecom'])) {
+            foreach ($fhirResource['telecom'] as $telecom) {
+                switch ($telecom['system']) {
+                    case 'phone':
+                        switch ($telecom['use']) {
+                            case 'work':
+                                $data['phone'] = $telecom['value'];
+                                break;
+                        }
+                        break;
+                    case 'email':
+                        switch ($telecom['use']) {
+                            case 'work':
+                                $data['email'] = $telecom['value'];
+                                break;
+                        }
+                        break;
+                    case 'fax':
+                        switch ($telecom['use']) {
+                            case 'work':
+                                $data['fax'] = $telecom['value'];
+                                break;
+                        }
+                        break;
+                    default:
+                        //Should give Error for incapability
+                        break;
+                }
+            }
+        }
+
+        foreach ($fhirResource['identifier'] as $index => $identifier) {
+            if ($identifier['system'] == "http://hl7.org/fhir/sid/us-npi") {
+                $data['facility_npi'] = $identifier['value'];
+            }
+            if ($identifier['system'] == "urn:oid:2.16.840.1.113883.4.7") {
+                $data['domain_identifier'] = $identifier['value'];
+            }
+        }
+        return $data;
+    }
+
+
+    /**
+     * Inserts an OpenEMR record into the sytem.
+     *
+     * @param array $openEmrRecord OpenEMR organization record
+     * @return ProcessingResult
+     */
+    public function insertOpenEMRRecord($openEmrRecord)
+    {
+        return $this->organizationService->insert($openEmrRecord);
+    }
+
+
+    /**
+     * Updates an existing OpenEMR record.
+     *
+     * @param $fhirResourceId //The OpenEMR record's FHIR Resource ID.
+     * @param $updatedOpenEMRRecord //The "updated" OpenEMR record.
+     * @return ProcessingResult
+     */
+    public function updateOpenEMRRecord($fhirResourceId, $updatedOpenEMRRecord)
+    {
+        $processingResult = $this->organizationService->update($fhirResourceId, $updatedOpenEMRRecord);
+        return $processingResult;
+    }
+
+    /**
+     * Performs a FHIR Organization Resource lookup by FHIR Resource ID
+     * @param $fhirResourceId //The OpenEMR record's FHIR Organization Resource ID.
+     */
+    public function getOne($fhirResourceId)
+    {
+        $processingResult = $this->organizationService->getOne($fhirResourceId);
+        if (!$processingResult->hasErrors()) {
+            if (count($processingResult->getData()) > 0) {
+                $openEmrRecord = $processingResult->getData()[0];
+                $fhirRecord = $this->parseOpenEMRRecord($openEmrRecord);
+                $processingResult->setData([]);
+                $processingResult->addData($fhirRecord);
+            }
+        }
+        return $processingResult;
+    }
+
+    /**
+     * Searches for OpenEMR records using OpenEMR search parameters
+     *
+     * @param array openEMRSearchParameters OpenEMR search fields
+     * @return ProcessingResult
+     */
+    public function searchForOpenEMRRecords($openEMRSearchParameters)
+    {
+        return $this->organizationService->getAll($openEMRSearchParameters, false);
     }
 }
diff --git a/src/Services/FHIR/FhirPractitionerService.php b/src/Services/FHIR/FhirPractitionerService.php
index 662c49b68d4..39b1bb6d0f0 100644
--- a/src/Services/FHIR/FhirPractitionerService.php
+++ b/src/Services/FHIR/FhirPractitionerService.php
@@ -153,6 +153,15 @@ public function parseOpenEMRRecord($dataRecord = array(), $encode = false)
                 'use' => 'mobile'
             ));
         }
+
+        if (isset($dataRecord['email'])) {
+            $practitionerResource->addTelecom(array(
+                'system' => 'email',
+                'value' => $dataRecord['email'],
+                'use' => 'home'
+            ));
+        }
+
         if (isset($dataRecord['npi'])) {
             $fhirIdentifier = [
                 'system' => "http://hl7.org/fhir/sid/us-npi",
diff --git a/src/Services/FacilityService.php b/src/Services/FacilityService.php
index 6d93f1c2f31..707cd816a95 100644
--- a/src/Services/FacilityService.php
+++ b/src/Services/FacilityService.php
@@ -17,16 +17,26 @@
 
 namespace OpenEMR\Services;
 
+use OpenEMR\Common\Uuid\UuidRegistry;
+use OpenEMR\Validators\FacilityValidator;
+use OpenEMR\Validators\ProcessingResult;
 use Particle\Validator\Validator;
 
 class FacilityService extends BaseService
 {
+    private $facilityValidator;
+    private $uuidRegistery;
+    private const FACILITY_TABLE = "facility";
+
     /**
      * Default constructor.
      */
     public function __construct()
     {
-        parent::__construct('facility');
+        parent::__construct(self::FACILITY_TABLE);
+        $this->uuidRegistery = new UuidRegistry(['table_name' => self::FACILITY_TABLE]);
+        $this->uuidRegistery->createMissingUuids();
+        $this->facilityValidator = new FacilityValidator();
     }
 
     public function validate($facility)
@@ -61,14 +71,14 @@ public function validate($facility)
         return $validator->validate($facility);
     }
 
-    public function getAll()
+    public function getAllFacility()
     {
         return $this->get(array("order" => "ORDER BY FAC.name ASC"));
     }
 
     public function getPrimaryBusinessEntity($options = null)
     {
-        if (! empty($options) && ! empty($options["useLegacyImplementation"])) {
+        if (!empty($options) && !empty($options["useLegacyImplementation"])) {
             return $this->getPrimaryBusinessEntityLegacy();
         }
 
@@ -78,7 +88,7 @@ public function getPrimaryBusinessEntity($options = null)
             "limit" => 1
         );
 
-        if (! empty($options) && ! empty($options["excludedId"])) {
+        if (!empty($options) && !empty($options["excludedId"])) {
             $args["where"] .= " AND FAC.id != ?";
             $args["data"] = $options["excludedId"];
             return $this->get($args);
@@ -94,7 +104,7 @@ public function getAllServiceLocations($options = null)
             "order" => "ORDER BY FAC.name ASC"
         );
 
-        if (! empty($options) && ! empty($options["orderField"])) {
+        if (!empty($options) && !empty($options["orderField"])) {
             $args["order"] = "ORDER BY FAC." . escape_sql_column_name($options["orderField"], array("facility")) . " ASC";
         }
 
@@ -142,7 +152,7 @@ public function getFacilityForUserFormatted($userId)
     {
         $facility = $this->getFacilityForUser($userId);
 
-        if (! empty($facility)) {
+        if (!empty($facility)) {
             $formatted = "";
             $formatted .= $facility["name"];
             $formatted .= "\n";
@@ -170,7 +180,7 @@ public function getFacilityForEncounter($encounterId)
         ));
     }
 
-    public function update($data)
+    public function updateFacility($data)
     {
         $query = $this->buildUpdateColumns($data);
         $sql = " UPDATE facility SET ";
@@ -183,7 +193,7 @@ public function update($data)
         );
     }
 
-    public function insert($data)
+    public function insertFacility($data)
     {
         $query = $this->buildInsertColumns($data);
         $sql = " INSERT INTO facility SET ";
@@ -212,6 +222,7 @@ public function updateUsersFacility($facility_name, $facility_id)
     private function get($map)
     {
         $sql = " SELECT FAC.id,";
+        $sql .= "        FAC.uuid,";
         $sql .= "        FAC.name,";
         $sql .= "        FAC.phone,";
         $sql .= "        FAC.fax,";
@@ -257,4 +268,167 @@ private function getPrimaryBusinessEntityLegacy()
             "limit" => 1
         ));
     }
+
+    /**
+     * Returns a list of facilities matching optional search criteria.
+     * Search criteria is conveyed by array where key = field/column name, value = field value.
+     * If no search criteria is provided, all records are returned.
+     *
+     * @param  $search search array parameters
+     * @param  $isAndCondition specifies if AND condition is used for multiple criteria. Defaults to true.
+     * @return ProcessingResult which contains validation messages, internal error messages, and the data
+     * payload.
+     */
+    public function getAll($search = array(), $isAndCondition = true)
+    {
+        $processingResult = new ProcessingResult();
+
+        // Validating and Converting _id to UUID byte
+        if (isset($search['uuid'])) {
+            $isValid = $this->facilityValidator->validateId(
+                'uuid',
+                self::FACILITY_TABLE,
+                $search['uuid'],
+                true
+            );
+            if ($isValid != true) {
+                return $isValid;
+            }
+            $search['uuid'] = UuidRegistry::uuidToBytes($search['uuid']);
+        }
+        $additionalSql = array();
+        if (!empty($search)) {
+            $additionalSql['where'] = ' WHERE ';
+            $additionalSql["data"] = array();
+            $whereClauses = array();
+            foreach ($search as $fieldName => $fieldValue) {
+                // equality match
+                array_push($whereClauses, $fieldName . ' = ?');
+                array_push($additionalSql["data"], $fieldValue);
+            }
+            $sqlCondition = ($isAndCondition == true) ? 'AND' : 'OR';
+            $additionalSql['where'] .= implode(' ' . $sqlCondition . ' ', $whereClauses);
+        }
+        $statementResults = $this->get($additionalSql);
+        if ($statementResults) {
+            foreach ($statementResults as $row) {
+                $row['uuid'] = UuidRegistry::uuidToString($row['uuid']);
+                $processingResult->addData($row);
+            }
+        }
+
+        return $processingResult;
+    }
+
+    /**
+     * Returns a single facility record by facility uuid.
+     * @param $uuid - The facility uuid identifier in string format.
+     * @return ProcessingResult which contains validation messages, internal error messages, and the data
+     * payload.
+     */
+    public function getOne($uuid)
+    {
+        $processingResult = new ProcessingResult();
+        $isValid = $this->facilityValidator->validateId('uuid', self::FACILITY_TABLE, $uuid, true);
+        if ($isValid !== true) {
+            return $isValid;
+        }
+        $uuidBytes = UuidRegistry::uuidToBytes($uuid);
+        $sqlResult = $this->get(array(
+            "where" => "WHERE FAC.uuid = ?",
+            "data" => array($uuidBytes),
+            "limit" => 1
+        ));
+
+        if ($sqlResult) {
+            $sqlResult['uuid'] = UuidRegistry::uuidToString($sqlResult['uuid']);
+            $processingResult->addData($sqlResult);
+        } else {
+            $processingResult->addInternalError("error processing SQL Insert");
+        }
+
+        return $processingResult;
+    }
+
+    /**
+     * Inserts a new facility record.
+     *
+     * @param $data The facility fields (array) to insert.
+     * @return ProcessingResult which contains validation messages, internal error messages, and the data
+     * payload.
+     */
+    public function insert($data)
+    {
+        $processingResult = $this->facilityValidator->validate(
+            $data,
+            FacilityValidator::DATABASE_INSERT_CONTEXT
+        );
+
+        if (!$processingResult->isValid()) {
+            return $processingResult;
+        }
+
+        $data['uuid'] = (new UuidRegistry(['table_name' => self::FACILITY_TABLE]))->createUuid();
+
+        $query = $this->buildInsertColumns($data);
+        $sql = " INSERT INTO " . self::FACILITY_TABLE . " SET ";
+        $sql .= $query['set'];
+
+        $results = sqlInsert(
+            $sql,
+            $query['bind']
+        );
+
+        if ($results) {
+            $processingResult->addData(array(
+                'id' => $results,
+                'uuid' => UuidRegistry::uuidToString($data['uuid'])
+            ));
+        } else {
+            $processingResult->addInternalError("error processing SQL Insert");
+        }
+
+        return $processingResult;
+    }
+
+    /**
+     * Updates an existing facility record.
+     *
+     * @param $uuid - The facility uuid identifier in string format used for update.
+     * @param $data - The updated facility data fields
+     * @return ProcessingResult which contains validation messages, internal error messages, and the data
+     * payload.
+     */
+    public function update($uuid, $data)
+    {
+        if (empty($data)) {
+            $processingResult = new ProcessingResult();
+            $processingResult->setValidationMessages("Invalid Data");
+            return $processingResult;
+        }
+        $data["uuid"] = $uuid;
+        $processingResult = $this->facilityValidator->validate(
+            $data,
+            FacilityValidator::DATABASE_UPDATE_CONTEXT
+        );
+        if (!$processingResult->isValid()) {
+            return $processingResult;
+        }
+
+        $query = $this->buildUpdateColumns($data);
+        $sql = " UPDATE " . self::FACILITY_TABLE . " SET ";
+        $sql .= $query['set'];
+        $sql .= " WHERE `uuid` = ?";
+
+        $uuidBinary = UuidRegistry::uuidToBytes($uuid);
+        array_push($query['bind'], $uuidBinary);
+        $sqlResult = sqlStatement($sql, $query['bind']);
+
+        if (!$sqlResult) {
+            $processingResult->addErrorMessage("error processing SQL Update");
+        } else {
+            $processingResult = $this->getOne($uuid);
+        }
+        return $processingResult;
+    }
 }
diff --git a/src/Validators/FacilityValidator.php b/src/Validators/FacilityValidator.php
new file mode 100644
index 00000000000..f969b647119
--- /dev/null
+++ b/src/Validators/FacilityValidator.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace OpenEMR\Validators;
+
+use Particle\Validator\Validator;
+use Particle\Validator\Exception\InvalidValueException;
+use OpenEMR\Common\Uuid\UuidRegistry;
+use Ramsey\Uuid\Exception\InvalidUuidStringException;
+
+/**
+ * Supports Facility Record Validation.
+ *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786@gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ */
+class FacilityValidator extends BaseValidator
+{
+    /**
+     * Configures validations for the Facility DB Insert and Update use-case.
+     * The update use-case is comprised of the same fields as the insert use-case.
+     * The update use-case differs from the insert use-case in that fields other than uuid are not required.
+     */
+    protected function configureValidator()
+    {
+        parent::configureValidator();
+
+        // insert validations
+        $this->validator->context(
+            self::DATABASE_INSERT_CONTEXT,
+            function (Validator $context) {
+                $context->required('name')->lengthBetween(2, 255);
+                $context->required('facility_npi')->numeric()->lengthBetween(10, 15);
+                $context->optional('domain_identifier')->numeric();
+                $context->optional('phone')->lengthBetween(3, 30);
+                $context->optional('city')->lengthBetween(2, 255);
+                $context->optional('state')->lengthBetween(2, 50);
+                $context->optional('street')->lengthBetween(2, 255);
+                $context->optional('postal_code')->lengthBetween(2, 11);
+                $context->optional('email')->email();
+                $context->optional('fax')->lengthBetween(3, 30);
+                $context->optional('country_code')->lengthBetween(2, 30);
+                $context->optional('federal_ein')->lengthBetween(2, 15);
+                $context->optional('website')->url();
+                $context->optional('color')->lengthBetween(4, 7);
+                $context->optional('service_location')->numeric();
+                $context->optional('billing_location')->numeric();
+                $context->optional('accepts_assignment')->numeric();
+                $context->optional('pos_code')->numeric();
+                $context->optional('domain_identifier')->lengthBetween(2, 60);
+                $context->optional('attn')->lengthBetween(2, 65);
+                $context->optional('tax_id_type')->lengthBetween(2, 31);
+                $context->optional('primary_business_entity')->numeric();
+                $context->optional('facility_code')->lengthBetween(2, 31);
+                $context->optional('facility_taxonomy')->lengthBetween(2, 15);
+                $context->optional('iban')->lengthBetween(2, 34);
+            }
+        );
+
+        // update validations copied from insert
+        $this->validator->context(
+            self::DATABASE_UPDATE_CONTEXT,
+            function (Validator $context) {
+                $context->copyContext(
+                    self::DATABASE_INSERT_CONTEXT,
+                    function ($rules) {
+                        foreach ($rules as $key => $chain) {
+                            $chain->required(false);
+                        }
+                    }
+                );
+                // additional euuid validation
+                $context->required("uuid", "Facility UUID")->callback(function ($value) {
+                    return $this->validateId("uuid", "facility", $value, true);
+                })->uuid();
+            }
+        );
+    }
+}
diff --git a/src/Validators/PractitionerValidator.php b/src/Validators/PractitionerValidator.php
index ecdd629528a..0e22094bdb7 100644
--- a/src/Validators/PractitionerValidator.php
+++ b/src/Validators/PractitionerValidator.php
@@ -21,7 +21,7 @@ class PractitionerValidator extends BaseValidator
     /**
      * Configures validations for the Practitioner DB Insert and Update use-case.
      * The update use-case is comprised of the same fields as the insert use-case.
-     * The update use-case differs from the insert use-case in that fields other than pid are not required.
+     * The update use-case differs from the insert use-case in that fields other than uuid are not required.
      */
     protected function configureValidator()
     {
@@ -33,7 +33,7 @@ protected function configureValidator()
             function (Validator $context) {
                 $context->required("fname", "First Name")->lengthBetween(2, 255);
                 $context->required("lname", 'Last Name')->lengthBetween(2, 255);
-                $context->required("npi", "NPI")->numeric()->length(10);
+                $context->required("npi", "NPI")->numeric()->lengthBetween(10, 15);
                 $context->optional("facility_id", "Facility Id")->numeric()->callback(
                     // check if facility exist
                     function ($value) {
diff --git a/tests/Tests/Api/FacilityApiTest.php b/tests/Tests/Api/FacilityApiTest.php
new file mode 100644
index 00000000000..e35c9ad3a4d
--- /dev/null
+++ b/tests/Tests/Api/FacilityApiTest.php
@@ -0,0 +1,178 @@
+<?php
+
+namespace OpenEMR\Tests\Api;
+
+use PHPUnit\Framework\TestCase;
+use OpenEMR\Tests\Api\ApiTestClient;
+use OpenEMR\Tests\Fixtures\FacilityFixtureManager;
+
+/**
+ * Facility API Endpoint Test Cases.
+ * @coversDefaultClass OpenEMR\Tests\Api\ApiTestClient
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ *
+ */
+class FacilityApiTest extends TestCase
+{
+    const FACILITY_API_ENDPOINT = "/apis/api/facility";
+    private $testClient;
+    private $fixtureManager;
+
+    protected function setUp(): void
+    {
+        $baseUrl = getenv("OPENEMR_BASE_URL", true) ?: "http://localhost";
+        $this->testClient = new ApiTestClient($baseUrl, false);
+        $this->testClient->setAuthToken(ApiTestClient::OPENEMR_API_AUTH_ENDPOINT);
+
+        $this->fixtureManager = new FacilityFixtureManager();
+        $this->facilityRecord = (array) $this->fixtureManager->getSingleFacilityFixture();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->fixtureManager->removeFacilityFixtures();
+    }
+
+    /**
+     * @covers ::post with an invalid facility request
+     */
+    public function testInvalidPost()
+    {
+        unset($this->facilityRecord["name"]);
+        $actualResponse = $this->testClient->post(self::FACILITY_API_ENDPOINT, $this->facilityRecord);
+
+        $this->assertEquals(400, $actualResponse->getStatusCode());
+        $responseBody = json_decode($actualResponse->getBody(), true);
+        $this->assertEquals(1, count($responseBody["validationErrors"]));
+        $this->assertEquals(0, count($responseBody["internalErrors"]));
+        $this->assertEquals(0, count($responseBody["data"]));
+    }
+
+    /**
+     * @covers ::post with a valid facility request
+     */
+    public function testPost()
+    {
+        $actualResponse = $this->testClient->post(self::FACILITY_API_ENDPOINT, $this->facilityRecord);
+
+        $this->assertEquals(201, $actualResponse->getStatusCode());
+        $responseBody = json_decode($actualResponse->getBody(), true);
+        $this->assertEquals(0, count($responseBody["validationErrors"]));
+        $this->assertEquals(0, count($responseBody["internalErrors"]));
+
+        $newFacilityId = $responseBody["data"]["id"];
+        $this->assertIsInt($newFacilityId);
+        $this->assertGreaterThan(0, $newFacilityId);
+
+        $newFacilityUuid = $responseBody["data"]["uuid"];
+        $this->assertIsString($newFacilityUuid);
+    }
+
+    /**
+     * @covers ::patch with an invalid uuid
+     */
+    public function testInvalidPatch()
+    {
+        $actualResponse = $this->testClient->post(self::FACILITY_API_ENDPOINT, $this->facilityRecord);
+        $this->assertEquals(201, $actualResponse->getStatusCode());
+
+        $this->facilityRecord["email"] = "help@pennfirm.com";
+        $actualResponse = $this->testClient->patch(
+            self::FACILITY_API_ENDPOINT,
+            "not-a-uuid",
+            $this->facilityRecord
+        );
+
+        $this->assertEquals(400, $actualResponse->getStatusCode());
+        $responseBody = json_decode($actualResponse->getBody(), true);
+        $this->assertEquals(1, count($responseBody["validationErrors"]));
+        $this->assertEquals(0, count($responseBody["internalErrors"]));
+        $this->assertEquals(0, count($responseBody["data"]));
+    }
+
+    /**
+     * @covers ::patch with a valid resource uuid and payload
+     */
+    public function testPatch()
+    {
+        $actualResponse = $this->testClient->post(self::FACILITY_API_ENDPOINT, $this->facilityRecord);
+        $this->assertEquals(201, $actualResponse->getStatusCode());
+        $responseBody = json_decode($actualResponse->getBody(), true);
+
+        $facilityUuid = $responseBody["data"]["uuid"];
+
+        $this->facilityRecord["email"] = "help@pennfirm.com";
+        $actualResponse = $this->testClient->patch(self::FACILITY_API_ENDPOINT, $facilityUuid, $this->facilityRecord);
+
+        $this->assertEquals(200, $actualResponse->getStatusCode());
+        $responseBody = json_decode($actualResponse->getBody(), true);
+        $this->assertEquals(0, count($responseBody["validationErrors"]));
+        $this->assertEquals(0, count($responseBody["internalErrors"]));
+
+        $updatedResource = $responseBody["data"];
+        $this->assertEquals($this->facilityRecord["email"], $updatedResource["email"]);
+    }
+
+    /**
+     * @covers ::getOne with an invalid uuid
+     */
+    public function testGetOneInvalidId()
+    {
+        $actualResponse = $this->testClient->getOne(self::FACILITY_API_ENDPOINT, "not-a-uuid");
+        $this->assertEquals(400, $actualResponse->getStatusCode());
+
+        $responseBody = json_decode($actualResponse->getBody(), true);
+        $this->assertEquals(1, count($responseBody["validationErrors"]));
+        $this->assertEquals(0, count($responseBody["internalErrors"]));
+        $this->assertEquals(0, count($responseBody["data"]));
+    }
+
+    /**
+     * @covers ::getOne with a valid uuid
+     */
+    public function testGetOne()
+    {
+        $actualResponse = $this->testClient->post(self::FACILITY_API_ENDPOINT, $this->facilityRecord);
+        $this->assertEquals(201, $actualResponse->getStatusCode());
+
+        $responseBody = json_decode($actualResponse->getBody(), true);
+        $facilityUuid = $responseBody["data"]["uuid"];
+        $facilityId = $responseBody["data"]["id"];
+
+        $actualResponse = $this->testClient->getOne(self::FACILITY_API_ENDPOINT, $facilityUuid);
+        $this->assertEquals(200, $actualResponse->getStatusCode());
+
+        $responseBody = json_decode($actualResponse->getBody(), true);
+        $this->assertEquals(0, count($responseBody["validationErrors"]));
+        $this->assertEquals(0, count($responseBody["internalErrors"]));
+        $this->assertEquals($facilityUuid, $responseBody["data"]["uuid"]);
+        $this->assertEquals($facilityId, $responseBody["data"]["id"]);
+    }
+
+
+    /**
+     * @covers ::getAll
+     */
+    public function testGetAll()
+    {
+        $this->fixtureManager->installFacilityFixtures();
+
+        $actualResponse = $this->testClient->get(self::FACILITY_API_ENDPOINT, array("facility_npi" => "0123456789"));
+        $this->assertEquals(200, $actualResponse->getStatusCode());
+
+        $responseBody = json_decode($actualResponse->getBody(), true);
+        $this->assertEquals(0, count($responseBody["validationErrors"]));
+        $this->assertEquals(0, count($responseBody["internalErrors"]));
+
+        $searchResults = $responseBody["data"];
+        $this->assertGreaterThan(1, $searchResults);
+
+        foreach ($searchResults as $index => $searchResult) {
+            $this->assertEquals("0123456789", $searchResult["facility_npi"]);
+        }
+    }
+}
diff --git a/tests/Tests/Fixtures/BaseFixtureManager.php b/tests/Tests/Fixtures/BaseFixtureManager.php
new file mode 100644
index 00000000000..94ffcc3d08a
--- /dev/null
+++ b/tests/Tests/Fixtures/BaseFixtureManager.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace OpenEMR\Tests\Fixtures;
+
+use OpenEMR\Common\Uuid\UuidRegistry;
+use Ramsey\Uuid\Uuid;
+
+/**
+ * Provides OpenEMR Fixtures/Sample Records to test cases as Objects or Database Records.
+ *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ */
+class BaseFixtureManager
+{
+    // use a prefix so we can easily remove fixtures
+    const FIXTURE_PREFIX = "test-fixture";
+
+    /**
+     * Loads a JSON fixture from a file within the Fixture namespace, returning the data as an array of records.
+     * @param $fileName The file name to load.
+     * @return array of records.
+     */
+    protected function loadJsonFile($fileName)
+    {
+        $filePath = dirname(__FILE__) . "/" . $fileName;
+        $jsonData = file_get_contents($filePath);
+        $parsedRecords = json_decode($jsonData, true);
+        return $parsedRecords;
+    }
+
+    /**
+     *
+     * This will return a recorded uuid (recorded in uuid_registry)
+     *
+     * @param $tableName The target OpenEMR DB table name.
+     * @return uuid.
+     */
+    protected function getUuid($tableName)
+    {
+        return (new UuidRegistry(['table_name' => $tableName]))->createUuid();
+    }
+
+    /**
+     * @return the next available id/identifier in the table.
+     */
+    protected function getNextId($tableName, $idField)
+    {
+        $idQuery = "SELECT IFNULL(MAX($idField), 0) + 1 FROM $tableName";
+        $idResult = sqlQueryNoLog($idQuery);
+        $idValue = intval(array_values($idResult)[0]);
+        return $idValue;
+    }
+
+    /**
+     * Returns an unregistered/unlogged UUID for use in testing fixtures
+     * @return uuid4 string value
+     */
+    public function getUnregisteredUuid()
+    {
+        return UuidRegistry::uuidToString((new UuidRegistry(['disable_tracker' => true]))->createUuid());
+    }
+}
diff --git a/tests/Tests/Fixtures/FHIR/facility.json b/tests/Tests/Fixtures/FHIR/facility.json
new file mode 100644
index 00000000000..549723a4667
--- /dev/null
+++ b/tests/Tests/Fixtures/FHIR/facility.json
@@ -0,0 +1,89 @@
+[{
+        "resourceType": "Organization",
+        "id": "90d8cd22-3981-4a97-bf34-499ebb1c50cc",
+        "meta": {
+            "versionId": "1",
+            "lastUpdated": "2020-06-22T20:55:52+00:00"
+        },
+        "identifier": [{
+            "system": "http://hl7.org/fhir/sid/us-npi",
+            "value": "1063494177"
+        }],
+        "name": "Saint Luke's Hospital of Kansas City",
+        "telecom": [{
+            "system": "phone",
+            "value": "(816)932-2000",
+            "use": "work"
+        }],
+        "address": [{
+            "line": [
+                "4401 Wornall Rd,"
+            ],
+            "city": "Amherst",
+            "state": "MA",
+            "postalCode": "64111"
+        }]
+    },
+    {
+        "resourceType": "Organization",
+        "id": "42fe3345-76cc-4fb7-9750-734b759c872e",
+        "name": "Health Level Seven International",
+        "telecom": [{
+                "system": "phone",
+                "value": "(+1) 734-677-7777",
+                "use": "work"
+            },
+            {
+                "system": "email",
+                "value": "hq@HL7.org",
+                "use": "work"
+            }
+        ],
+        "identifier": [{
+            "system": "http://hl7.org/fhir/sid/us-npi",
+            "value": "1039294177"
+        }],
+        "address": [{
+            "line": [
+                "3300 Washtenaw Avenue, Suite 227"
+            ],
+            "city": "Ann Arbor",
+            "state": "MI",
+            "postalCode": "48104"
+        }]
+    },
+    {
+        "resourceType": "Organization",
+        "id": "30c7ab18-4c5b-4be4-ad1a-eb7188fb086a",
+        "identifier": [{
+            "system": "http://hl7.org/fhir/sid/us-npi",
+            "value": "1939403029"
+        }],
+        "name": "Gastroenterology",
+        "telecom": [{
+            "system": "email",
+            "value": "gastro@acme.org",
+            "use": "work"
+        }]
+    },
+    {
+        "resourceType": "Organization",
+        "id": "1832473e-2fe0-452d-abe9-3cdb9879522f",
+        "identifier": [{
+            "system": "http://hl7.org/fhir/sid/us-npi",
+            "value": "1927402830"
+        }],
+        "name": "Clinical Lab",
+        "telecom": [{
+                "system": "phone",
+                "value": "+1 555 234 1234",
+                "use": "work"
+            },
+            {
+                "system": "email",
+                "value": "contact@labs.acme.org",
+                "use": "work"
+            }
+        ]
+    }
+]
diff --git a/tests/Tests/Fixtures/FacilityFixtureManager.php b/tests/Tests/Fixtures/FacilityFixtureManager.php
new file mode 100644
index 00000000000..a317de73b4b
--- /dev/null
+++ b/tests/Tests/Fixtures/FacilityFixtureManager.php
@@ -0,0 +1,146 @@
+<?php
+
+namespace OpenEMR\Tests\Fixtures;
+
+use OpenEMR\Tests\Fixtures\BaseFixtureManager;
+use Ramsey\Uuid\Uuid;
+
+/**
+ * Provides OpenEMR Fixtures/Sample Records to test cases as Objects or Database Records.
+ *
+ * The FacilityFixtureManager generates sample records from JSON files located within the Fixture namespace.
+ * To provide support for additional record types:
+ * - Add a JSON datafile to the Fixture namespace containing the sample records.
+ * - Add public methods to get, install, and remove fixture records.
+ * - The "facility" related methods provide clear working examples.
+ *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ */
+class FacilityFixtureManager extends BaseFixtureManager
+{
+    private $facilityFixtures;
+    private $fhirFacilityFixtures;
+
+    public function __construct()
+    {
+        $this->facilityFixtures = $this->loadJsonFile("facility.json");
+        $this->fhirFacilityFixtures = $this->loadJsonFile("FHIR/facility.json");
+    }
+
+    /**
+     * Installs fixtures into the OpenEMR DB.
+     *
+     * @param $tableName The target OpenEMR DB table name.
+     * @param $fixtures Array of fixture objects to install.
+     * @return the number of fixtures installed.
+     */
+    private function installFixtures($tableName, $fixtures)
+    {
+        $insertCount = 0;
+        $sqlInsert = "INSERT INTO " . escape_table_name($tableName) . " SET ";
+
+        foreach ($fixtures as $index => $fixture) {
+            $sqlColumnValues = "";
+            $sqlBinds = array();
+
+            foreach ($fixture as $field => $fieldValue) {
+                $sqlColumnValues .= $field . " = ?, ";
+                array_push($sqlBinds, $fieldValue);
+            }
+
+            // add uuid
+            $sqlColumnValues .= '`uuid` = ?';
+            $uuidFacility = $this->getUuid("facility");
+            array_push($sqlBinds, $uuidFacility);
+
+            $sqlColumnValues = rtrim($sqlColumnValues, " ,");
+            $isInserted = sqlInsert($sqlInsert . $sqlColumnValues, $sqlBinds);
+            if ($isInserted) {
+                $insertCount += 1;
+            }
+        }
+        return $insertCount;
+    }
+
+    /**
+     * @return array of fhir facility fixtures.
+     */
+    public function getFhirFacilityFixtures()
+    {
+        return $this->fhirFacilityFixtures;
+    }
+
+    /**
+     * @return single/random fhir facility fixture
+     */
+    public function getSingleFhirFacilityFixture()
+    {
+        return $this->getSingleEntry($this->fhirFacilityFixtures);
+    }
+
+    /**
+     * @return array of facility fixtures.
+     */
+    public function getFacilityFixtures()
+    {
+        return $this->facilityFixtures;
+    }
+
+    /**
+     * @return random single entry from an array.
+     */
+    private function getSingleEntry($array)
+    {
+        $randomIndex = array_rand($array, 1);
+        return $array[$randomIndex];
+    }
+
+    /**
+     * @return a random facility fixture.
+     */
+    public function getSingleFacilityFixture()
+    {
+        return $this->getSingleEntry($this->facilityFixtures);
+    }
+
+    /**
+     * Installs Facility Fixtures into the OpenEMR DB.
+     */
+    public function installFacilityFixtures()
+    {
+        return $this->installFixtures("facility", $this->getFacilityFixtures());
+    }
+
+    /**
+     * Installs a single Facility Fixtures into the OpenEMR DB.
+     * @param $facilityFixture - The fixture to install.
+     * @return count of records inserted.
+     */
+    public function installSingleFacilityFixture($facilityFixture)
+    {
+        return $this->installFixtures("facility", array($facilityFixture));
+    }
+
+    /**
+     * Removes Facility Fixtures from the OpenEMR DB.
+     */
+    public function removeFacilityFixtures()
+    {
+        $bindVariable = self::FIXTURE_PREFIX . "%";
+
+        // remove the related uuids from uuid_registry
+        $select = "SELECT `uuid` FROM `facility` WHERE `id` LIKE ?";
+        $sel = sqlStatement($select, [$bindVariable]);
+        while ($row = sqlFetchArray($sel)) {
+            sqlQuery("DELETE FROM `uuid_registry` WHERE `table_name` = 'facility' AND `uuid` = ?", [$row['uuid']]);
+        }
+
+        // remove the facilitys
+        $delete = "DELETE FROM facility WHERE id LIKE ?";
+        sqlStatement($delete, array($bindVariable));
+    }
+}
diff --git a/tests/Tests/Fixtures/facility.json b/tests/Tests/Fixtures/facility.json
new file mode 100644
index 00000000000..cd2ec43d3fc
--- /dev/null
+++ b/tests/Tests/Fixtures/facility.json
@@ -0,0 +1,103 @@
+[{
+    "name": "Your Clinic Name Here",
+    "phone": "(619) 555-4859",
+    "fax": "(619) 555-7822",
+    "street": "789 Third Avenue",
+    "city": "San Diego",
+    "state": "CA",
+    "postal_code": "90210",
+    "country_code": "+1",
+    "federal_ein": "",
+    "website": null,
+    "email": "info@pennfirm.com",
+    "service_location": "1",
+    "billing_location": "1",
+    "accepts_assignment": "0",
+    "pos_code": null,
+    "x12_sender_id": "",
+    "attn": "",
+    "domain_identifier": "",
+    "facility_npi": "0123456789",
+    "facility_taxonomy": "",
+    "tax_id_type": "",
+    "color": "#99FFFF",
+    "primary_business_entity": "0",
+    "facility_code": "",
+    "extra_validation": "1",
+    "mail_street": "",
+    "mail_street2": "",
+    "mail_city": "",
+    "mail_state": "",
+    "mail_zip": "",
+    "oid": "",
+    "iban": "",
+    "info": ""
+}, {
+    "name": "Saint Luke's Hospital of Kansas City",
+    "phone": "(816)932-2000",
+    "fax": "(619) 555-7822",
+    "street": "4401 Wornall Rd,",
+    "city": "Amherst",
+    "state": "MA",
+    "postal_code": "64111",
+    "country_code": "+1",
+    "federal_ein": "",
+    "website": null,
+    "email": "info@pennfirm.com",
+    "service_location": "1",
+    "billing_location": "1",
+    "accepts_assignment": "0",
+    "pos_code": null,
+    "x12_sender_id": "",
+    "attn": "",
+    "domain_identifier": "",
+    "facility_npi": "0123456789",
+    "facility_taxonomy": "",
+    "tax_id_type": "",
+    "color": "#99FFFF",
+    "primary_business_entity": "0",
+    "facility_code": "",
+    "extra_validation": "1",
+    "mail_street": "",
+    "mail_street2": "",
+    "mail_city": "",
+    "mail_state": "",
+    "mail_zip": "",
+    "oid": "",
+    "iban": "",
+    "info": ""
+}, {
+    "name": "Health Level Seven International",
+    "phone": "(+1) 734-677-7777",
+    "fax": "(619) 555-7822",
+    "street": "3300 Washtenaw Avenue, Suite 227",
+    "city": "Ann Arbor",
+    "state": "MI",
+    "postal_code": "48104",
+    "country_code": "+1",
+    "federal_ein": "",
+    "website": null,
+    "email": "info@pennfirm.com",
+    "service_location": "1",
+    "billing_location": "1",
+    "accepts_assignment": "0",
+    "pos_code": null,
+    "x12_sender_id": "",
+    "attn": "",
+    "domain_identifier": "",
+    "facility_npi": "1939403029",
+    "facility_taxonomy": "",
+    "tax_id_type": "",
+    "color": "#99FFFF",
+    "primary_business_entity": "0",
+    "facility_code": "",
+    "extra_validation": "1",
+    "mail_street": "",
+    "mail_street2": "",
+    "mail_city": "",
+    "mail_state": "",
+    "mail_zip": "",
+    "oid": "",
+    "iban": "",
+    "info": ""
+}]
diff --git a/tests/Tests/RestControllers/FHIR/FhirOrganizationRestControllerTest.php b/tests/Tests/RestControllers/FHIR/FhirOrganizationRestControllerTest.php
new file mode 100644
index 00000000000..2b8c1d82770
--- /dev/null
+++ b/tests/Tests/RestControllers/FHIR/FhirOrganizationRestControllerTest.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace OpenEMR\Tests\RestControllers\FHIR;
+
+use PHPUnit\Framework\TestCase;
+use OpenEMR\RestControllers\FHIR\FhirOrganizationRestController;
+use OpenEMR\Tests\Fixtures\FacilityFixtureManager;
+
+/**
+ * @coversDefaultClass OpenEMR\RestControllers\FHIR\FhirOrganizationRestController
+ *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ */
+class FhirOrganizationRestControllerTest extends TestCase
+{
+
+    private $fhirOrganizationController;
+    private $fixtureManager;
+    private $fhirFixture;
+
+    protected function setUp(): void
+    {
+        $this->fhirOrganizationController = new FhirOrganizationRestController();
+        $this->fixtureManager = new FacilityFixtureManager();
+
+        $this->fhirFixture = (array) $this->fixtureManager->getSingleFhirFacilityFixture();
+        unset($this->fhirFixture['id']);
+        unset($this->fhirFixture['meta']);
+    }
+
+    protected function tearDown(): void
+    {
+        $this->fixtureManager->removeFacilityFixtures();
+    }
+
+    /**
+     * @cover ::post with valid data
+     */
+    public function testPost()
+    {
+        $actualResult = $this->fhirOrganizationController->post($this->fhirFixture);
+        $this->assertEquals(201, http_response_code());
+        $this->assertEquals(0, count($actualResult['validationErrors']));
+        $this->assertEquals(0, count($actualResult['internalErrors']));
+        $this->assertEquals(2, count($actualResult['data']));
+    }
+
+    /**
+     * @cover ::post with invalid data
+     */
+    public function testInvalidPost()
+    {
+        unset($this->fhirFixture['name']);
+
+        $actualResult = $this->fhirOrganizationController->post($this->fhirFixture);
+        $this->assertEquals(400, http_response_code());
+        $this->assertGreaterThan(0, count($actualResult['validationErrors']));
+        $this->assertEquals(0, count($actualResult['internalErrors']));
+        $this->assertEmpty($actualResult['data']);
+    }
+
+    /**
+     * @cover ::patch with valid data
+     */
+    public function testPatch()
+    {
+        $actualResult = $this->fhirOrganizationController->post($this->fhirFixture);
+        $fhirId = $actualResult['data']['uuid'];
+
+        $this->fhirFixture['name'] = 'Glenmark Clinic';
+        $actualResult = $this->fhirOrganizationController->patch($fhirId, $this->fhirFixture);
+
+        $this->assertEquals(200, http_response_code());
+        $this->assertEquals(0, count($actualResult['validationErrors']));
+        $this->assertEquals(0, count($actualResult['internalErrors']));
+        $this->assertEquals($fhirId, $actualResult['data']->getId());
+    }
+
+    /**
+     * @cover ::patch with valid data
+     */
+    public function testInvalidPatch()
+    {
+        $this->fhirOrganizationController->post($this->fhirFixture);
+
+        $this->fhirFixture['name'] = 'Smithers Clinic';
+        $actualResult = $this->fhirOrganizationController->patch('bad-uuid', $this->fhirFixture);
+
+        $this->assertEquals(400, http_response_code());
+        $this->assertGreaterThan(0, count($actualResult['validationErrors']));
+        $this->assertEquals(0, count($actualResult['internalErrors']));
+        $this->assertEmpty($actualResult['data']);
+    }
+
+    public function testGetOne()
+    {
+        $actualResult = $this->fhirOrganizationController->post($this->fhirFixture);
+        $fhirId = $actualResult['data']['uuid'];
+
+        $actualResult = $this->fhirOrganizationController->getOne($fhirId);
+        $this->assertEquals($fhirId, $actualResult['data']->getId());
+    }
+
+    public function testGetOneNoMatch()
+    {
+        $this->fhirOrganizationController->post($this->fhirFixture);
+
+        $actualResult = $this->fhirOrganizationController->getOne("not-a-matching-uuid");
+        $this->assertEmpty($actualResult['data']);
+    }
+
+    public function testGetAll()
+    {
+        $this->fhirOrganizationController->post($this->fhirFixture);
+
+        $searchParams = ['address-state' => 'MA'];
+        $actualResults = $this->fhirOrganizationController->getAll($searchParams);
+        $this->assertNotEmpty($actualResults);
+
+        foreach ($actualResults->getEntry() as $index => $bundleEntry) {
+            $this->assertObjectHasAttribute('fullUrl', $bundleEntry);
+            $this->assertObjectHasAttribute('resource', $bundleEntry);
+        }
+    }
+}
diff --git a/tests/Tests/RestControllers/FacilityRestControllerTest.php b/tests/Tests/RestControllers/FacilityRestControllerTest.php
new file mode 100644
index 00000000000..e7aae33eb1c
--- /dev/null
+++ b/tests/Tests/RestControllers/FacilityRestControllerTest.php
@@ -0,0 +1,187 @@
+<?php
+
+namespace OpenEMR\Tests\RestControllers;
+
+use PHPUnit\Framework\TestCase;
+use OpenEMR\RestControllers\FacilityRestController;
+use OpenEMR\Tests\Fixtures\FacilityFixtureManager;
+
+/**
+ * @coversDefaultClass OpenEMR\RestControllers\FacilityRestControllerTest
+ *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ */
+class FacilityRestControllerTestTest extends TestCase
+{
+    const FACILITY_API_URL = "/apis/api/facility";
+
+    private $facilityData;
+    private $facilityController;
+    private $fixtureManager;
+
+    protected function setUp(): void
+    {
+        $this->facilityData = array(
+            'name' => 'Your Clinic Name Here',
+            'phone' => '(619) 555-4859',
+            'fax' => '(619) 555-7822',
+            'street' => '789 Third Avenue',
+            'city' => 'San Diego',
+            'state' => 'CA',
+            'postal_code' => '90210',
+            'country_code' => '+1',
+            'federal_ein' => '',
+            'website' => null,
+            'email' => 'info@pennfirm.com',
+            'service_location' => '1',
+            'billing_location' => '1',
+            'accepts_assignment' => '0',
+            'pos_code' => null,
+            'x12_sender_id' => '',
+            'attn' => '',
+            'domain_identifier' => '',
+            'facility_npi' => '0123456789',
+            'facility_taxonomy' => '',
+            'tax_id_type' => '',
+            'color' => '#99FFFF',
+            'primary_business_entity' => '0',
+            'facility_code' => '',
+            'extra_validation' => '1',
+            'mail_street' => '',
+            'mail_street2' => '',
+            'mail_city' => '',
+            'mail_state' => '',
+            'mail_zip' => '',
+            'oid' => '',
+            'iban' => '',
+            'info' => ''
+        );
+
+        $this->fixtureManager = new FacilityFixtureManager();
+        $this->facilityController = new FacilityRestController();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->fixtureManager->removeFacilityFixtures();
+    }
+
+    /**
+     * @cover ::post with invalid data
+     */
+    public function testPostInvalidData()
+    {
+        unset($this->facilityData["name"]);
+        $actualResult = $this->facilityController->post($this->facilityData);
+        $this->assertEquals(400, http_response_code());
+        $this->assertEquals(1, count($actualResult["validationErrors"]));
+        $this->assertEquals(0, count($actualResult["internalErrors"]));
+        $this->assertEquals(0, count($actualResult["data"]));
+    }
+
+    /**
+     * @cover ::post with valid data
+     */
+    public function testPost()
+    {
+        $actualResult = $this->facilityController->post($this->facilityData);
+        $this->assertEquals(201, http_response_code());
+        $this->assertEquals(0, count($actualResult["validationErrors"]));
+        $this->assertEquals(0, count($actualResult["internalErrors"]));
+        $this->assertEquals(2, count($actualResult["data"]));
+
+        $facilityPid = $actualResult["data"]["id"];
+        $this->assertIsInt($facilityPid);
+        $this->assertGreaterThan(0, $facilityPid);
+    }
+
+    /**
+     * @cover ::patch with invalid data
+     */
+    public function testPatchInvalidData()
+    {
+        $actualResult = $this->facilityController->post($this->facilityData);
+        $this->assertEquals(201, http_response_code());
+        $this->assertEquals(2, count($actualResult["data"]));
+
+        $actualUuid = $actualResult["data"]["uuid"];
+        $this->facilityData["uuid"] = $actualUuid;
+
+        $actualResult = $this->facilityController->patch("not-a-id", $this->facilityData);
+        $this->assertEquals(400, http_response_code());
+        $this->assertEquals(1, count($actualResult["validationErrors"]));
+        $this->assertEquals(0, count($actualResult["internalErrors"]));
+        $this->assertEquals(0, count($actualResult["data"]));
+    }
+
+    /**
+     * @cover ::patch with valid data
+     */
+    public function testPatch()
+    {
+        $actualResult = $this->facilityController->post($this->facilityData);
+        $this->assertEquals(201, http_response_code());
+        $this->assertEquals(2, count($actualResult["data"]));
+
+        $facilityUuid = $actualResult["data"]["uuid"];
+        $this->facilityData["email"] = "info@pennfirm.com";
+        $actualResult = $this->facilityController->patch($facilityUuid, $this->facilityData);
+
+        $this->assertEquals(200, http_response_code());
+        $this->assertEquals(0, count($actualResult["validationErrors"]));
+        $this->assertEquals(0, count($actualResult["internalErrors"]));
+        $this->assertNotNull($actualResult["data"]);
+
+        $updatedFacility = $actualResult["data"];
+        $this->assertIsArray($updatedFacility);
+        $this->assertEquals($this->facilityData["email"], $updatedFacility["email"]);
+    }
+
+    /**
+     * @cover ::getOne with an invalid uuid
+     */
+    public function testGetOneInvalidUuid()
+    {
+        $actualResult = $this->facilityController->getOne("not-a-uuid");
+        $this->assertEquals(400, http_response_code());
+        $this->assertEquals(1, count($actualResult["validationErrors"]));
+        $this->assertEquals(0, count($actualResult["internalErrors"]));
+        $this->assertEquals([], $actualResult["data"]);
+    }
+
+    /**
+     * @cover ::getOne with a valid uuid
+     */
+    public function testGetOne()
+    {
+        // create a record
+        $postResult = $this->facilityController->post($this->facilityData);
+        $postedUuid = $postResult["data"]["uuid"];
+
+        // confirm the id matches what was requested
+        $actualResult = $this->facilityController->getOne($postedUuid);
+        $this->assertEquals($postedUuid, $actualResult["data"]["uuid"]);
+    }
+
+    /**
+     * @cover ::getAll
+     */
+    public function testGetAll()
+    {
+        $this->fixtureManager->installFacilityFixtures();
+        $searchResult = $this->facilityController->getAll(array("facility_npi" => "0123456789"));
+
+        $this->assertEquals(200, http_response_code());
+        $this->assertEquals(0, count($searchResult["validationErrors"]));
+        $this->assertEquals(0, count($searchResult["internalErrors"]));
+        $this->assertGreaterThan(1, count($searchResult["data"]));
+
+        foreach ($searchResult["data"] as $index => $searchResult) {
+            $this->assertEquals("0123456789", $searchResult["facility_npi"]);
+        }
+    }
+}
diff --git a/tests/Tests/Services/FHIR/FhirOrganizationServiceCrudTest.php b/tests/Tests/Services/FHIR/FhirOrganizationServiceCrudTest.php
new file mode 100644
index 00000000000..90d5e9eaf7a
--- /dev/null
+++ b/tests/Tests/Services/FHIR/FhirOrganizationServiceCrudTest.php
@@ -0,0 +1,107 @@
+<?php
+
+namespace OpenEMR\Tests\Services\FHIR;
+
+use PHPUnit\Framework\TestCase;
+use OpenEMR\Tests\Fixtures\FacilityFixtureManager;
+use OpenEMR\Services\FHIR\FhirOrganizationService;
+
+/**
+ * FHIR Organization Service Crud Tests
+ * @coversDefaultClass OpenEMR\Services\FHIR\FhirOrganizationService
+ *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ */
+class FhirOrganizationServiceCrudTest extends TestCase
+{
+    private $fixtureManager;
+    private $fhirOrganizationFixture;
+    private $fhirOrganizationService;
+
+    protected function setUp(): void
+    {
+        $this->fixtureManager = new FacilityFixtureManager();
+        $this->fhirOrganizationFixture = (array) $this->fixtureManager->getSingleFhirFacilityFixture();
+        $this->fhirOrganizationService = new FhirOrganizationService();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->fixtureManager->removeFacilityFixtures();
+    }
+
+    /**
+     * Tests a successful insert operation
+     * @covers ::insert
+     * @covers ::insertOpenEMRRecord
+     */
+    public function testInsert()
+    {
+        unset($this->fhirOrganizationFixture['id']);
+        $processingResult = $this->fhirOrganizationService->insert($this->fhirOrganizationFixture);
+        $this->assertTrue($processingResult->isValid());
+
+        $dataResult = $processingResult->getData()[0];
+        $this->assertGreaterThan(0, $dataResult['id']);
+        $this->assertArrayHasKey('uuid', $dataResult);
+        $this->assertIsString($dataResult['uuid']);
+    }
+
+    /**
+     * Tests an insert operation where an error occurs
+     * @covers ::insert
+     * @covers ::insertOpenEMRRecord
+     */
+    public function testInsertWithErrors()
+    {
+        unset($this->fhirOrganizationFixture['name']);
+        $processingResult = $this->fhirOrganizationService->insert($this->fhirOrganizationFixture);
+        $this->assertFalse($processingResult->isValid());
+        $this->assertEquals(0, count($processingResult->getData()));
+    }
+
+    /**
+     * Tests a successful update operation
+     * @covers ::update
+     * @covers ::updateOpenEMRRecord
+     */
+    public function testUpdate()
+    {
+        unset($this->fhirOrganizationFixture['id']);
+        $processingResult = $this->fhirOrganizationService->insert($this->fhirOrganizationFixture);
+        $this->assertTrue($processingResult->isValid());
+
+        $dataResult = $processingResult->getData()[0];
+        $fhirId = $dataResult['uuid'];
+        $this->assertIsString($fhirId);
+
+        $this->fhirOrganizationFixture['name'] = 'Glenmark Clinic';
+        $this->fhirOrganizationFixture['id'] = $fhirId;
+        $actualResult = $this->fhirOrganizationService->update($fhirId, $this->fhirOrganizationFixture);
+        $this->assertTrue($actualResult->isValid());
+
+        $actualFhirRecord = $actualResult->getData()[0];
+        $actualName = $actualFhirRecord->getName();
+        $this->assertEquals('Glenmark Clinic', $actualName);
+
+        $this->assertEquals($fhirId, $actualFhirRecord->getId());
+    }
+
+    /**
+     * Tests an update operation where an error occurs
+     * @covers ::update
+     * @covers ::updateOpenEMRRecord
+     */
+    public function testUpdateWithErrors()
+    {
+        $actualResult = $this->fhirOrganizationService->update('bad-uuid', $this->fhirOrganizationFixture);
+        $this->assertFalse($actualResult->isValid());
+        $this->assertGreaterThan(0, count($actualResult->getValidationMessages()));
+        $this->assertEquals(0, count($actualResult->getInternalErrors()));
+        $this->assertEquals(0, count($actualResult->getData()));
+    }
+}
diff --git a/tests/Tests/Services/FacilityServiceTest.php b/tests/Tests/Services/FacilityServiceTest.php
new file mode 100644
index 00000000000..3980128a33a
--- /dev/null
+++ b/tests/Tests/Services/FacilityServiceTest.php
@@ -0,0 +1,162 @@
+<?php
+
+namespace OpenEMR\Tests\Services;
+
+use PHPUnit\Framework\TestCase;
+use OpenEMR\Common\Uuid\UuidRegistry;
+use OpenEMR\Services\FacilityService;
+use OpenEMR\Tests\Fixtures\FacilityFixtureManager;
+
+/**
+ * Facility Service Tests
+ * @coversDefaultClass OpenEMR\Services\FacilityService
+ *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Yash Bothra <yashrajbothra786gmail.com>
+ * @copyright Copyright (c) 2020 Yash Bothra <yashrajbothra786gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
+ */
+class FacilityServiceTest extends TestCase
+{
+    private $facilityService;
+    private $fixtureManager;
+
+    protected function setUp(): void
+    {
+        $this->facilityService = new FacilityService();
+        $this->fixtureManager = new FacilityFixtureManager();
+        $this->facilityFixture = (array) $this->fixtureManager->getSingleFacilityFixture();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->fixtureManager->removeFacilityFixtures();
+    }
+
+    /**
+     * @covers ::insert when the data is invalid
+     */
+    public function testInsertFailure()
+    {
+        $this->facilityFixture["name"] = "A";
+        $this->facilityFixture["facility_npi"] = "12345";
+        unset($this->facilityFixture["name"]);
+
+        $actualResult = $this->facilityService->insert($this->facilityFixture);
+
+        $this->assertFalse($actualResult->isValid());
+
+        $this->assertArrayHasKey("name", $actualResult->getValidationMessages());
+        $this->assertArrayHasKey("facility_npi", $actualResult->getValidationMessages());
+        $this->assertEquals(2, count($actualResult->getValidationMessages()));
+    }
+
+    /**
+     * @covers ::insert when the data is valid
+     */
+    public function testInsertSuccess()
+    {
+        $actualResult = $this->facilityService->insert($this->facilityFixture);
+        $this->assertTrue($actualResult->isValid());
+        $this->assertEquals(1, count($actualResult->getData()));
+
+        $dataResult = $actualResult->getData()[0];
+        $this->assertIsArray($dataResult);
+        $this->assertArrayHasKey("id", $dataResult);
+        $this->assertGreaterThan(0, $dataResult["id"]);
+        $this->assertArrayHasKey("uuid", $dataResult);
+
+        $this->assertEquals(0, count($actualResult->getValidationMessages()));
+        $this->assertTrue($actualResult->isValid());
+        $this->assertEquals(0, count($actualResult->getInternalErrors()));
+        $this->assertFalse($actualResult->hasInternalErrors());
+    }
+
+    /**
+     * @covers ::update when the data is not valid
+     */
+    public function testUpdateFailure()
+    {
+        $this->facilityService->insert($this->facilityFixture);
+
+        $this->facilityFixture["name"] = "A";
+
+        $actualResult = $this->facilityService->update("not-a-uuid", $this->facilityFixture);
+
+        $this->assertFalse($actualResult->isValid());
+
+        $this->assertArrayHasKey("name", $actualResult->getValidationMessages());
+        $this->assertArrayHasKey("uuid", $actualResult->getValidationMessages());
+        $this->assertEquals(2, count($actualResult->getValidationMessages()));
+    }
+
+    /**
+     * @covers ::update when the data is valid
+     */
+    public function testUpdateSuccess()
+    {
+        $actualResult = $this->facilityService->insert($this->facilityFixture);
+        $this->assertTrue($actualResult->isValid());
+        $this->assertEquals(1, count($actualResult->getData()));
+
+        $dataResult = $actualResult->getData()[0];
+        $this->assertIsArray($dataResult);
+        $this->assertArrayHasKey("id", $dataResult);
+        $this->assertGreaterThan(0, $dataResult["id"]);
+        $this->assertArrayHasKey("uuid", $dataResult);
+
+        $actualUuid = $dataResult["uuid"];
+
+        $this->facilityFixture["email"] = "help@pennfirm.com";
+        $this->facilityService->update($actualUuid, $this->facilityFixture);
+
+        $sql = "SELECT `uuid`, `email` FROM `facility` WHERE `uuid` = ?";
+        $result = sqlQuery($sql, [UuidRegistry::uuidToBytes($actualUuid)]);
+        $this->assertEquals($actualUuid, UuidRegistry::uuidToString($result["uuid"]));
+        $this->assertEquals("help@pennfirm.com", $result["email"]);
+    }
+
+    /**
+     * @cover ::getOne
+     * @cover ::getAll
+     */
+    public function testFacilityQueries()
+    {
+        $this->fixtureManager->installFacilityFixtures();
+
+        $result = sqlQuery("SELECT `uuid` FROM `facility`");
+        $existingUuid = UuidRegistry::uuidToString($result['uuid']);
+        // getOne
+        $actualResult = $this->facilityService->getOne($existingUuid);
+        $resultData = $actualResult->getData()[0];
+        $this->assertNotNull($resultData);
+        $this->assertEquals($existingUuid, $resultData["uuid"]);
+        $this->assertArrayHasKey("name", $resultData);
+        $this->assertArrayHasKey("uuid", $resultData);
+
+        // getOne - validate uuid
+        $expectedUuid = $resultData["uuid"];
+        $actualResult = $this->facilityService->getOne($expectedUuid);
+        $resultData = $actualResult->getData()[0];
+        $this->assertNotNull($resultData);
+        $this->assertEquals($expectedUuid, $resultData["uuid"]);
+
+        // getOne - with an invalid uuid
+        $actualResult = $this->facilityService->getOne("not-a-uuid");
+        $this->assertEquals(1, count($actualResult->getValidationMessages()));
+        $this->assertEquals(0, count($actualResult->getInternalErrors()));
+        $this->assertEquals(0, count($actualResult->getData()));
+
+        // getAll
+        $actualResult = $this->facilityService->getAll(array("facility_npi" => "0123456789"));
+        $this->assertNotNull($actualResult);
+        $this->assertGreaterThan(1, count($actualResult->getData()));
+
+        foreach ($actualResult->getData() as $index => $facilityRecord) {
+            $this->assertArrayHasKey("name", $resultData);
+            $this->assertArrayHasKey("uuid", $resultData);
+            $this->assertEquals("0123456789", $facilityRecord["facility_npi"]);
+        }
+    }
+}
diff --git a/version.php b/version.php
index d0015e19af1..7f980ba1caa 100644
--- a/version.php
+++ b/version.php
@@ -28,7 +28,7 @@
 // is a database change in the course of development.  It is used
 // internally to determine when a database upgrade is needed.
 //
-$v_database = 335;
+$v_database = 336;
 
 // Access control version identifier, this is to be incremented whenever there
 // is a access control change in the course of development.  It is used