honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #230 from ahdis/oe_cdanarrative_npfix 

CDA Narrative conversion from FHIR, Nullpointer exception fix
This commit is contained in:
Grahame Grieve 2020-06-10 08:43:17 +10:00 committed by GitHub
parent f885b7bf8a 31a4d31755
commit 9e7ef8ab38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/elementmodel/XmlParser.java
View File

@ -595,7 +595,7 @@ public class XmlParser extends ParserBase {
if (element.getType().equals("xhtml")) { if (element.getType().equals("xhtml")) {
String rawXhtml = element.getValue(); String rawXhtml = element.getValue();
if (isCdaText(element.getProperty())) { if (isCdaText(element.getProperty())) {
new CDANarrativeFormat().convert(xml, element.getXhtml()); new CDANarrativeFormat().convert(xml, new XhtmlParser().parseFragment(rawXhtml));
} else { } else {
xml.escapedText(rawXhtml); xml.escapedText(rawXhtml);
xml.anchor("end-xhtml"); xml.anchor("end-xhtml");