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

[gf#21240]: fixing pattern[x] slices validation

This commit is contained in:
Oliver Egger 2019-05-15 17:13:32 +02:00
parent d023628016
commit bf99a3d8e7
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
org.hl7.fhir.validation/src/main/java/org/hl7/fhir/r5/validation/InstanceValidator.java
View File

@ -2708,30 +2708,33 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
throws DefinitionException { throws DefinitionException {
if (cc.hasText()) if (cc.hasText())
throw new DefinitionException("Unsupported CodeableConcept pattern - using text - for discriminator(" + discriminator + ") for slice " + ed.getId()); throw new DefinitionException("Unsupported CodeableConcept pattern - using text - for discriminator(" + discriminator + ") for slice " + ed.getId());
if (!cc.hasCoding() || cc.getCoding().size() > 1) if (!cc.hasCoding())
throw new DefinitionException("Unsupported CodeableConcept pattern - must be just one coding - for discriminator(" + discriminator + ") for slice " + ed.getId()); throw new DefinitionException("Unsupported CodeableConcept pattern - must have at least one coding - for discriminator(" + discriminator + ") for slice " + ed.getId());
Coding c = cc.getCodingFirstRep(); if (cc.hasExtension())
if (c.hasExtension() || cc.hasExtension())
throw new DefinitionException("Unsupported CodeableConcept pattern - extensions are not allowed - for discriminator(" + discriminator + ") for slice " + ed.getId()); throw new DefinitionException("Unsupported CodeableConcept pattern - extensions are not allowed - for discriminator(" + discriminator + ") for slice " + ed.getId());
expression.append(" and " + discriminator + ".coding.where("); for(Coding c : cc.getCoding()) {
boolean first = true; if (c.hasExtension())
if (c.hasSystem()) { throw new DefinitionException("Unsupported CodeableConcept pattern - extensions are not allowed - for discriminator(" + discriminator + ") for slice " + ed.getId());
first = false; expression.append(" and " + discriminator + ".coding.where(");
expression.append("system = '"+c.getSystem()+"'"); boolean first = true;
if (c.hasSystem()) {
first = false;
expression.append("system = '"+c.getSystem()+"'");
}
if (c.hasVersion()) {
if (first) first = false; else expression.append(" and ");
expression.append("version = '"+c.getVersion()+"'");
}
if (c.hasCode()) {
if (first) first = false; else expression.append(" and ");
expression.append("code = '"+c.getCode()+"'");
}
if (c.hasDisplay()) {
if (first) first = false; else expression.append(" and ");
expression.append("display = '"+c.getDisplay()+"'");
}
expression.append(").exists()");
} }
if (c.hasVersion()) {
if (first) first = false; else expression.append(" and ");
expression.append("version = '"+c.getVersion()+"'");
}
if (c.hasCode()) {
if (first) first = false; else expression.append(" and ");
expression.append("code = '"+c.getCode()+"'");
}
if (c.hasDisplay()) {
if (first) first = false; else expression.append(" and ");
expression.append("display = '"+c.getDisplay()+"'");
}
expression.append(").exists()");
} }
private void buildFixedExpression(ElementDefinition ed, StringBuilder expression, String discriminator, ElementDefinition criteriaElement) throws DefinitionException { private void buildFixedExpression(ElementDefinition ed, StringBuilder expression, String discriminator, ElementDefinition criteriaElement) throws DefinitionException {