Merge branch 'master' of github.com:hapifhir/org.hl7.fhir.core
This commit is contained in:
commit
aa5e132307
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<parent>
|
||||
<groupId>ca.uhn.hapi.fhir</groupId>
|
||||
<artifactId>org.hl7.fhir.core</artifactId>
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
|
|
@ -3816,7 +3816,9 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
|
|||
if (isPrimitiveType(type)) {
|
||||
checkPrimitive(hostContext, errors, ei.path, type, ei.definition, ei.element, profile);
|
||||
} else {
|
||||
// checkNonPrimitive(appContext, errors, ei.path, type, ei.definition, ei.element, profile);
|
||||
if (ei.definition.hasFixed()) {
|
||||
checkFixedValue(errors,ei.path, ei.element, ei.definition.getFixed(), ei.definition.getSliceName(), null);
|
||||
}
|
||||
}
|
||||
if (type.equals("Identifier")) {
|
||||
checkIdentifier(errors, ei.path, ei.element, ei.definition);
|
||||
|
@ -3833,7 +3835,7 @@ private boolean isAnswerRequirementFulfilled(QuestionnaireItemComponent qItem, L
|
|||
} else if (type.equals("Resource")) {
|
||||
validateContains(hostContext, errors, ei.path, ei.definition, definition, resource, ei.element, localStack, idStatusForEntry(element, ei)); // if
|
||||
// (str.matches(".*([.,/])work\\1$"))
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if (rule(errors, IssueType.STRUCTURE, ei.line(), ei.col(), stack.getLiteralPath(), ei.definition != null, "Unrecognised Content " + ei.name))
|
||||
validateElement(hostContext, errors, profile, ei.definition, null, null, resource, ei.element, type, localStack, false);
|
||||
|
|
|
@ -467,6 +467,21 @@
|
|||
"source" : "extension-slice-profile.xml",
|
||||
"errorCount": 0
|
||||
}
|
||||
},
|
||||
"observation-cholesterol-good.xml" : {
|
||||
"errorCount": 0
|
||||
},
|
||||
"observation-cholesterol-bad-referencerangemissing.xml" : {
|
||||
"errorCount": 1,
|
||||
"errors": ["ERROR: Observation: Profile http://hl7.org/fhir/StructureDefinition/cholesterol, Element 'Observation.referenceRange': minimum required = 1, but only found 0"]
|
||||
},
|
||||
"observation-cholesterol-bad-referencerangehighfixedquantitywrong.xml" : {
|
||||
"errorCount": 1,
|
||||
"errors": ["ERROR: Observation.referenceRange.high.value: Value is '0' but must be '4.5'"]
|
||||
},
|
||||
"observation-cholesterol-bad-wrongcode.xml" : {
|
||||
"errorCount": 2,
|
||||
"errors": ["ERROR: Observation.code.coding.code: Value is '13457-7' but must be '35200-5'","ERROR: Observation.code.coding.display: Value is 'Cholesterol in LDL [Mass/volume] in Serum or Plasma by calculation' but must be 'Cholesterol [Moles/?volume] in Serum or Plasma'"]
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -0,0 +1,98 @@
|
|||
<Observation xmlns="http://hl7.org/fhir">
|
||||
<!-- extract from http://www.hl7.org/fhir/diagnosticreport-example-lipids.xml.html,
|
||||
changed id from cholesterol and added explizit profile reference to http://hl7.org/fhir/StructureDefinition/cholesterol -->
|
||||
<id
|
||||
value="observation-cholesterol-bad-referencerangehighfixedquantitywrong" />
|
||||
<meta>
|
||||
<profile
|
||||
value="http://hl7.org/fhir/StructureDefinition/cholesterol" />
|
||||
</meta>
|
||||
<text>
|
||||
<status value="generated" />
|
||||
<div xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
<b> Generated Narrative with Details</b>
|
||||
</p>
|
||||
<p>
|
||||
<b> id</b>
|
||||
: cholesterol
|
||||
</p>
|
||||
<p>
|
||||
<b> status</b>
|
||||
: final
|
||||
</p>
|
||||
<p>
|
||||
<b> code</b>
|
||||
: Cholesterol
|
||||
<span> (Details : {LOINC code '35200-5' = 'Cholesterol [Mass or
|
||||
Moles/volume] in Serum or Plasma',
|
||||
given as 'Cholesterol
|
||||
[Moles/​volume] in Serum or Plasma'})
|
||||
</span>
|
||||
</p>
|
||||
<p>
|
||||
<b> subject</b>
|
||||
:
|
||||
<a> Patient/pat2</a>
|
||||
</p>
|
||||
<p>
|
||||
<b> performer</b>
|
||||
:
|
||||
<a> Acme Laboratory, Inc</a>
|
||||
</p>
|
||||
<p>
|
||||
<b> value</b>
|
||||
: 6.3 mmol/L
|
||||
<span> (Details: UCUM code mmol/L = 'mmol/L')</span>
|
||||
</p>
|
||||
<h3> ReferenceRanges</h3>
|
||||
<table>
|
||||
<tr>
|
||||
<td> -</td>
|
||||
<td>
|
||||
<b> High</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> *</td>
|
||||
<td>
|
||||
4.5 mmol/L
|
||||
<span> (Details: UCUM code mmol/L = 'mmol/L')</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</text>
|
||||
<status value="final" />
|
||||
<code>
|
||||
<coding>
|
||||
<system value="http://loinc.org" />
|
||||
<code value="35200-5" />
|
||||
<display
|
||||
value="Cholesterol [Moles/volume] in Serum or Plasma" />
|
||||
</coding>
|
||||
<text value="Cholesterol" />
|
||||
</code>
|
||||
<subject>
|
||||
<reference value="Patient/pat2" />
|
||||
</subject>
|
||||
<performer>
|
||||
<reference
|
||||
value="Organization/1832473e-2fe0-452d-abe9-3cdb9879522f" />
|
||||
<display value="Acme Laboratory, Inc" />
|
||||
</performer>
|
||||
<valueQuantity>
|
||||
<value value="6.3" />
|
||||
<unit value="mmol/L" />
|
||||
<system value="http://unitsofmeasure.org" />
|
||||
<code value="mmol/L" />
|
||||
</valueQuantity>
|
||||
<referenceRange>
|
||||
<high>
|
||||
<value value="0" />
|
||||
<unit value="mmol/L" />
|
||||
<system value="http://unitsofmeasure.org" />
|
||||
<code value="mmol/L" />
|
||||
</high>
|
||||
</referenceRange>
|
||||
</Observation>
|
|
@ -0,0 +1,92 @@
|
|||
<Observation xmlns="http://hl7.org/fhir">
|
||||
<!-- extract from http://www.hl7.org/fhir/diagnosticreport-example-lipids.xml.html,
|
||||
changed id from cholesterol and added explizit profile reference to http://hl7.org/fhir/StructureDefinition/cholesterol-->
|
||||
<id value="observation-cholesterol-good" />
|
||||
<meta>
|
||||
<profile
|
||||
value="http://hl7.org/fhir/StructureDefinition/cholesterol" />
|
||||
</meta>
|
||||
<text>
|
||||
<status value="generated" />
|
||||
<div xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
<b> Generated Narrative with Details</b>
|
||||
</p>
|
||||
<p>
|
||||
<b> id</b>
|
||||
: cholesterol
|
||||
</p>
|
||||
<p>
|
||||
<b> status</b>
|
||||
: final
|
||||
</p>
|
||||
<p>
|
||||
<b> code</b>
|
||||
: Cholesterol
|
||||
<span> (Details : {LOINC code '35200-5' = 'Cholesterol [Mass or
|
||||
Moles/volume] in Serum or Plasma',
|
||||
given as 'Cholesterol
|
||||
[Moles/​volume] in Serum or Plasma'})
|
||||
</span>
|
||||
</p>
|
||||
<p>
|
||||
<b> subject</b>
|
||||
:
|
||||
<a> Patient/pat2</a>
|
||||
</p>
|
||||
<p>
|
||||
<b> performer</b>
|
||||
:
|
||||
<a> Acme Laboratory, Inc</a>
|
||||
</p>
|
||||
<p>
|
||||
<b> value</b>
|
||||
: 6.3 mmol/L
|
||||
<span> (Details: UCUM code mmol/L = 'mmol/L')</span>
|
||||
</p>
|
||||
<h3> ReferenceRanges</h3>
|
||||
<table>
|
||||
<tr>
|
||||
<td> -</td>
|
||||
<td>
|
||||
<b> High</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> *</td>
|
||||
<td>
|
||||
4.5 mmol/L
|
||||
<span> (Details: UCUM code mmol/L = 'mmol/L')</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</text>
|
||||
<status value="final" />
|
||||
<code>
|
||||
<coding>
|
||||
<system value="http://loinc.org" />
|
||||
<code value="35200-5" />
|
||||
<display
|
||||
value="Cholesterol [Moles/volume] in Serum or Plasma" />
|
||||
</coding>
|
||||
<text value="Cholesterol" />
|
||||
</code>
|
||||
<subject>
|
||||
<reference value="Patient/pat2" />
|
||||
</subject>
|
||||
<performer>
|
||||
<reference
|
||||
value="Organization/1832473e-2fe0-452d-abe9-3cdb9879522f" />
|
||||
<display value="Acme Laboratory, Inc" />
|
||||
</performer>
|
||||
<valueQuantity>
|
||||
<value value="6.3" />
|
||||
<unit value="mmol/L" />
|
||||
<system value="http://unitsofmeasure.org" />
|
||||
<code value="mmol/L" />
|
||||
</valueQuantity>
|
||||
<!-- <referenceRange> <high> <value value="0" /> <unit value="mmol/L" />
|
||||
<system value="http://unitsofmeasure.org" /> <code value="mmol/L" /> </high>
|
||||
</referenceRange> -->
|
||||
</Observation>
|
|
@ -0,0 +1,100 @@
|
|||
<Observation xmlns="http://hl7.org/fhir">
|
||||
<!-- extract from http://www.hl7.org/fhir/diagnosticreport-example-lipids.xml.html,
|
||||
changed id from cholesterol and added explizit profile reference to http://hl7.org/fhir/StructureDefinition/cholesterol -->
|
||||
<id value="observation-cholesterol-bad-wrongcode" />
|
||||
<meta>
|
||||
<profile
|
||||
value="http://hl7.org/fhir/StructureDefinition/cholesterol" />
|
||||
</meta>
|
||||
<text>
|
||||
<status value="generated" />
|
||||
<div xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
<b> Generated Narrative with Details</b>
|
||||
</p>
|
||||
<p>
|
||||
<b> id</b>
|
||||
: cholesterol
|
||||
</p>
|
||||
<p>
|
||||
<b> status</b>
|
||||
: final
|
||||
</p>
|
||||
<p>
|
||||
<b> code</b>
|
||||
: Cholesterol
|
||||
<span> (Details : {LOINC code '35200-5' = 'Cholesterol [Mass or
|
||||
Moles/volume] in Serum or Plasma',
|
||||
given as 'Cholesterol
|
||||
[Moles/​volume] in Serum or Plasma'})
|
||||
</span>
|
||||
</p>
|
||||
<p>
|
||||
<b> subject</b>
|
||||
:
|
||||
<a> Patient/pat2</a>
|
||||
</p>
|
||||
<p>
|
||||
<b> performer</b>
|
||||
:
|
||||
<a> Acme Laboratory, Inc</a>
|
||||
</p>
|
||||
<p>
|
||||
<b> value</b>
|
||||
: 6.3 mmol/L
|
||||
<span> (Details: UCUM code mmol/L = 'mmol/L')</span>
|
||||
</p>
|
||||
<h3> ReferenceRanges</h3>
|
||||
<table>
|
||||
<tr>
|
||||
<td> -</td>
|
||||
<td>
|
||||
<b> High</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> *</td>
|
||||
<td>
|
||||
4.5 mmol/L
|
||||
<span> (Details: UCUM code mmol/L = 'mmol/L')</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</text>
|
||||
<status value="final" />
|
||||
<code>
|
||||
<!-- <coding> <system value="http://loinc.org" /> <code value="35200-5"
|
||||
/> <display value="Cholesterol [Mass or Moles/volume] in Serum or Plasma"
|
||||
/> </coding> -->
|
||||
<coding>
|
||||
<system value="http://loinc.org" />
|
||||
<code value="13457-7" />
|
||||
<display
|
||||
value="Cholesterol in LDL [Mass/volume] in Serum or Plasma by calculation" />
|
||||
</coding>
|
||||
<text value="Cholesterol" />
|
||||
</code>
|
||||
<subject>
|
||||
<reference value="Patient/pat2" />
|
||||
</subject>
|
||||
<performer>
|
||||
<reference
|
||||
value="Organization/1832473e-2fe0-452d-abe9-3cdb9879522f" />
|
||||
<display value="Acme Laboratory, Inc" />
|
||||
</performer>
|
||||
<valueQuantity>
|
||||
<value value="6.3" />
|
||||
<unit value="mmol/L" />
|
||||
<system value="http://unitsofmeasure.org" />
|
||||
<code value="mmol/L" />
|
||||
</valueQuantity>
|
||||
<referenceRange>
|
||||
<high>
|
||||
<value value="4.5" />
|
||||
<unit value="mmol/L" />
|
||||
<system value="http://unitsofmeasure.org" />
|
||||
<code value="mmol/L" />
|
||||
</high>
|
||||
</referenceRange>
|
||||
</Observation>
|
|
@ -0,0 +1,97 @@
|
|||
<Observation xmlns="http://hl7.org/fhir">
|
||||
<!-- extract from http://www.hl7.org/fhir/diagnosticreport-example-lipids.xml.html,
|
||||
changed id from cholesterol and added explizit profile reference to http://hl7.org/fhir/StructureDefinition/cholesterol-->
|
||||
<id value="observation-cholesterol-bad-referencerangemissing" />
|
||||
<meta>
|
||||
<profile
|
||||
value="http://hl7.org/fhir/StructureDefinition/cholesterol" />
|
||||
</meta>
|
||||
<text>
|
||||
<status value="generated" />
|
||||
<div xmlns="http://www.w3.org/1999/xhtml">
|
||||
<p>
|
||||
<b> Generated Narrative with Details</b>
|
||||
</p>
|
||||
<p>
|
||||
<b> id</b>
|
||||
: cholesterol
|
||||
</p>
|
||||
<p>
|
||||
<b> status</b>
|
||||
: final
|
||||
</p>
|
||||
<p>
|
||||
<b> code</b>
|
||||
: Cholesterol
|
||||
<span> (Details : {LOINC code '35200-5' = 'Cholesterol [Mass or
|
||||
Moles/volume] in Serum or Plasma',
|
||||
given as 'Cholesterol
|
||||
[Moles/​volume] in Serum or Plasma'})
|
||||
</span>
|
||||
</p>
|
||||
<p>
|
||||
<b> subject</b>
|
||||
:
|
||||
<a> Patient/pat2</a>
|
||||
</p>
|
||||
<p>
|
||||
<b> performer</b>
|
||||
:
|
||||
<a> Acme Laboratory, Inc</a>
|
||||
</p>
|
||||
<p>
|
||||
<b> value</b>
|
||||
: 6.3 mmol/L
|
||||
<span> (Details: UCUM code mmol/L = 'mmol/L')</span>
|
||||
</p>
|
||||
<h3> ReferenceRanges</h3>
|
||||
<table>
|
||||
<tr>
|
||||
<td> -</td>
|
||||
<td>
|
||||
<b> High</b>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td> *</td>
|
||||
<td>
|
||||
4.5 mmol/L
|
||||
<span> (Details: UCUM code mmol/L = 'mmol/L')</span>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</text>
|
||||
<status value="final" />
|
||||
<code>
|
||||
<coding>
|
||||
<system value="http://loinc.org" />
|
||||
<code value="35200-5" />
|
||||
<display
|
||||
value="Cholesterol [Moles/volume] in Serum or Plasma" />
|
||||
</coding>
|
||||
<text value="Cholesterol" />
|
||||
</code>
|
||||
<subject>
|
||||
<reference value="Patient/pat2" />
|
||||
</subject>
|
||||
<performer>
|
||||
<reference
|
||||
value="Organization/1832473e-2fe0-452d-abe9-3cdb9879522f" />
|
||||
<display value="Acme Laboratory, Inc" />
|
||||
</performer>
|
||||
<valueQuantity>
|
||||
<value value="6.3" />
|
||||
<unit value="mmol/L" />
|
||||
<system value="http://unitsofmeasure.org" />
|
||||
<code value="mmol/L" />
|
||||
</valueQuantity>
|
||||
<referenceRange>
|
||||
<high>
|
||||
<value value="4.5" />
|
||||
<unit value="mmol/L" />
|
||||
<system value="http://unitsofmeasure.org" />
|
||||
<code value="mmol/L" />
|
||||
</high>
|
||||
</referenceRange>
|
||||
</Observation>
|
2
pom.xml
2
pom.xml
|
@ -13,7 +13,7 @@
|
|||
each other. It is fine to bump the point version of this POM without affecting
|
||||
HAPI FHIR.
|
||||
-->
|
||||
<version>3.7.29-SNAPSHOT</version>
|
||||
<version>3.7.30-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<hapi_fhir_version>3.7.0-SNAPSHOT</hapi_fhir_version>
|
||||
|
|
10
release.bat
10
release.bat
|
@ -4,16 +4,18 @@ REM make sure you are committed
|
|||
echo
|
||||
|
||||
echo ===============================================================
|
||||
echo upgrade and release fhir.core from 3.7.28-SNAPSHOT to 3.7.29-SNAPSHOT
|
||||
echo upgrade and release fhir.core from 3.7.29-SNAPSHOT to 3.7.30-SNAPSHOT
|
||||
echo ===============================================================
|
||||
pause
|
||||
|
||||
call mvn versions:set -DnewVersion=3.7.29-SNAPSHOT
|
||||
call mvn versions:set -DnewVersion=3.7.30-SNAPSHOT
|
||||
call git commit -a -m "Release new version"
|
||||
call git push origin master
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.java" --excludeFileMask "*.dll, *.exe" --includeSubDirectories --find "3.7.28-SNAPSHOT" --replace "3.7.29-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.xml" --excludeFileMask "*.dll, *.exe" --find "3.7.28-SNAPSHOT" --replace "3.7.29-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.java" --includeSubDirectories --find "3.7.29-SNAPSHOT" --replace "3.7.30-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\fhir-ig-publisher" --fileMask "*.xml" --includeSubDirectories --find "3.7.29-SNAPSHOT" --replace "3.7.30-SNAPSHOT"
|
||||
call "C:\tools\fnr.exe" --cl --dir "C:\work\org.hl7.fhir\build" --fileMask "*.xml" --find "3.7.29-SNAPSHOT" --replace "3.7.30-SNAPSHOT"
|
||||
call mvn deploy
|
||||
call python c:\tools\zulip-api\zulip\zulip\send.py --stream committers/notification --subject "java core" -m "New Java Core v3.7.30-SNAPSHOT released." --config-file zuliprc
|
||||
|
||||
echo ===============================================================
|
||||
echo all done
|
||||
|
|
Loading…
Reference in New Issue