From 7ec6bc2e3a54a39abc1481c2d18c8e7435e675c7 Mon Sep 17 00:00:00 2001
From: angelathe <angela.the@skylight.digital>
Date: Mon, 4 Nov 2024 07:02:15 -0800
Subject: [PATCH] fix FHIR conversion for specimen

---
 .../Templates/eCR/Entry/Result/_entry.liquid              | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/containers/fhir-converter/Templates/eCR/Entry/Result/_entry.liquid b/containers/fhir-converter/Templates/eCR/Entry/Result/_entry.liquid
index 8e632307c5..32ea2adb90 100644
--- a/containers/fhir-converter/Templates/eCR/Entry/Result/_entry.liquid
+++ b/containers/fhir-converter/Templates/eCR/Entry/Result/_entry.liquid
@@ -45,11 +45,15 @@
                     {% endif -%}
                 {% elsif comp.procedure.participant.participantRole.id.displayName -%}
                     {% assign specValue = comp.procedure.participant.participantRole.id.displayName -%}
-                {% elsif entry.organizer.component.procedure.participant.participantRole.playingEntity.code.displayName -%}
-                    {% assign specValue = comp.procedure.participant.participantRole.playingEntity.code.displayName -%}
+                {% elsif comp.procedure.participant.participantRole.playingEntity.code.originalText._ %}
+                    {% assign specValue = comp.procedure.participant.participantRole.playingEntity.code.originalText._ -%}
+                {% elsif comp.procedure.participant.participantRole.playingEntity.code.displayName -%}
+                     {% assign specValue = comp.procedure.participant.participantRole.playingEntity.code.displayName -%}
                 {% else -%}
                     {% assign specValue = "None" -%}
                 {% endif -%}
+            {% else  -%}
+                {% assign specValue = "None" -%}
             {% endif -%}
         {% endif -%}
     {% endfor-%}