Skip to content

Commit

Permalink
Fixe tests, fix method binding strength, fix value//specimen cardinality
Browse files Browse the repository at this point in the history
  • Loading branch information
@APageNHS
APageNHS committed Oct 30, 2023
1 parent 1c76837 commit 565b709
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 28 deletions.
14 changes: 13 additions & 1 deletion codesystems/CodeSystem-UKCore-FundingCategory.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,17 @@
<description value="A set of codes that define the funding category for a patient."/>
<copyright value="Copyright &#169; 2021+ HL7 UK Licensed under the Apache License, Version 2.0 (the &quot;License&quot;); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an &quot;AS IS&quot; BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. HL7&#174; FHIR&#174; standard Copyright &#169; 2011+ HL7 The HL7&#174; FHIR&#174; standard is used under the FHIR license. You may obtain a copy of the FHIR license at https://www.hl7.org/fhir/license.html."/>
<caseSensitive value="true"/>
<content value="not-present"/>
<content value="complete"/>
<concept>
<code value="nhs"/>
<display value="NHS"/>
</concept>
<concept>
<code value="private"/>
<display value="Private"/>
</concept>
<concept>
<code value="devolved-nations"/>
<display value="Devolved nations"/>
</concept>
</CodeSystem>
8 changes: 8 additions & 0 deletions structuredefinitions/UKCore-Observation-VitalSigns-BloodPressure.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,21 @@
<valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-BloodPressure" />
</binding>
</element>
<element id="Observation.value[x]">
<path value="Observation.value[x]" />
<max value="0" />
</element>
<element id="Observation.method">
<path value="Observation.method" />
<binding>
<strength value="preferred" />
<valueSet value="https://fhir.hl7.org.uk/ValueSet/UKCore-BloodPressure-MeasurementMethod" />
</binding>
</element>
<element id="Observation.specimen">
<path value="Observation.specimen" />
<max value="0" />
</element>
<element id="Observation.device">
<path value="Observation.device" />
<type>
Expand Down
28 changes: 1 addition & 27 deletions structuredefinitions/UKCore-Observation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,42 +57,18 @@
<baseDefinition value="http://hl7.org/fhir/StructureDefinition/Observation" />
<derivation value="constraint" />
<differential>
<element id="Observation.extension">
<path value="Observation.extension" />
<slicing>
<discriminator>
<type value="value" />
<path value="url" />
</discriminator>
<rules value="open" />
</slicing>
<min value="0" />
</element>
<element id="Observation.extension:triggeredByR5">
<path value="Observation.extension" />
<sliceName value="triggeredByR5" />
<short value="Triggering observation(s). This is a R5 backport." />
<min value="0" />
<type>
<code value="Extension" />
<profile value="http://hl7.org/fhir/5.0/StructureDefinition/extension-Observation.triggeredBy" />
</type>
</element>
<element id="Observation.extension:triggeredByR5.extension">
<path value="Observation.extension.extension" />
<slicing>
<discriminator>
<type value="value" />
<path value="url" />
</discriminator>
<rules value="open" />
</slicing>
<min value="2" />
</element>
<element id="Observation.extension:triggeredByR5.extension:observation">
<path value="Observation.extension.extension" />
<sliceName value="observation" />
<min value="1" />
</element>
<element id="Observation.extension:triggeredByR5.extension:observation.value[x]">
<path value="Observation.extension.extension.value[x]" />
Expand All @@ -102,7 +78,6 @@
<element id="Observation.extension:triggeredByR5.extension:type">
<path value="Observation.extension.extension" />
<sliceName value="type" />
<min value="1" />
</element>
<element id="Observation.extension:triggeredByR5.extension:type.value[x]">
<path value="Observation.extension.extension.value[x]" />
Expand All @@ -112,7 +87,6 @@
<element id="Observation.extension:triggeredByR5.extension:reason">
<path value="Observation.extension.extension" />
<sliceName value="reason" />
<min value="0" />
</element>
<element id="Observation.extension:triggeredByR5.extension:reason.value[x]">
<path value="Observation.extension.extension.value[x]" />
Expand Down Expand Up @@ -251,7 +225,7 @@
<element id="Observation.method">
<path value="Observation.method" />
<binding>
<strength value="extensible" />
<strength value="preferred" />
</binding>
</element>
<element id="Observation.specimen">
Expand Down
21 changes: 21 additions & 0 deletions valuesets/ValueSet-UKCore-FundingCategory.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,25 @@
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-FundingCategory"/>
</include>
</compose>
<expansion>
<identifier value="c2047257-9de9-45c5-b0cb-38a6d478fcfa"/>
<timestamp value="2023-04-28T09:15:53+00:00"/>
<total value="3"/>
<offset value="0"/>
<contains>
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-FundingCategory"/>
<code value="nhs"/>
<display value="NHS"/>
</contains>
<contains>
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-FundingCategory"/>
<code value="private"/>
<display value="Private"/>
</contains>
<contains>
<system value="https://fhir.hl7.org.uk/CodeSystem/UKCore-FundingCategory"/>
<code value="devolved-nations"/>
<display value="Devolved nations"/>
</contains>
</expansion>
</ValueSet>

0 comments on commit 565b709

Please sign in to comment.