Merge pull request #964 from drajer-health/3.1.12-fixes

3.1.12 fixes

Author: nbashyam

src/main/java/com/drajer/cdafromr4/CdaFhirUtilities.java

@@ -16,6 +16,7 @@
 import java.util.Set;
 import java.util.TimeZone;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.text.StringEscapeUtils;
 import org.hl7.fhir.r4.model.Address;
 import org.hl7.fhir.r4.model.BooleanType;
 import org.hl7.fhir.r4.model.Bundle.BundleEntryComponent;
@@ -1931,7 +1932,7 @@ public static String getStringForCodeableConcept(CodeableConcept cd) {
 
     val = (val.isEmpty()) ? CdaGeneratorConstants.UNKNOWN_VALUE : val;
 
-    return val;
+    return StringEscapeUtils.escapeXml11(val);
   }
 
   public static String getCombinationStringForCodeSystem(
@@ -2343,7 +2344,7 @@ public static String getStringForType(Type dt) {
       }
 
       logger.debug("Printing the class name {} and value {}", dt.getClass(), val);
-      return val.toString();
+      return StringEscapeUtils.escapeXml11(val.toString());
     }
     return CdaGeneratorConstants.UNKNOWN_VALUE;
   }
@@ -3303,7 +3304,7 @@ public static String getStringForObservationsWithComponents(Observation obs) {
       }
     }
 
-    return result;
+    return StringEscapeUtils.escapeXml11(result);
   }
 
   public static String getRaceOrEthnicityXml(List<Extension> exts, String elName, String extUrl) {

src/main/java/com/drajer/cdafromr4/CdaResultGenerator.java

@@ -356,11 +356,14 @@ public static void getTableValuesForObservationWithComponents(
 
     // Create the Test Name String
     Map<String, String> bodyvals = new LinkedHashMap<>();
-    bodyvals.put(CdaGeneratorConstants.LABTEST_TABLE_COL_1_BODY_CONTENT, obsDisplayName);
+    bodyvals.put(
+        CdaGeneratorConstants.LABTEST_TABLE_COL_1_BODY_CONTENT,
+        StringEscapeUtils.escapeXml11(obsDisplayName));
 
     // Get Value String
     if (val.isEmpty()) val = CdaGeneratorConstants.UNKNOWN_VALUE;
-    bodyvals.put(CdaGeneratorConstants.LABTEST_TABLE_COL_2_BODY_CONTENT, val);
+    bodyvals.put(
+        CdaGeneratorConstants.LABTEST_TABLE_COL_2_BODY_CONTENT, StringEscapeUtils.escapeXml11(val));
 
     // Get the Date String
     String dt = CdaGeneratorConstants.UNKNOWN_VALUE;
@@ -426,14 +429,17 @@ public static void getTableValues(
 
     // Create the Test Name String
     Map<String, String> bodyvals = new LinkedHashMap<>();
-    bodyvals.put(CdaGeneratorConstants.LABTEST_TABLE_COL_1_BODY_CONTENT, obsDisplayName);
+    bodyvals.put(
+        CdaGeneratorConstants.LABTEST_TABLE_COL_1_BODY_CONTENT,
+        StringEscapeUtils.escapeXml11(obsDisplayName));
 
     // Get Value String
     String val = CdaGeneratorConstants.UNKNOWN_VALUE;
     if (obs.hasValue()) {
       val = CdaFhirUtilities.getStringForType(obs.getValue());
     }
-    bodyvals.put(CdaGeneratorConstants.LABTEST_TABLE_COL_2_BODY_CONTENT, val);
+    bodyvals.put(
+        CdaGeneratorConstants.LABTEST_TABLE_COL_2_BODY_CONTENT, StringEscapeUtils.escapeXml11(val));
 
     // Get the Date String
     String dt = CdaGeneratorConstants.UNKNOWN_VALUE;