$apply operation error when specifying practitioner #2240

fhir-server-test/src/test/java/com/ibm/fhir/server/test/PlanDefinitionApplyOperationTest.java

@@ -158,7 +158,7 @@ public void testSubjectPatient() {
         // null, practitionerId, null, null, null, null, null, null);
 
         Response response =
-                doPost(FHIRMediaType.APPLICATION_FHIR_JSON, false, false, planDefinitionId, subjects, null, null, "Organization/my-org", "user-type", "user-language", "user-task-context", "my-setting", "my-setting-context");
+                doPost(FHIRMediaType.APPLICATION_FHIR_JSON, false, false, planDefinitionId, subjects, null, "Practitioner/" + practitionerId, "Organization/my-org", "user-type", "user-language", "user-task-context", "my-setting", "my-setting-context");
         assertEquals(response.getStatus(), 200);
 
         CarePlan carePlan = response.readEntity(CarePlan.class);

operation/fhir-operation-apply/src/main/java/com/ibm/fhir/operation/apply/ApplyOperation.java

@@ -266,22 +266,16 @@ private CarePlan transform(PlanDefinition planDefinition, List<String> subjects,
             if (!altSubjectsRefs.isEmpty()) {
                 builder.supportingInfo(altSubjectsRefs);
             }
-
         }
 
         // Encounter
         if (encounter != null) {
             builder.encounter(Reference.builder().reference(string(encounter)).build());
         }
 
-        // Practitioner - the following block is used as there may be a cardinality of 0..* in the future.
-        List<Reference> careTeam = new ArrayList<>();
+        // Practitioner maps to a contributor
         if (practitioner != null) {
-            careTeam.add(Reference.builder().reference(string(practitioner)).build());
-        }
-
-        if (!careTeam.isEmpty()) {
-            builder.careTeam(careTeam);
+            builder.contributor(Reference.builder().reference(string(practitioner)).build());
         }
 
         // Organization