Poc 115b patch (#1582)

* 2.16.3

* Revert "POC-39:Separate CCC Number From Other Identifiers (#1549)"

This reverts commit edbda84.

* fix null patient uuid

src/app/hiv-care-lib/family-testing/family-testing-contact-list.component.ts

@@ -209,7 +209,7 @@ export class FamilyTestingContactComponent implements OnInit {
               this.indexHasContacts = true;
             }
             this.indexName = data.result[0].person_name;
-            this.indexUuid = data.result[0].patient_uuid;
+            this.indexUuid = this.params.patientUuid;
           }
         });
     }