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

Changes relevant to improving the rendering of artifact intros. Specifically: 

- ensure that when validating codes against value sets, the valid coding is actually returned
- strip out the new extensions we add for FMM
- improve the rendering of Quantity and Range.  (The former was horrid and the latter wasn't as nice as it could be.)
This commit is contained in:
Lloyd McKenzie 2022-01-04 21:46:57 -07:00
parent 8706b3c4a4
commit 86c3609288
3 changed files with 26 additions and 16 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/conformance/ProfileUtilities.java
View File

@ -2087,6 +2087,8 @@ public class ProfileUtilities extends TranslatingUtilities {
private void removeStatusExtensions(ElementDefinition outcome) { private void removeStatusExtensions(ElementDefinition outcome) {
outcome.removeExtension(ToolingExtensions.EXT_FMM_LEVEL); outcome.removeExtension(ToolingExtensions.EXT_FMM_LEVEL);
outcome.removeExtension(ToolingExtensions.EXT_FMM_SUPPORT);
outcome.removeExtension(ToolingExtensions.EXT_FMM_DERIVED);
outcome.removeExtension(ToolingExtensions.EXT_STANDARDS_STATUS); outcome.removeExtension(ToolingExtensions.EXT_STANDARDS_STATUS);
outcome.removeExtension(ToolingExtensions.EXT_NORMATIVE_VERSION); outcome.removeExtension(ToolingExtensions.EXT_NORMATIVE_VERSION);
outcome.removeExtension(ToolingExtensions.EXT_WORKGROUP); outcome.removeExtension(ToolingExtensions.EXT_WORKGROUP);

32
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
View File

@ -1139,9 +1139,11 @@ public class DataRenderer extends Renderer {
protected String displayQuantity(Quantity q) { protected String displayQuantity(Quantity q) {
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
s.append("(system = '").append(TerminologyRenderer.describeSystem(q.getSystem())) s.append(q.hasValue() ? q.getValue() : "?");
.append("' code ").append(q.getCode()) if (q.hasUnit())
.append(" = '").append(lookupCode(q.getSystem(), null, q.getCode())).append("')"); s.append(" ").append(q.getUnit());
else if (q.hasCode())
s.append(" ").append(q.getCode());
return s.toString(); return s.toString();
} }
@ -1166,18 +1168,20 @@ public class DataRenderer extends Renderer {
} }
public String displayRange(Range q) { public String displayRange(Range q) {
if (!q.hasLow() && !q.hasHigh())
return "?";
StringBuilder b = new StringBuilder(); StringBuilder b = new StringBuilder();
if (q.hasLow())
b.append(q.getLow().getValue().toString()); boolean sameUnits = (q.getLow().hasUnit() && q.getHigh().hasUnit() && q.getLow().getUnit().equals(q.getHigh().getUnit()))
else || (q.getLow().hasCode() && q.getHigh().hasCode() && q.getLow().getCode().equals(q.getHigh().getCode()));
b.append("?"); String low = "?";
b.append("-"); if (q.hasLow() && q.getLow().hasValue())
if (q.hasHigh()) low = sameUnits ? q.getLow().getValue().toString() : displayQuantity(q.getLow());
b.append(q.getHigh().getValue().toString()); String high = displayQuantity(q.getHigh());
else if (high.isEmpty())
b.append("?"); high = "?";
if (q.getLow().hasUnit()) b.append(low).append("\u00A0 to \u00A0").append(high);
b.append(" "+q.getLow().getUnit());
return b.toString(); return b.toString();
} }

8
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/ValueSetCheckerSimple.java
View File

@ -142,6 +142,7 @@ public class ValueSetCheckerSimple extends ValueSetWorker implements ValueSetChe
} }
} }
} }
Coding foundCoding = null;
if (valueset != null && options.getValueSetMode() != ValueSetMode.NO_MEMBERSHIP_CHECK) { if (valueset != null && options.getValueSetMode() != ValueSetMode.NO_MEMBERSHIP_CHECK) {
Boolean result = false; Boolean result = false;
for (Coding c : code.getCoding()) { for (Coding c : code.getCoding()) {
@ -150,6 +151,7 @@ public class ValueSetCheckerSimple extends ValueSetWorker implements ValueSetChe
result = null; result = null;
} else if (ok) { } else if (ok) {
result = true; result = true;
foundCoding = c;
} }
} }
if (result == null) { if (result == null) {
@ -162,8 +164,10 @@ public class ValueSetCheckerSimple extends ValueSetWorker implements ValueSetChe
return new ValidationResult(IssueSeverity.ERROR, errors.toString()); return new ValidationResult(IssueSeverity.ERROR, errors.toString());
} else if (warnings.size() > 0) { } else if (warnings.size() > 0) {
return new ValidationResult(IssueSeverity.WARNING, warnings.toString()); return new ValidationResult(IssueSeverity.WARNING, warnings.toString());
} else { } else {
return new ValidationResult(IssueSeverity.INFORMATION, null); ConceptDefinitionComponent cd = new ConceptDefinitionComponent(foundCoding.getCode());
cd.setDisplay(foundCoding.getDisplay());
return new ValidationResult(foundCoding.getSystem(), cd);
} }
} }