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 #762 from hapifhir/gg-202203-vs-system 

Gg 202203 vs system
This commit is contained in:
Grahame Grieve 2022-03-11 11:30:33 +11:00 committed by GitHub
parent a3e8fca51a d23c319a90
commit a73b501469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 138 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.hl7.fhir.r4b/src/main/java/org/hl7/fhir/r4b/model/Enumerations.java
View File

@ -6169,9 +6169,9 @@ The primary difference between a medication statement and a medication administr
return _4_1_0; return _4_1_0;
if ("4.2.0".equals(codeString)) if ("4.2.0".equals(codeString))
return _4_2_0; return _4_2_0;
if ("4.3.0-snapshot1".equals(codeString)) if ("4.3.0-snapshot1".equalsIgnoreCase(codeString))
return _4_3_0SNAPSHOT1; return _4_3_0SNAPSHOT1;
if ("4.3.0-cibuild".equals(codeString)) if ("4.3.0-cibuild".equalsIgnoreCase(codeString))
return _4_3_0CIBUILD; return _4_3_0CIBUILD;
throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
} }
@ -6434,9 +6434,9 @@ public String toCode(int len) {
return FHIRVersion._4_1_0; return FHIRVersion._4_1_0;
if ("4.2.0".equals(codeString)) if ("4.2.0".equals(codeString))
return FHIRVersion._4_2_0; return FHIRVersion._4_2_0;
if ("4.3.0-snapshot1".equals(codeString)) if ("4.3.0-snapshot1".equalsIgnoreCase(codeString))
return FHIRVersion._4_3_0SNAPSHOT1; return FHIRVersion._4_3_0SNAPSHOT1;
if ("4.3.0-cibuild".equals(codeString)) if ("4.3.0-cibuild".equalsIgnoreCase(codeString))
return FHIRVersion._4_3_0CIBUILD; return FHIRVersion._4_3_0CIBUILD;
throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'"); throw new IllegalArgumentException("Unknown FHIRVersion code '"+codeString+"'");
} }
@ -6498,9 +6498,9 @@ public String toCode(int len) {
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0);
if ("4.2.0".equals(codeString)) if ("4.2.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2_0);
if ("4.3.0-snapshot1".equals(codeString)) if ("4.3.0-snapshot1".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0SNAPSHOT1); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0SNAPSHOT1);
if ("4.3.0-cibuild".equals(codeString)) if ("4.3.0-cibuild".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0CIBUILD); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0CIBUILD);
throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
} }

130
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/model/Enumerations.java
View File

