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

improve rendering of multiple filters on value set

This commit is contained in:
Grahame Grieve 2019-09-02 07:18:59 +10:00
parent c7499882a0
commit d63a8f7be3
1 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3747,15 +3747,26 @@ public class NarrativeGenerator implements INarrativeGenerator {
} }
} }
} }
boolean first = true;
for (ConceptSetFilterComponent f : inc.getFilter()) {
if (first) {
li.addText(type+" codes from "); li.addText(type+" codes from ");
first = false;
} else
li.tx(" and ");
addCsRef(inc, li, e); addCsRef(inc, li, e);
li.tx(" where "+f.getProperty()+" "+describe(f.getOp())+" "); li.tx(" where ");
for (int i = 0; i < inc.getFilter().size(); i++) {
ConceptSetFilterComponent f = inc.getFilter().get(i);
if (i > 0) {
if (i == inc.getFilter().size()-1) {
li.tx(" and ");
} else {
li.tx(", ");
}
}
if (f.getOp() == FilterOperator.EXISTS) {
if (f.getValue().equals("true")) {
li.tx(f.getProperty()+" exists");
} else {
li.tx(f.getProperty()+" doesn't exist");
}
} else {
li.tx(f.getProperty()+" "+describe(f.getOp())+" ");
if (e != null && codeExistsInValueSet(e, f.getValue())) { if (e != null && codeExistsInValueSet(e, f.getValue())) {
String href = prefix+getCsRef(e); String href = prefix+getCsRef(e);
if (href.contains("#")) if (href.contains("#"))
@ -3777,6 +3788,7 @@ public class NarrativeGenerator implements INarrativeGenerator {
li.tx(" ("+disp+")"); li.tx(" ("+disp+")");
} }
} }
}
if (inc.hasValueSet()) { if (inc.hasValueSet()) {
li.tx(", where the codes are contained in "); li.tx(", where the codes are contained in ");
boolean first = true; boolean first = true;