Merge branch 'b' into cleanup

app/Http/Controllers/HomeController.php

@@ -1690,8 +1690,12 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
             $phoneNumberTerm = $term;
         }
 
-        $clientQuery= Client::whereNull('shadow_pro_id')
-            ->where(function ($q) use ($term, $phoneNumberTerm) {
+        $clientQuery= Client::whereNull('shadow_pro_id');
+
+        //Don't show duplicates
+        $clientQuery = $clientQuery->whereNull('duplicate_of_client_id');
+
+        $clientQuery= $clientQuery->where(function ($q) use ($term, $phoneNumberTerm) {
                 $q->where('name_first', 'ILIKE', '%' . $term . '%')
                     ->orWhere('name_last', 'ILIKE', '%' . $term . '%')
                     ->orWhere('cell_number', 'ILIKE', '%' . $phoneNumberTerm . '%')