Merge pull request #41 from HL7Norway/feature/lan09012024

Feature/lan09012024
HL7Norway · Feb 5, 2024 · 860fee8 · 860fee8
2 parents b8be25b + bd20299
commit 860fee8
Show file tree

Hide file tree

Showing 62 changed files with 704 additions and 503 deletions.
diff --git a/.github/workflows/testbuild-vitalsigns-gh-pages.yml b/.github/workflows/testbuild-vitalsigns-gh-pages.yml
@@ -34,7 +34,7 @@ jobs:
 
       # NPM and no-basis package
       - name: NPM install no-basis
-        run: npm --registry https://packages.simplifier.net install hl7.fhir.no.basis@2.1.2
+        run: npm --registry https://packages.simplifier.net install hl7.fhir.no.basis@2.2.0
 
       # Downloads the newest version of the IG Publisher, this could probable be cached.
       - name: 📥 Download IG Publisher

diff --git a/.github/workflows/vitalsigns-gh-pages.yml b/.github/workflows/vitalsigns-gh-pages.yml
@@ -34,7 +34,7 @@ jobs:
 
       # NPM and no-basis package
       - name: NPM install no-basis
-        run: npm --registry https://packages.simplifier.net install hl7.fhir.no.basis@2.1.1
+        run: npm --registry https://packages.simplifier.net install hl7.fhir.no.basis@2.2.0
 
       # Downloads the newest version of the IG Publisher, this could probable be cached.
       - name: 📥 Download IG Publisher

diff --git a/VitalSigns/_updatePublisher.sh b/VitalSigns/_updatePublisher.sh
@@ -117,13 +117,16 @@ if [[ $skipPrompts == true ]] || [[ $response =~ ^[yY].*$ ]]; then
 
   curl -L $gencont_sh_url -o /tmp/_gencontinuous.new
   cp /tmp/_gencontinuous.new _gencontinuous.sh
+  chmod +x _gencontinuous.sh
   rm /tmp/_gencontinuous.new
 
   curl -L $gen_sh_url -o /tmp/_genonce.new
   cp /tmp/_genonce.new _genonce.sh
+  chmod +x _genonce.sh
   rm  /tmp/_genonce.new
 
   curl -L $update_sh_url -o /tmp/_updatePublisher.new
   cp /tmp/_updatePublisher.new _updatePublisher.sh
+  chmod +x _updatePublisher.sh
   rm /tmp/_updatePublisher.new
 fi
diff --git a/VitalSigns/input/fsh/aliases.fsh b/VitalSigns/input/fsh/aliases.fsh
@@ -12,13 +12,7 @@ Alias: $no-basis-Patient = http://hl7.no/fhir/StructureDefinition/no-basis-Patie
 Alias: $no-basis-Practitioner = http://hl7.no/fhir/StructureDefinition/no-basis-Practitioner
 Alias: $no-basis-PractitionerRole = http://hl7.no/fhir/StructureDefinition/no-basis-PractitionerRole
 Alias: $no-basis-Organization = http://hl7.no/fhir/StructureDefinition/no-basis-Organization
-Alias: $no-bloodpressurebodysite-valueset = http://hl7.no/fhir/ValueSet/NoDomainVitalSignsObservationBloodpressureBodySite
-Alias: $no-domain-vital-signs-observations-measurementmethodvalueSet = http://hl7.no/fhir/ValueSet/no-domain-vitalsignsobservation-measurementmethodvalueSet
-Alias: $no-domain-vital-signs-observations-oxygensaturation-bodysitevalueset = http://hl7.no/fhir/ValueSet/no-domain-vitalsignsobservation-oxygensaturation-bodysitevalueset
-Alias: $no-heartrhythm-valueset = http://hl7.no/fhir/ValueSet/no-heartrhythm-valueset
-Alias: $no-domain-vital-signs-observations-respirationrate-patternvalueset = http://hl7.no/fhir/ValueSet/no-domain-vital-signs-observations-respirationrate-patternvalueset
 // Instances
 Alias: $sct = http://snomed.info/sct
 Alias: $loinc = http://loinc.org
 Alias: $observation-category = http://terminology.hl7.org/CodeSystem/observation-category
