Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updates to US Core 3.1.1 examples and C4BB 1.0.0 EoB-Outpatient-Institutional #2908

Merged
merged 2 commits into from
Oct 27, 2021
Merged

Updates to US Core 3.1.1 examples and C4BB 1.0.0 EoB-Outpatient-Institutional #2908

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8199e7f
Updates to US Core 3.1.1 examples
lmsurpre Oct 27, 2021
b4aa52d
issue #2275 - fixup 1.0.0 valueset reference to include version
lmsurpre Oct 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...b/100/package/StructureDefinition-C4BB-ExplanationOfBenefit-Outpatient-Institutional.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7985,7 +7985,7 @@
"isSummary": false,
"binding": {
"strength": "required",
"valueSet": "http://hl7.org/fhir/us/carin-bb/ValueSet/AMACPTCMSHCPCSProcedureCodes"
"valueSet": "http://hl7.org/fhir/us/carin-bb/ValueSet/AMACPTCMSHCPCSProcedureCodes|1.0.0"
}
},
{
Expand Down
3 changes: 1 addition & 2 deletions conformance/fhir-ig-us-core/src/test/java/com/ibm/fhir/ig/us/core/test/v311/ProfileTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ public void testUSCoreValidation() throws Exception {
});
assertEquals(countErrors(issues), 0);
} catch (Exception e) {
System.out.println("Exception with " + path);
fail(e.toString());
fail("Exception with " + path, e);
}
}

Expand Down
1 change: 1 addition & 0 deletions ...rmance/fhir-ig-us-core/src/test/resources/JSON/311/DocumentReference-episode-summary.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
{
"system": "http://hl7.org/fhir/us/core/CodeSystem/us-core-documentreference-category",
"code": "clinical-note",
"version": "3.1.1",
"display": "Clinical Note"
}
],
Expand Down
2 changes: 1 addition & 1 deletion ...rmance/fhir-ig-us-core/src/test/resources/JSON/311/Observation-pediatric-bmi-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"id": "pediatric-bmi-example",
"meta": {
"profile": [
"http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age"
"http://hl7.org/fhir/us/core/StructureDefinition/pediatric-bmi-for-age|3.1.1"
]
},
"text": {
Expand Down
6 changes: 3 additions & 3 deletions conformance/fhir-ig-us-core/src/test/resources/JSON/311/Patient-child-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"valueString": "Asian"
}
],
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-race|3.1.1"
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-race"
},
{
"extension": [
Expand All @@ -43,10 +43,10 @@
"valueString": "Not Hispanic or Latino"
}
],
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity|3.1.1"
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity"
},
{
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex|3.1.1",
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex",
"valueCode": "M"
}
],
Expand Down
6 changes: 3 additions & 3 deletions conformance/fhir-ig-us-core/src/test/resources/JSON/311/Patient-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
"valueString": "Mixed"
}
],
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-race|3.1.1"
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-race"
},
{
"extension": [
Expand Down Expand Up @@ -91,10 +91,10 @@
"valueString": "Hispanic or Latino"
}
],
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity|3.1.1"
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity"
},
{
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex|3.1.1",
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex",
"valueCode": "F"
}
],
Expand Down
6 changes: 3 additions & 3 deletions conformance/fhir-ig-us-core/src/test/resources/JSON/311/Patient-infant-example.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"valueString": "Asian"
}
],
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-race|3.1.1"
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-race"
},
{
"extension": [
Expand All @@ -43,10 +43,10 @@
"valueString": "Not Hispanic or Latino"
}
],
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity|3.1.1"
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity"
},
{
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex|3.1.1",
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-birthsex",
"valueCode": "M"
}
],
Expand Down
2 changes: 1 addition & 1 deletion conformance/fhir-ig-us-core/src/test/resources/JSON/311/Practitioner-practitioner-2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{
"extension": [
{
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-direct|3.1.1",
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-direct",
"valueBoolean": true
}
],
Expand Down
2 changes: 1 addition & 1 deletion ...est/resources/JSON/311/tests/Pamela954_Johns824_4818eca9-c6d2-4fa0-a234-7244e620391e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
]
},
{
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity|3.1.1",
"url": "http://hl7.org/fhir/us/core/StructureDefinition/us-core-ethnicity",
"extension": [
{
"url": "ombCategory",
Expand Down
2 changes: 1 addition & 1 deletion fhir-path/src/main/java/com/ibm/fhir/path/function/ConformsToFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ public Collection<FHIRPathNode> apply(EvaluationContext evaluationContext, Colle
String url = getStringValue(arguments.get(0)).string();

if (FHIRRegistry.getInstance().hasResource(url, StructureDefinition.class)) {
StructureDefinition structureDefinition = FHIRRegistry.getInstance().getResource(url, StructureDefinition.class);
StructureDefinition structureDefinition = FHIRRegistry.getInstance().getResource(url, StructureDefinition.class);

if (FHIRPathType.FHIR_UNKNOWN_RESOURCE_TYPE.equals(type)) {
if (!StructureDefinitionKind.RESOURCE.equals(structureDefinition.getKind())) {
Expand Down
2 changes: 1 addition & 1 deletion fhir-registry/src/main/java/com/ibm/fhir/registry/util/FHIRRegistryUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ public static Resource loadResource(String path) {
try (BufferedReader reader = new BufferedReader(new InputStreamReader(FHIRRegistryUtil.class.getClassLoader().getResourceAsStream(path), StandardCharsets.UTF_8))) {
return FHIRParser.parser(Format.JSON).parse(reader);
} catch (Exception e) {
log.warning("Unable to load resource: " + path + " due to the following exception: " + e.getMessage());
log.log(Level.WARNING, "Unable to load resource: " + path, e);
}
return null;
}
Expand Down