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 branch 'master' of https://github.com/hapifhir/org.hl7.fhir.core

This commit is contained in:
Grahame Grieve 2019-08-01 08:11:27 +10:00
parent cac82546da abba91bf99
commit 23b575d4f9
20 changed files with 5293 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.convertors/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu2/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu2016may/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.dstu3/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.r4/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.r5/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

3
org.hl7.fhir.r5/src/test/resources/snapshot-generation/manifest.xml
View File

@ -1,4 +1,4 @@
<snapshot-generation-tests>
<snapshot-generation-tests>
<test gen="true" id="t1">
<rule text="The snapshot must have the same number of elements, in the same order, with matching paths" fhirpath="fixture('t1-output').snapshot.element.select(path) = fixture('patient').snapshot.element.select(path)"/>
<rule text="The snapshot elements must be the same - check short description" fhirpath="fixture('t1-output').snapshot.element.all(aliasAs('A').short = fixture('patient').snapshot.element.where(path = alias('A').path).short)"/>
@ -220,6 +220,7 @@
<rule text="The element definition for value[x] quantity slice should have sliceName = 'Quantity'" fhirpath="fixture('t44-output').snapshot.element.where(id = 'Observation.value[x]:valueQuantity').check(exists(), 'no slice').sliceName = 'valueQuantity'"/>
<rule text="The element definition for value[x].value quantity slice should have sliceName = 'Quantity'" fhirpath="fixture('t44-output').snapshot.element.where(id = 'Observation.value[x]:valueQuantity.value').check(exists(), 'no slice').min = 1"/>
</test>
<test gen="true" sort="true" id="t45" register="t45-defn"/>
<test gen="true" id="samply1"/>
<!-- <test gen="true" id="au1" include="au1a"/> -->
<test gen="true" id="au2"/>

48
org.hl7.fhir.r5/src/test/resources/snapshot-generation/t45-defn.xml Normal file
View File

@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="profile-claim"/>
<url value="http://hl7.org/fhir/us/davinci-pas/StructureDefinition/profile-claim"/>
<name value="PASClaim"/>
<status value="draft"/>
<fhirVersion value="4.0.0"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="Claim"/>
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Claim"/>
<derivation value="constraint"/>
<differential>
<element id="Claim">
<path value="Claim"/>
<isModifier value="false"/>
</element>
<element id="Claim.supportingInfo">
<path value="Claim.supportingInfo"/>
<slicing>
<discriminator>
<type value="pattern"/>
<path value="category"/>
</discriminator>
<rules value="open"/>
</slicing>
<isModifier value="false"/>
</element>
<element id="Claim.supportingInfo:RelatedCauses">
<path value="Claim.supportingInfo"/>
<sliceName value="RelatedCauses"/>
<isModifier value="false"/>
</element>
<element id="Claim.supportingInfo:RelatedCauses.category">
<path value="Claim.supportingInfo.category"/>
<type>
<code value="CodeableConcept"/>
</type>
<patternCodeableConcept>
<coding>
<system value="http://hl7.org/us/davinci-pas/CodeSystem/PASSupportingInfoType"/>
<code value="relatedCauses"/>
</coding>
</patternCodeableConcept>
<isModifier value="false"/>
</element>
</differential>
</StructureDefinition>

4012
org.hl7.fhir.r5/src/test/resources/snapshot-generation/t45-expected.xml Normal file
View File

File diff suppressed because it is too large Load Diff

32
org.hl7.fhir.r5/src/test/resources/snapshot-generation/t45-input.xml Normal file
View File

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="UTF-8"?>
<StructureDefinition xmlns="http://hl7.org/fhir">
<id value="profile-claim-update"/>
<url value="http://hl7.org/fhir/us/davinci-pas/StructureDefinition/profile-claim-update"/>
<name value="PASClaimUpdate"/>
<status value="draft"/>
<fhirVersion value="4.0.0"/>
<kind value="resource"/>
<abstract value="false"/>
<type value="Claim"/>
<baseDefinition value="http://hl7.org/fhir/us/davinci-pas/StructureDefinition/profile-claim"/>
<derivation value="constraint"/>
<differential>
<element id="Claim">
<path value="Claim"/>
<isModifier value="false"/>
</element>
<element id="Claim.supportingInfo">
<path value="Claim.supportingInfo"/>
<isModifier value="false"/>
</element>
<element id="Claim.supportingInfo.extension:SupportingInfoAbsent">
<path value="Claim.supportingInfo.extension"/>
<sliceName value="SupportingInfoAbsent"/>
<type>
<code value="Extension"/>
<profile value="http://hl7.org/fhir/StructureDefinition/data-absent-reason"/>
</type>
<isModifier value="false"/>
</element>
</differential>
</StructureDefinition>