-Alias: $clinical-codes = http://acme.org/devices/clinical-codes
diff --git a/VitalSigns/input/fsh/extensions/NoDomainVitalSignPulsRhythm.fsh b/VitalSigns/input/fsh/extensions/NoDomainVitalSignPulsRhythm.fsh
@@ -0,0 +1,12 @@
+Extension: NoDomainVitalSignsObservationPulseRhythm
+Id: NoDomainVitalSignsObservationPulseRhythm
+Description: "Regularity of the pulse"
+* ^url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationPulseRhythm"
+* ^version = "0.9.0000"
+* ^status = #draft
+* ^date = "2021-05-01"
+* ^context.type = #element
+* ^context.expression = "Observation"
+* url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationPulseRhythm" (exactly)
+* value[x] only Coding
+* value[x] from NoDomainVitalSignsObservationPulseRhythm (required)
diff --git a/...gns/input/fsh/extensions/NoDomainVitalSignsObservationBodyHeightBodyPositionExtension.fsh b/...gns/input/fsh/extensions/NoDomainVitalSignsObservationBodyHeightBodyPositionExtension.fsh
@@ -9,5 +9,3 @@ Description: "Position of individual when body height measured."
 * url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationBodyHeightBodyPosition" (exactly)
 * value[x] only Coding
 * value[x] from NoDomainVitalSignsObservationBodyHeightBodyPosition (required)
-// * value[x].coding ..1
-// * value[x].coding from NoDomainVitalSignsObservationBodyHeightBodyPosition (required)
diff --git a/...Signs/input/fsh/extensions/NoDomainVitalSignsObservationCharacterOfHeartRateExtension.fsh b/...Signs/input/fsh/extensions/NoDomainVitalSignsObservationCharacterOfHeartRateExtension.fsh
@@ -1,6 +1,6 @@
 Extension: NoDomainVitalSignsObservationCharacterOfHeartRate
 Id: NoDomainVitalSignsObservationCharacterOfHeartRate
-Description: "Description of the character of the pulse or heart beat."
+Description: "Description of the character of the  heart beat."
 * ^url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationCharacterOfHeartRate"
 * ^version = "0.9.0000"
 * ^status = #draft

diff --git a/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationCharacterOfPulsExtension.fsh b/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationCharacterOfPulsExtension.fsh
@@ -0,0 +1,11 @@
+Extension: NoDomainVitalSignsObservationCharacterOfPulse
+Id: NoDomainVitalSignsObservationCharacterOfPulse
+Description: "Description of the character of the pulse."
+* ^url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationCharacterOfPulse"
+* ^version = "0.9.0000"
+* ^status = #draft
+* ^date = "2021-05-01"
+* ^context.type = #element
+* ^context.expression = "Observation"
+* url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationCharacterOfPulse" (exactly)
+* value[x] only Annotation
diff --git a/...igns/input/fsh/extensions/NoDomainVitalSignsObservationHeartRateBodyPositionExtension.fsh b/...igns/input/fsh/extensions/NoDomainVitalSignsObservationHeartRateBodyPositionExtension.fsh
diff --git a/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationHeartRatePulsBodyPosition.fsh b/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationHeartRatePulsBodyPosition.fsh
@@ -0,0 +1,12 @@
+Extension: NoDomainVitalSignsObservationHeartRatePulseBodyPosition
+Id: NoDomainVitalSignsObservationHeartRatePulseBodyPosition
+Description: "Record which Korotkoff sound is used for determining diastolic pressure using auscultative method."
+* ^url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationHeartRatePulseBodyPosition"
+* ^version = "0.9.0000"
+* ^status = #draft
+* ^date = "2021-05-01"
+* ^context.type = #fhirpath
+* ^context.expression = "Observation"
+* url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationHeartRatePulseBodyPosition" (exactly)
+* value[x] only Coding
+* value[x] from NoDomainVitalSignsObservationHeartRatePulseBodyPosition (required)
diff --git a/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationHeartRhythmExtension.fsh b/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationHeartRhythmExtension.fsh
@@ -1,6 +1,6 @@
 Extension: NoDomainVitalSignsObservationHeartRhythm
 Id: NoDomainVitalSignsObservationHeartRhythm
-Description: "Regularity of the pulse or heart beat."
+Description: "Regularity of the  heart beat."
 * ^url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationHeartRhythm"
 * ^version = "0.9.0000"
 * ^status = #draft
@@ -10,6 +10,3 @@ Description: "Regularity of the pulse or heart beat."
 * url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationHeartRhythm" (exactly)
 * value[x] only Coding
 * value[x] from NoDomainVitalSignsObservationHeartRhythm (required)
-// * value[x].coding ..1
-// * value[x].coding from NoDomainVitalSignsObservationHeartRhythm (required)
-// * value[x].coding.system from $no-heartrhythm-valueset (required)
diff --git a/...ns/input/fsh/extensions/NoDomainVitalSignsObservationHeartRhythmIrregularityExtension.fsh b/...ns/input/fsh/extensions/NoDomainVitalSignsObservationHeartRhythmIrregularityExtension.fsh
@@ -1,6 +1,6 @@
 Extension: NoDomainVitalSignsObservationHeartRhythmIrregularity
 Id: NoDomainVitalSignsObservationHeartRhythmIrregularity
