From 332ea59567edbe2c48525279020ece7b5468e6a5 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 26 Jul 2023 19:53:19 +0300
Subject: [PATCH 1/2] Return FHIRPractitionerDetails practitioners as list

---
 pom.xml                                              |  2 +-
 .../model/practitioner/FhirPractitionerDetails.java  | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pom.xml b/pom.xml
index 61181a7..895f619 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.smartregister</groupId>
     <artifactId>fhir-common-utils</artifactId>
-    <version>0.0.7-SNAPSHOT</version>
+    <version>0.0.8-SNAPSHOT</version>
 
     <distributionManagement>
         <repository>
diff --git a/src/main/java/org/smartregister/model/practitioner/FhirPractitionerDetails.java b/src/main/java/org/smartregister/model/practitioner/FhirPractitionerDetails.java
index 4c89883..9243478 100755
--- a/src/main/java/org/smartregister/model/practitioner/FhirPractitionerDetails.java
+++ b/src/main/java/org/smartregister/model/practitioner/FhirPractitionerDetails.java
@@ -95,7 +95,7 @@ public class FhirPractitionerDetails extends Type implements ICompositeType {
             max = -1,
             modifier = false,
             summary = false)
-    private Practitioner practitioner;
+    private List<Practitioner> practitioners;
 
     public List<CareTeam> getCareTeams() {
         return careTeams;
@@ -146,12 +146,12 @@ public void setGroups(List<Group> groups) {
         this.groups = groups;
     }
 
-    public Practitioner getPractitioner() {
-        return practitioner;
+    public List<Practitioner> getPractitioners() {
+        return practitioners;
     }
 
-    public void setPractitioner(Practitioner practitioner) {
-        this.practitioner = practitioner;
+    public void setPractitioners(List<Practitioner> practitioners) {
+        this.practitioners = practitioners;
     }
 
     @Override
@@ -163,7 +163,7 @@ public Type copy() {
 
     @Override
     public boolean isEmpty() {
-        return ElementUtil.isEmpty(practitioner);
+        return ElementUtil.isEmpty(practitioners);
     }
 
     @Override

From 975d2d953fa3c1e7303c28d9a3d1132bbadaa245 Mon Sep 17 00:00:00 2001
From: Martin Ndegwa <mndegwa@ona.io>
Date: Wed, 26 Jul 2023 20:41:16 +0300
Subject: [PATCH 2/2] Return Organization Affiliations in
 FhirPractitionerDetails

---
 pom.xml                                        |  2 +-
 .../practitioner/FhirPractitionerDetails.java  | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 895f619..140c773 100755
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>org.smartregister</groupId>
     <artifactId>fhir-common-utils</artifactId>
-    <version>0.0.8-SNAPSHOT</version>
+    <version>0.0.9-SNAPSHOT</version>
 
     <distributionManagement>
         <repository>
diff --git a/src/main/java/org/smartregister/model/practitioner/FhirPractitionerDetails.java b/src/main/java/org/smartregister/model/practitioner/FhirPractitionerDetails.java
index 9243478..3db5d1e 100755
--- a/src/main/java/org/smartregister/model/practitioner/FhirPractitionerDetails.java
+++ b/src/main/java/org/smartregister/model/practitioner/FhirPractitionerDetails.java
@@ -97,6 +97,16 @@ public class FhirPractitionerDetails extends Type implements ICompositeType {
             summary = false)
     private List<Practitioner> practitioners;
 
+    @Child(
+            name = "organizationAffiliation",
+            type = {OrganizationAffiliation.class},
+            order = 8,
+            min = 0,
+            max = -1,
+            modifier = false,
+            summary = false)
+    private List<OrganizationAffiliation> organizationAffiliations;
+
     public List<CareTeam> getCareTeams() {
         return careTeams;
     }
@@ -154,6 +164,14 @@ public void setPractitioners(List<Practitioner> practitioners) {
         this.practitioners = practitioners;
     }
 
+    public List<OrganizationAffiliation> getOrganizationAffiliations() {
+        return organizationAffiliations;
+    }
+
+    public void setOrganizationAffiliations(List<OrganizationAffiliation> organizationAffiliations) {
+        this.organizationAffiliations = organizationAffiliations;
+    }
+
     @Override
     public Type copy() {
         FhirPractitionerDetails fhirPractitionerDetails = new FhirPractitionerDetails();