2
org.hl7.fhir.utilities/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.validation.cli/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
org.hl7.fhir.validation/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>ca.uhn.hapi.fhir</groupId>
<artifactId>org.hl7.fhir.core</artifactId>
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

@ -2524,14 +2524,15 @@ public class InstanceValidator extends BaseValidator implements IResourceValidat
String u = null;
if (fullUrl != null && fullUrl.endsWith(type+"/"+id))
// fullUrl = complex
u = fullUrl.substring((type+"/"+id).length())+ref;
u = fullUrl.substring(0, fullUrl.length() - (type+"/"+id).length())+ref;
// u = fullUrl.substring((type+"/"+id).length())+ref;
String[] parts = ref.split("\\/");
if (parts.length >= 2) {
String t = parts[0];
String i = parts[1];
for (Element entry : entries) {
String fu = entry.getNamedChildValue("fullUrl");
if (u != null && fullUrl.equals(u))
if (u != null && fu.equals(u))
return entry;
if (u == null) {
Element resource = entry.getNamedChild("resource");

1133
org.hl7.fhir.validation/src/test/resources/validation-examples/bundle-ips-examples-bundle-01.xml Normal file
View File

File diff suppressed because it is too large Load Diff

45
org.hl7.fhir.validation/src/test/resources/validation-examples/bundle-local-refs.xml Normal file
View File

@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bundle xmlns="http://hl7.org/fhir">
<id value="bundle-local-refs"/>
<meta>
<lastUpdated value="2019-07-21T11:01:00+05:00"/>
</meta>
<identifier>
<system value="http://example.org/documentIDs"/>
<value value="A12345"/>
</identifier>
<type value="document"/>
<timestamp value="2019-07-21T11:01:00+05:00"/>
<entry>
<fullUrl value="http://example.org/fhir/Composition/1"/>
<resource>
<Composition>
<id value="1"/>
<status value="final"/>
<type>
<text value="foo"/>
</type>
<subject>
<reference value="Patient/1"/>
</subject>
<date value="2019-07-21T23:09:00+07:00"/>
<author>
<display value="foo"/>
</author>
<title value="Example with local references"/>
</Composition>
</resource>
</entry>
<entry>
<fullUrl value="http://example.org/fhir/Patient/1"/>
<resource>
<Patient>
<id value="1"/>
<name>
<family value="SMITH"/>
<given value="JOE"/>
</name>
</Patient>
</resource>
</entry>
</Bundle>

6
org.hl7.fhir.validation/src/test/resources/validation-examples/manifest.json
View File

@ -827,7 +827,11 @@
"source": "profile-slicing-profile-open.xml",
"errorCount": 1
}
}
},
"bundle-local-refs.xml" : {
"errorCount": 0,
"warningCount": 0
}
}
}
}

2
org.hl7.fhir.validation/src/test/resources/validation-examples/synthea.json
View File

@ -17,7 +17,7 @@
"value": "v6751"
}
],
"status": "finished",
"status": "completed",
"subject": {
"reference": "Patient/f001",
"display": "P. van de Heuvel"

2
pom.xml
View File

@ -13,7 +13,7 @@
each other. It is fine to bump the point version of this POM without affecting
HAPI FHIR.
-->
<version>3.8.14-SNAPSHOT</version>
<version>3.8.15-SNAPSHOT</version>
<properties>
<hapi_fhir_version>4.0.0-SNAPSHOT</hapi_fhir_version>

4
release.bat
View File

@ -1,7 +1,7 @@
@echo off
set oldver=3.8.13
set newver=3.8.14
set oldver=3.8.14
set newver=3.8.15
echo ..
echo =====================================================================