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

bug fixes for list narrative generation

This commit is contained in:
Grahame Grieve 2020-04-12 08:22:29 +10:00
parent d97e408d3c
commit fa9c1cae1d
2 changed files with 49 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/NarrativeGenerator.java
View File

@ -769,7 +769,13 @@ public class NarrativeGenerator implements INarrativeGenerator {
@Override @Override
public void display(XhtmlNode x) { public void display(XhtmlNode x) {
throw new Error("Not done yet"); if (wrapped.hasChild("title") && wrapped.getChildValue("title") != null) {
x.tx(wrapped.getChildValue("title"));
} else if (wrapped.hasChild("name") && wrapped.getChildValue("name") != null) {
x.tx(wrapped.getChildValue("name"));
} else {
x.tx("??");
}
} }
} }
@ -4697,30 +4703,33 @@ public class NarrativeGenerator implements INarrativeGenerator {
} }
XhtmlNode t = x.table("clstu"); XhtmlNode t = x.table("clstu");
XhtmlNode tr = t.tr(); XhtmlNode tr = t.tr();
XhtmlNode td = tr.td();
if (list.has("date")) { if (list.has("date")) {
tr.td().tx("Date: "+list.get("date").dateTimeValue().toHumanDisplay()); td.tx("Date: "+list.get("date").dateTimeValue().toHumanDisplay());
} }
if (list.has("mode")) { if (list.has("mode")) {
tr.td().tx("Mode: "+list.get("mode").primitiveValue()); td.tx("Mode: "+list.get("mode").primitiveValue());
} }
if (list.has("status")) { if (list.has("status")) {
tr.td().tx("Status: "+list.get("status").primitiveValue()); td.tx("Status: "+list.get("status").primitiveValue());
} }
if (list.has("code")) { if (list.has("code")) {
tr.td().tx("Code: "+genCC(list.get("code"))); td.tx("Code: "+genCC(list.get("code")));
} }
tr = t.tr(); tr = t.tr();
if (list.has("subject")) { if (list.has("subject")) {
shortForRef(tr.td().tx("Subject: "), list.get("subject")); td.tx("Subject: ");
shortForRef(td, list.get("subject"));
} }
if (list.has("encounter")) { if (list.has("encounter")) {
shortForRef(tr.td().tx("Encounter: "), list.get("encounter")); shortForRef(td.tx("Encounter: "), list.get("encounter"));
} }
if (list.has("source")) { if (list.has("source")) {
shortForRef(tr.td().tx("Source: "), list.get("encounter")); td.tx("Source: ");
shortForRef(td, list.get("encounter"));
} }
if (list.has("orderedBy")) { if (list.has("orderedBy")) {
tr.td().tx("Order: "+genCC(list.get("orderedBy"))); td.tx("Order: "+genCC(list.get("orderedBy")));
} }
// for (Annotation a : list.getNote()) { // for (Annotation a : list.getNote()) {
// renderAnnotation(a, x); // renderAnnotation(a, x);
@ -4735,27 +4744,27 @@ public class NarrativeGenerator implements INarrativeGenerator {
} }
t = x.table("grid"); t = x.table("grid");
tr = t.tr().style("backgound-color: #eeeeee"); tr = t.tr().style("backgound-color: #eeeeee");
tr.td().b().tx("Items"); td.b().tx("Items");
if (date) { if (date) {
tr.td().tx("Date"); td.tx("Date");
} }
if (flag) { if (flag) {
tr.td().tx("Flag"); td.tx("Flag");
} }
if (deleted) { if (deleted) {
tr.td().tx("Deleted"); td.tx("Deleted");
} }
for (BaseWrapper e : list.children("entry")) { for (BaseWrapper e : list.children("entry")) {
tr = t.tr(); tr = t.tr();
shortForRef(tr.td(), e.get("item")); shortForRef(td, e.get("item"));
if (date) { if (date) {
tr.td().tx(e.has("date") ? e.get("date").dateTimeValue().toHumanDisplay() : ""); td.tx(e.has("date") ? e.get("date").dateTimeValue().toHumanDisplay() : "");
} }
if (flag) { if (flag) {
tr.td().tx(e.has("flag") ? genCC(e.get("flag")) : ""); td.tx(e.has("flag") ? genCC(e.get("flag")) : "");
} }
if (deleted) { if (deleted) {
tr.td().tx(e.has("deleted") ? e.get("deleted").primitiveValue() : ""); td.tx(e.has("deleted") ? e.get("deleted").primitiveValue() : "");
} }
} }
return false; return false;
@ -4781,24 +4790,29 @@ public class NarrativeGenerator implements INarrativeGenerator {
} }
} }
private void shortForRef(XhtmlNode x, Base ref) { private XhtmlNode shortForRef(XhtmlNode x, Base ref) {
String disp = ref.getChildByName("display").hasValues() ? ref.getChildByName("display").getValues().get(0).primitiveValue() : null; if (ref == null) {
if (ref.getChildByName("reference").hasValues()) { x.tx("(null)");
String url = ref.getChildByName("reference").getValues().get(0).primitiveValue();
ResourceWithReference r = resolver.resolve(url);
if (r == null) {
if (disp == null) {
disp = url;
}
x.tx(disp);
} else {
r.resource.display(x.ah(r.reference));
}
} else if (disp != null) {
x.tx(disp);
} else { } else {
x.tx("??"); String disp = ref.getChildByName("display") != null && ref.getChildByName("display").hasValues() ? ref.getChildByName("display").getValues().get(0).primitiveValue() : null;
} if (ref.getChildByName("reference").hasValues()) {
String url = ref.getChildByName("reference").getValues().get(0).primitiveValue();
ResourceWithReference r = resolver.resolve(url);
if (r == null) {
if (disp == null) {
disp = url;
}
x.tx(disp);
} else {
r.resource.display(x.ah(r.reference));
}
} else if (disp != null) {
x.tx(disp);
} else {
x.tx("??");
}
}
return x;
} }
public boolean generate(ResourceContext rcontext, ImplementationGuide ig) throws EOperationOutcome, FHIRException, IOException { public boolean generate(ResourceContext rcontext, ImplementationGuide ig) throws EOperationOutcome, FHIRException, IOException {

2
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/xhtml/XhtmlNode.java
View File

@ -156,7 +156,7 @@ public class XhtmlNode implements IBaseXhtml {
{ {
if (!(nodeType == NodeType.Element || nodeType == NodeType.Document)) if (!(nodeType == NodeType.Element || nodeType == NodeType.Document))
throw new Error("Wrong node type. is "+nodeType.toString()); throw new Error("Wrong node type - node is "+nodeType.toString()+" ('"+getName()+"/"+getContent()+"')");
XhtmlNode node = new XhtmlNode(NodeType.Element); XhtmlNode node = new XhtmlNode(NodeType.Element);
node.setName(name); node.setName(name);
childNodes.add(node); childNodes.add(node);