Merge pull request #695 from lantanagroup/EncounterStatusTransformer

Fix `EncounterStatusTransformer`
lantanagroup · Feb 8, 2024 · efd9dec · efd9dec
2 parents ee26a53 + 35720f8
commit efd9dec
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/core/src/main/java/com/lantanagroup/link/events/EncounterStatusTransformer.java b/core/src/main/java/com/lantanagroup/link/events/EncounterStatusTransformer.java
@@ -26,9 +26,9 @@ public void execute(TenantService tenantService, Bundle bundle, ReportCriteria c
         if (patientEncounter.getPeriod().hasEnd() && patientEncounter.getStatus() != Encounter.EncounterStatus.FINISHED) {
           logger.debug("Updating Encounter {} status from {} to FINISHED", patientEncounter.getIdElement().getIdPart(), patientEncounter.getStatus());
 
-          patientEncounter.addExtension()
+          patientEncounter.getStatusElement().addExtension()
                   .setUrl(Constants.OriginalElementValueExtension)
-                  .setValue(new CodeType().setValue(patientEncounter.getStatus().toString()));
+                  .setValue(new CodeType(patientEncounter.getStatus().toCode()));
           patientEncounter.setStatus(Encounter.EncounterStatus.FINISHED);
         }
       }

diff --git a/nhsn/src/test/java/com/lantanagroup/link/nhsn/EncounterStatusTransformerTest.java b/nhsn/src/test/java/com/lantanagroup/link/nhsn/EncounterStatusTransformerTest.java
@@ -68,8 +68,8 @@ public void execute() throws ParseException {
     Encounter encounterTest2 = (Encounter)bundle.getEntry().get(2).getResource();
     //Rewriting these tests to check that the transformed values persist rather than checking that they DON'T persist
     Assert.assertEquals(encounterTest1.getStatus(), Encounter.EncounterStatus.FINISHED);
-    Assert.assertEquals(encounterTest1.getExtension().size(), 1);
+    Assert.assertTrue(encounterTest1.getStatusElement().hasExtension());
     Assert.assertEquals(encounterTest2.getStatus(), Encounter.EncounterStatus.TRIAGED);
-    Assert.assertEquals(encounterTest2.getExtension().size(), 0);
+    Assert.assertFalse(encounterTest2.getStatusElement().hasExtension());
   }
 }