diff --git a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/MapLocalObservationCodes.java b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/MapLocalObservationCodes.java index 6af55c43a..52b12c272 100644 --- a/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/MapLocalObservationCodes.java +++ b/etor/src/main/java/gov/hhs/cdc/trustedintermediary/etor/ruleengine/transformation/custom/MapLocalObservationCodes.java @@ -28,7 +28,10 @@ public void transform(HealthData resource, Map args) { var codingMap = getMapFromArgs(args); var bundle = (Bundle) resource.getUnderlyingData(); - var msh41Identifier = extractMsh41Identifier(bundle); + var msh41Identifier = + HapiHelper.getMSH4_1Identifier(bundle) != null + ? HapiHelper.getMSH4_1Identifier(bundle).getValue() + : null; var messageId = HapiHelper.getMessageControlId(bundle); var observations = HapiHelper.resourcesInBundle(bundle, Observation.class); @@ -49,11 +52,6 @@ private boolean isLocalCode(Coding coding) { coding, HapiHelper.EXTENSION_ALT_CODING, HapiHelper.LOCAL_CODE); } - private String extractMsh41Identifier(Bundle bundle) { - var msh41Identifier = HapiHelper.getMSH4_1Identifier(bundle); - return msh41Identifier != null ? msh41Identifier.getValue() : null; - } - private void processCoding( Observation observation, Map codingMap,