Merge branch 'main' into NIAD-3154

Author: ORybak5

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+* When mapping to `<code nullFlavor="UNK">` XML elements from an existing `CodeableConcept` the element will now contain
+the original text value from the DisplayExtension, if a separate text field is not provided. 
+In the case that neither of these are present, the existing behavior of using the `code.display` element is used. 
+
 ### Added
 
 * GP2GP Adaptor now populates the PlanStatement / confidentialityCode field when the ProcedureRequest.meta.security field contains NOPAT

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/CodeableConceptCdMapper.java

@@ -161,6 +161,7 @@ public String mapCodeableConceptToCdForBloodPressure(CodeableConcept codeableCon
 
             code.ifPresent(builder::mainCode);
             displayText.ifPresent(builder::mainDisplayName);
+            builder.translations(getNonSnomedCodeCodings(codeableConcept));
         }
 
         return TemplateUtils.fillTemplate(CODEABLE_CONCEPT_CD_TEMPLATE, builder.build());
@@ -324,23 +325,20 @@ private List<Coding> getNonSnomedCodeCodings(CodeableConcept codeableConcept) {
     }
 
     private Optional<String> findOriginalText(CodeableConcept codeableConcept, Optional<Coding> coding) {
+
+        if (codeableConcept.hasText()) {
+            return Optional.ofNullable(codeableConcept.getText());
+        }
+
         if (coding.isPresent()) {
-            if (codeableConcept.hasText()) {
-                return Optional.ofNullable(codeableConcept.getText());
-            } else {
-                if (coding.get().hasDisplay()) {
-                    return getCodingDisplayName(coding.get());
-                } else {
-                    var extension = retrieveDescriptionExtension(coding.get());
-                    return extension.stream()
-                        .filter(displayExtension -> DESCRIPTION_DISPLAY.equals(displayExtension.getUrl()))
-                        .map(extension1 -> extension1.getValue().toString())
-                        .findFirst();
-                }
+            if (coding.get().hasDisplay()) {
+                return getCodingDisplayName(coding.get());
             }
-        } else {
-            return CodeableConceptMappingUtils.extractTextOrCoding(codeableConcept);
+
+            return getDisplayTextFromDescriptionExtension(coding.get());
         }
+
+        return CodeableConceptMappingUtils.extractTextOrCoding(codeableConcept);
     }
 
     private Optional<String> findOriginalTextForAllergy(
@@ -353,13 +351,13 @@ private Optional<String> findOriginalTextForAllergy(
         }
 
         if (ACTIVE_CLINICAL_STATUS.equals(allergyIntoleranceClinicalStatus.toCode())) {
-            return getOriginalTextForActiveAllergy(coding.get());
+            return getDisplayTextFromDescriptionExtension(coding.get());
         }
 
         return CodeableConceptMappingUtils.extractTextOrCoding(codeableConcept);
     }
 
-    private Optional<String> getOriginalTextForActiveAllergy(Coding coding) {
+    private Optional<String> getDisplayTextFromDescriptionExtension(Coding coding) {
         return retrieveDescriptionExtension(coding)
             .flatMap(value -> value
                 .getExtension().stream()