-Description: "More specific pattern of an irregular pulse or heart beat."
+Description: "More specific pattern of an irregular heart beat."
 * ^url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationHeartRhythmIrregularity"
 * ^version = "0.9.0000"
 * ^status = #draft

diff --git a/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationInspiredOxygenExtension.fsh b/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationInspiredOxygenExtension.fsh
@@ -13,16 +13,6 @@ Description: "Details of the amount of oxygen available to the subject at the ti
     ProsentO2 named ProsentO2 0..1 and
     OnAir named OnAir 0..1 and
     MethodofOxygenDelivery named MethodofOxygenDelivery 0..1
-// * extension[oxygenAdministrationMethod] ^short = "http://dips.no/fhir/StructureDefinition/oxygenAdministrationMethod"
-// * extension[oxygenAdministrationMethod].value[x] only string
-// * extension[Flow] ^short = "http://dips.no/fhir/StructureDefinition/Flow"
-// * extension[Flow].value[x] only Quantity
-// * extension[FiO2] ^short = "http://dips.no/fhir/StructureDefinition/FiO2"
-// * extension[FiO2].value[x] only Ratio
-// * extension[FiO2] ^short = "http://dips.no/fhir/StructureDefinition/FiO2"
-// * extension[ProsentO2].value[x] only Ratio
-// * extension[onAir] ^short = "http://dips.no/fhir/StructureDefinition/onAir"
-// * extension[onAir].value[x] only boolean
 * url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationInspiredOxygen" (exactly)
 
 

diff --git a/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationPulsRhythmIrregularity.fsh b/VitalSigns/input/fsh/extensions/NoDomainVitalSignsObservationPulsRhythmIrregularity.fsh
@@ -0,0 +1,12 @@
+Extension: NoDomainVitalSignsObservationPulseRhythmIrregularity
+Id: NoDomainVitalSignsObservationPulseRhythmIrregularity
+Description: "More specific pattern of an irregular pulse or heart beat."
+* ^url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationPulseRhythmIrregularity"
+* ^version = "0.9.0000"
+* ^status = #draft
+* ^date = "2021-05-01"
+* ^context.type = #element
+* ^context.expression = "Observation"
+* url = "http://hl7.no/fhir/StructureDefinition/NoDomainVitalSignsObservationPulseRhythmIrregularity" (exactly)
+* value[x] only Coding
+* value[x] from NoDomainVitalSignsObservationPulseRhythmIrregularity (required)
diff --git a/VitalSigns/input/fsh/instances/CommonInstance.fsh b/VitalSigns/input/fsh/instances/CommonInstance.fsh
diff --git a/VitalSigns/input/fsh/instances/CommonInstance.fsh.bak b/VitalSigns/input/fsh/instances/CommonInstance.fsh.bak
diff --git a/VitalSigns/input/fsh/instances/NoDomainCommon.fsh b/VitalSigns/input/fsh/instances/NoDomainCommon.fsh
@@ -0,0 +1,49 @@
+Instance: afa23
+InstanceOf: Organization
+Usage: #example
+Title: "Organization details of afa23"
+Description: ""
+* identifier.system = "urn:oid:1.3.6.1.4.1.9038.70.3"
+* identifier.value = "23"
+
+Instance: cdp1000808
+InstanceOf: Patient
+Usage: #example
+Title: "Patient details of cdp1000808"
+Description: ""
+* identifier.system = "urn:oid:2.16.578.1.12.4.1.4.1"
+* identifier.value = "1000808"
+
+Instance: cdp1000240
+InstanceOf: Patient
+Usage: #example
+Title: "Patient details of cdp1000240"
+Description: ""
+* identifier.system = "urn:oid:2.16.578.1.12.4.1.4.1"
+* identifier.value = "1000240"
+
+
+Instance: agb104
+InstanceOf: PractitionerRole
+Usage: #example
+Title: "Practioner details of agb104"
+Description: ""
+* identifier.system = "urn:oid:1.3.6.1.4.1.9038.51.1"
+* identifier.value = "104"
+
+
+Instance: agb30
+InstanceOf: PractitionerRole
+Usage: #example
+Title: "PractitionerRole details of agb30"
+Description: ""
+* identifier.system = "urn:oid:1.3.6.1.4.1.9038.51.1"
+* identifier.value = "30"
+
+
+
+
+
+
+
+