@ -7243,71 +7243,71 @@ public String toCode(int len) {
String codeString = ((PrimitiveType) code).asStringValue(); String codeString = ((PrimitiveType) code).asStringValue();
if (codeString == null || "".equals(codeString)) if (codeString == null || "".equals(codeString))
return null; return null;
if ("0.01".equals(codeString)) if ("0.01".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_01); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_01);
if ("0.05".equals(codeString)) if ("0.05".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_05); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_05);
if ("0.06".equals(codeString)) if ("0.06".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_06); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_06);
if ("0.11".equals(codeString)) if ("0.11".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_11); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_11);
if ("0.0.80".equals(codeString)) if ("0.0.80".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_80); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_80);
if ("0.0.81".equals(codeString)) if ("0.0.81".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_81); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_81);
if ("0.0.82".equals(codeString)) if ("0.0.82".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_82); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_0_82);
if ("0.4.0".equals(codeString)) if ("0.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_4_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_4_0);
if ("0.5.0".equals(codeString)) if ("0.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._0_5_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._0_5_0);
if ("1.0.0".equals(codeString)) if ("1.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_0);
if ("1.0.1".equals(codeString)) if ("1.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_1); return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_1);
if ("1.0.2".equals(codeString)) if ("1.0.2".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_2); return new Enumeration<FHIRVersion>(this, FHIRVersion._1_0_2);
if ("1.1.0".equals(codeString)) if ("1.1.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_1_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._1_1_0);
if ("1.4.0".equals(codeString)) if ("1.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_4_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._1_4_0);
if ("1.6.0".equals(codeString)) if ("1.6.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_6_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._1_6_0);
if ("1.8.0".equals(codeString)) if ("1.8.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._1_8_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._1_8_0);
if ("3.0.0".equals(codeString)) if ("3.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_0);
if ("3.0.1".equals(codeString)) if ("3.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_1); return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_1);
if ("3.0.2".equals(codeString)) if ("3.0.2".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_2); return new Enumeration<FHIRVersion>(this, FHIRVersion._3_0_2);
if ("3.3.0".equals(codeString)) if ("3.3.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_3_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._3_3_0);
if ("3.5.0".equals(codeString)) if ("3.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._3_5_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._3_5_0);
if ("4.0.0".equals(codeString)) if ("4.0.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_0);
if ("4.0.1".equals(codeString)) if ("4.0.1".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_1); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_0_1);
if ("4.1.0".equals(codeString)) if ("4.1.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_1_0);
if ("4.2.0".equals(codeString)) if ("4.2.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_2_0);
if ("4.3.0-snapshot1".equals(codeString)) if ("4.3.0-snapshot1".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0SNAPSHOT1); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0SNAPSHOT1);
if ("4.3.0-cibuild".equals(codeString)) if ("4.3.0-cibuild".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0CIBUILD); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_3_0CIBUILD);
if ("4.4.0".equals(codeString)) if ("4.4.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_4_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_4_0);
if ("4.5.0".equals(codeString)) if ("4.5.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_5_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_5_0);
if ("4.6.0".equals(codeString)) if ("4.6.0".equals(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._4_6_0); return new Enumeration<FHIRVersion>(this, FHIRVersion._4_6_0);
if ("5.0.0-snapshot1".equals(codeString)) if ("5.0.0-snapshot1".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT1); return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0SNAPSHOT1);
if ("5.0.0-cibuild".equals(codeString)) if ("5.0.0-cibuild".equalsIgnoreCase(codeString))
return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0CIBUILD); return new Enumeration<FHIRVersion>(this, FHIRVersion._5_0_0CIBUILD);
throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'"); throw new FHIRException("Unknown FHIRVersion code '"+codeString+"'");
} }
public String toCode(FHIRVersion code) { public String toCode(FHIRVersion code) {
if (code == FHIRVersion._0_01) if (code == FHIRVersion._0_01)

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

@ -33,8 +33,10 @@ package org.hl7.fhir.r5.terminologies;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set;
import org.hl7.fhir.exceptions.FHIRException; import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.exceptions.NoTerminologyServiceException; import org.hl7.fhir.exceptions.NoTerminologyServiceException;
@ -544,71 +546,92 @@ public class ValueSetCheckerSimple extends ValueSetWorker implements ValueSetChe
private String systemForCodeInValueSet(String code) { private String systemForCodeInValueSet(String code) {
String sys = null; Set<String> sys = new HashSet<>();
if (!scanForCodeInValueSet(code, sys)) {
return null;
}
if (sys.size() != 1) {
return null;
} else {
return sys.iterator().next();
}
}
private boolean scanForCodeInValueSet(String code, Set<String> sys) {
if (valueset.hasCompose()) { if (valueset.hasCompose()) {
if (valueset.getCompose().hasExclude()) { // not sure what to do with the
return null; // if (valueset.getCompose().hasExclude()) {
} // return false;
// }
for (ConceptSetComponent vsi : valueset.getCompose().getInclude()) { for (ConceptSetComponent vsi : valueset.getCompose().getInclude()) {
if (vsi.hasValueSet()) { if (vsi.hasValueSet()) {
return null; for (CanonicalType u : vsi.getValueSet()) {
} if (!checkForCodeInValueSet(code, u.getValue(), sys)) {
if (!vsi.hasSystem()) { return false;
return null;
}
if (vsi.hasFilter()) {
return null;
}
CodeSystem cs = resolveCodeSystem(vsi.getSystem());
if (cs == null) {
return null;
}
if (vsi.hasConcept()) {
for (ConceptReferenceComponent cc : vsi.getConcept()) {
boolean match = cs.getCaseSensitive() ? cc.getCode().equals(code) : cc.getCode().equalsIgnoreCase(code);
if (match) {
if (sys == null) {
sys = vsi.getSystem();
} else if (!sys.equals(vsi.getSystem())) {
return null;
}
} }
} }
} else { } else if (!vsi.hasSystem()) {
ConceptDefinitionComponent cc = findCodeInConcept(cs.getConcept(), code); return false;
if (cc != null) { }
if (sys == null) { if (vsi.hasSystem()) {
sys = vsi.getSystem(); if (vsi.hasFilter()) {
} else if (!sys.equals(vsi.getSystem())) { return false;
return null; }
CodeSystem cs = resolveCodeSystem(vsi.getSystem());
if (cs != null) {
if (vsi.hasConcept()) {
for (ConceptReferenceComponent cc : vsi.getConcept()) {
boolean match = cs.getCaseSensitive() ? cc.getCode().equals(code) : cc.getCode().equalsIgnoreCase(code);
if (match) {
sys.add(vsi.getSystem());
}
}
} else {
ConceptDefinitionComponent cc = findCodeInConcept(cs.getConcept(), code);
if (cc != null) {
sys.add(vsi.getSystem());
}
}
} else {
if (vsi.hasConcept()) {
for (ConceptReferenceComponent cc : vsi.getConcept()) {
boolean match = cc.getCode().equals(code);
if (match) {
sys.add(vsi.getSystem());
}
}
} }
} }
} }
} }
} else if (valueset.hasExpansion()) { } else if (valueset.hasExpansion()) {
// Retrieve a list of all systems associated with this code in the expansion // Retrieve a list of all systems associated with this code in the expansion
List<String> systems = new ArrayList<String>(); if (!checkSystems(valueset.getExpansion().getContains(), code, sys)) {
checkSystems(valueset.getExpansion().getContains(), code, systems); return false;
if (systems.size()==1) }
sys = systems.get(0);
} }
return true;
}
return sys; private boolean checkForCodeInValueSet(String code, String uri, Set<String> sys) {
ValueSetCheckerSimple vs = getVs(uri);
return vs.scanForCodeInValueSet(code, sys);
} }
/* /*
* Recursively go through all codes in the expansion and for any coding that matches the specified code, add the system for that coding * Recursively go through all codes in the expansion and for any coding that matches the specified code, add the system for that coding
* to the passed list. * to the passed list.
*/ */
private void checkSystems(List<ValueSetExpansionContainsComponent> contains, String code, List<String> systems) { private boolean checkSystems(List<ValueSetExpansionContainsComponent> contains, String code, Set<String> systems) {
for (ValueSetExpansionContainsComponent c: contains) { for (ValueSetExpansionContainsComponent c: contains) {
if (c.getCode().equals(code)) { if (c.getCode().equals(code)) {
if (!systems.contains(c.getSystem())) systems.add(c.getSystem());
systems.add(c.getSystem());
} }
if (c.hasContains()) if (c.hasContains())
checkSystems(c.getContains(), code, systems); checkSystems(c.getContains(), code, systems);
} }
return true;
} }
@Override @Override