3.6.0

README.md

@@ -20,7 +20,7 @@ you can build the Implementation Guide (IG) with the [ig publisher](https://conf
 
 ```
 wget https://fhir.github.io/latest-ig-publisher/org.hl7.fhir.publisher.jar -O org.hl7.fhir.igpublisher.jar
-java -Xms3550m -Xmx3550m -jar org.hl7.fhir.igpublisher.jar -ig ig.ini
+java -Xms3550m -Xmx3550m -jar org.hl7.fhir.igpublisher.jar -ig ig.ini . -tx https://tx-nordics.fhir.org/fhir/r4
 ```
 
 

input/fsh/DkCoreBasicParameter.fsh

@@ -80,7 +80,7 @@ Usage: #example
 * code = $sct#6942003
 * subject = Reference(else)
 * valueCodeableConcept.coding[+] = $sct#450847001
-* method = $sct#733985002 "Reported (qualifier value)"
+* method = $sct#733985002 "Reported"
 * effectiveDateTime = "2023-09-12T17:45:00.000Z"
 * performer = Reference(SidselSygeplejerske)
 
@@ -98,7 +98,7 @@ Usage: #example
 * component[+].code.coding[LOINC] = $LOINC#8462-4
 * component[=].code.coding[SNOMEDCT] = $sct#407555005
 * component[=].valueQuantity = 95 'mm[Hg]' "mmHg"
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 * effectiveDateTime = "2023-09-12T17:45:00.000Z"
 * performer = Reference(SidselSygeplejerske)
 
@@ -111,7 +111,7 @@ Usage: #example
 * code.coding[SNOMEDCT] = $sct#276885007
 * code.coding[LOINC] = $LOINC#8310-5
 * subject = Reference(else)
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 * effectiveDateTime = "2023-09-12T17:45:00.000Z"
 * valueQuantity = 38.7 'Cel' "grader celcius"
 * performer = Reference(SidselSygeplejerske)
@@ -124,7 +124,7 @@ Usage: #example
 * code.coding[SNOMEDCT] = $sct#364075005
 * code.coding[LOINC] = $LOINC#8867-4
 * subject = Reference(else)
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 * effectiveDateTime = "2023-09-12T17:45:00.000Z"
 * valueQuantity = 92 '/min' "slag/minut"
 * performer = Reference(SidselSygeplejerske)
@@ -137,7 +137,7 @@ Usage: #example
 * code.coding[SNOMEDCT] = $sct#86290005
 * code.coding[LOINC] = $LOINC#9279-1
 * subject = Reference(else)
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 * effectiveDateTime = "2023-09-12T17:45:00.000Z"
 * valueQuantity = 19 '/min' "/min"
 * performer = Reference(SidselSygeplejerske)
@@ -194,7 +194,7 @@ Usage: #example
 * code.coding[LOINC] = $LOINC#80288-4
 * subject = Reference(Max)
 * valueCodeableConcept.coding = $sct#450847001
-* method = $sct#733985002 "Reported (qualifier value)"
+* method = $sct#733985002 "Reported"
 * effectiveDateTime = "2023-08-08T13:30:00.000Z"
 
 Instance: MaxRespirationRate
@@ -204,7 +204,7 @@ Usage: #example
 * code.coding[SNOMEDCT] = $sct#86290005
 * code.coding[LOINC] = $LOINC#9279-1
 * subject = Reference(Max)
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 * effectiveDateTime = "2023-08-08T13:30:00.000Z"
 * valueQuantity = 13 '/min' "/min"
 
@@ -217,7 +217,7 @@ Usage: #example
 * code.coding[LOINC] = $LOINC#8867-4
 * subject = Reference(Max)
 * effectiveDateTime = "2023-08-08T13:30:00.000Z"
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 * valueQuantity = 68 '/min' "slag/minut"
 
 Instance: MaxBodyTemperature
@@ -229,7 +229,7 @@ Usage: #example
 * code.coding[LOINC] = $LOINC#8310-5
 * subject = Reference(Max)
 * effectiveDateTime = "2023-08-08T13:30:00.000Z"
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 * valueQuantity = 37 'Cel' "grader celcius"
 
 Instance: MaxBloodPressure
@@ -241,7 +241,7 @@ Usage: #example
 * code.coding[LOINC] = $LOINC#85354-9
 * subject = Reference(Max)
 * effectiveDateTime = "2023-08-08T13:30:00.000Z"
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 * component[0].code.coding[0] = $LOINC#8480-6
 * component[=].code.coding[+] = $sct#407554009
 * component[=].valueQuantity = 156 'mm[Hg]' "mmHg"
@@ -258,7 +258,7 @@ Usage: #example
 * valueQuantity = 99.0 '%' "%"
 * subject = Reference(Max)
 * effectiveDateTime = "2023-08-08T13:30:00.000Z"
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 
 Instance: MaxGlasgowComaScale
 InstanceOf: DkCoreObservation

input/fsh/DkCoreMinimalDocumentReference.fsh

@@ -72,7 +72,7 @@ Description: "PLR-DK DocumentReference instance of DkCoreMinimalDocumentReferenc
 * content.attachment.title = "Diagnoseoversigt for 2509479989"
 * content.format = $MedComFormatOID#urn:ad:dk:medcom:plr-v1.0:full "DK PLR schema"
 * context.facilityType = $sct#394761003 "almen lægepraksis"
-* context.practiceSetting = $sct#408443003 "almen medicin"
+* context.practiceSetting = $sct#408443003 "almen lægepraksis"
 * context.sourcePatientInfo = Reference(37628912-7816-47a3-acd8-396b610be142)
 * extension[+].url = "http://hl7.org/fhir/5.0/StructureDefinition/extension-DocumentReference.version"
 * extension[=].valueString = "1.0.0"

input/fsh/DkCoreObservation.fsh

@@ -150,12 +150,12 @@ Instance: ElseUrinStix
 InstanceOf: DkCoreObservation
 Usage: #example
 * status = #final
-* code.coding[0] = $NPU#NPU03987 "U—Leukocytter; arb.k.(proc.) = ?"
+* code.coding[0] = $NPU#NPU03987 "U—Leukocytes; arb.c.(proc.) = ?"
 * code.coding[+] = $sct#252385000 "Urine dipstick for leukocyte esterase (procedure)"
 * subject = Reference(else)
 * effectiveDateTime = "2023-09-12T17:45:00.000Z"
 * valueString = "Påviselige leukocytter"
-* method = $sct#272391002 "Measurement technique (qualifier value)"
+* method = $sct#272391002 "måling"
 
 Instance: ElsePainVRS
 InstanceOf: dk-core-observation
@@ -569,14 +569,12 @@ Usage: #inline
   * code
     * coding[+] = $LOINC#8480-6 "Systolic blood pressure"
     * coding[+] = $IEEEx73#150021 "MDC_PRESS_BLD_NONINV_SYS"
-    * coding[+] = $NPU#DNK05472 "Arm—Blodtryk(systolisk); tryk = ? mmHg"
     * text = "MDC_PRESS_BLD_NONINV_SYS: Systolic Blood Pressure"
   * valueQuantity = 118 'mm[Hg]' "mmHg"
 * component[+]
   * code
     * coding[+] = $LOINC#8462-4 "Diastolic blood pressure"
     * coding[+] = $IEEEx73#150022 "MDC_PRESS_BLD_NONINV_DIA"
-    * coding[+] = $NPU#05473 "Arm—Blodtryk(diastolisk); tryk = ? mmHg"
     * text = "MDC_PRESS_BLD_NONINV_DIA: Diastolic Blood Pressure"
   * valueQuantity = 87 'mm[Hg]' "mmHg"
 * component[+]
@@ -609,7 +607,7 @@ Usage: #example
 * code
   * coding[+] = $LOINC#8867-4 "Heart rate"
   * coding[+] = $IEEEx73#149546 "MDC_PULS_RATE_NON_INV"
-  * coding[+] = $NPU#NPU21692 "Heart—Systole; frequency = ? × 1/min"
+  * coding[+] = $NPU#NPU21692 "Heart—Systole; freq. = ? × 1/min"
   * text = "MDC_PULS_RATE_NON_INV: Heart rate"
 * subject = Reference(Poul)
 * performer = Reference(Poul)

input/fsh/DkCoreOrganization.fsh

@@ -36,7 +36,7 @@ Description: "HL7 Denmark core profile for a danish health organization"
   * value from MunicipalityCodes (required)
 * identifier[Regionskode] ^short = "[DA] Regionskode"
   * system 1..
-  * system = "http://hl7.dk/fhir/core/CodeSystem/dk-core-regional-subdivision-codes" (exactly)
+  * system = "urn:iso:std:iso:3166:-2" (exactly)
   * value 1..
 * identifier[ProducentID] only ProducentId
   * ^short = "[DA] Producent Id"
@@ -154,7 +154,16 @@ Usage: #example
 * type = $sct#551611000005102
 * partOf.reference = "Organization/8510eec9-180b-4e9c-95b6-02fad9f853d3"
 
+
+Instance: dk-core-organization-1
+InstanceOf: DkCoreOrganization
+Title: "DK CVR Organization instance of DkCoreOrganization"
+Description: "Sample of DK organization"
+Usage: #example
+* identifier[0].system = "http://cvr.dk"
+* identifier[=].value = "64942212"
+
 Invariant: dk-core-organization-mandatory-identifier
 Description: "Minimum one identifier shall be of type SOR-ID, KOMBIT-ORG-ID or CVR-ID"
 Severity: #error
-Expression: "identifier.where(system='urn:oid:1.2.208.176.1.1' or system='https://kombit.dk/sts/organisation' or system='urn:oid:2.16.840.1.113883.2.24.1.1').exists()"
+Expression: "identifier.where(system='urn:oid:1.2.208.176.1.1' or system='https://kombit.dk/sts/organisation' or system='urn:oid:1.3.198' or system='http://cvr.dk').exists()"

input/fsh/DkCorePatient.fsh

@@ -64,7 +64,7 @@ Usage: #example
 * address.extension[municipalityCode].url = "http://hl7.dk/fhir/core/StructureDefinition/dk-core-municipalityCodes"
 * address.extension[municipalityCode].valueCodeableConcept = $dk-core-municipality-codes#0330
 * address.extension[regionalSubDivisionCodes].url = "http://hl7.dk/fhir/core/StructureDefinition/dk-core-RegionalSubDivisionCodes"
-* address.extension[regionalSubDivisionCodes].valueCodeableConcept = $dk-core-regional-subdivision-codes#DK-85
+* address.extension[regionalSubDivisionCodes].valueCodeableConcept = $iso3166-2#DK-85
 * address.extension[address-official].url = "http://hl7.org/fhir/StructureDefinition/address-official"
 * address.extension[address-official].valueCodeableConcept = urn:iso:std:iso:3166#DK
 * address.use = #home

input/fsh/DkCorePractitioner.fsh

@@ -22,9 +22,12 @@ Usage: #example
 * qualification[0].identifier.system = "https://autregweb.sst.dk"
 * qualification[=].identifier.value = "005ML"
 * qualification[=].code = $DkCoreProfessionGroupCodes#7170
+* qualification[=].period.start = "2005-03-15"
+* qualification[=].period.end = "2030-03-14"
 * qualification[+].identifier.system = "https://autregweb.sst.dk"
 * qualification[=].identifier.value = "005M6"
 * qualification[=].code = $DkCoreProfessionGroupCodes#5166
+* qualification[=].period.start = "2002-09-01"
 
 * name.given = "Abraham"
 * name.family = "Murakami"
@@ -35,7 +38,11 @@ InstanceOf: DkCorePractitioner
 Title: "SidselSygeplejerske"
 Description: "Eksempel på en sygeplejerske"
 Usage: #example
+* qualification.identifier.system = "https://autregweb.sst.dk"
+* qualification.identifier.value = "CBDJ6"
 * qualification.code = $DkCoreProfessionGroupCodes#5166 "Sygeplejerske"
+* qualification.period.start = "2010-06-01"
+* qualification.period.end = "2028-12-31"
 * name.given = "Sidsel"
 * name.family = "Andersen"
 * name.text = "Sidsel Andersen"
@@ -49,3 +56,4 @@ Usage: #example
 * name.family = "Mortensen"
 * name.text = "Hanne Mortensen"
 * qualification.code.text = "Socialrådgiver"
+* qualification.period.start = "2015-08-20"

input/fsh/DkCorePractitionerRole.fsh

@@ -17,7 +17,7 @@ Usage: #example
 * practitioner = Reference(AbrahamLaege)
 * organization = Reference(CenterForDiabetes)
 * code = http://terminology.hl7.org/CodeSystem/v2-0286#PP
-* specialty = http://snomed.info/sct/554471000005108/version/20240331#408443003
+* specialty = http://snomed.info/sct/554471000005108#408443003
 //* location = Reference(LocationExample)
 * availableTime[0].daysOfWeek[0] = #mon
 * availableTime[=].daysOfWeek[+] = #tue
@@ -37,4 +37,4 @@ Usage: #example
 * active = true
 * organization = Reference(CenterForDiabetes)
 * code = http://terminology.hl7.org/CodeSystem/v2-0286#PP
-* specialty = http://snomed.info/sct/554471000005108/version/20240331#408443003
+* specialty = http://snomed.info/sct/554471000005108#408443003

input/fsh/DkCoreeCprIdentifier.fsh

@@ -14,7 +14,7 @@ Description: "This strucure holds the danish [X-eCPR](https://www.nspop.dk/pages
 Invariant: x-ecpr
 Description: "Requirement of danish X-eCPR. See https://www.nspop.dk/pages/viewpage.action?pageId=226757583#eCPRFormater(XeCPRogDeCPR)-Formatetfornationaleerstatningspersonnumre-X-eCPR"
 Severity: #error
-Expression: "value.matches('^((((0[1-9]|1[0-9]|2[0-9]|3[0-1])(01|03|05|07|08|10|12))|((0[1-9]|1[0-9]|2[0-9]|30)(04|06|09|11))|((0[1-9]|1[0-9]|2[0-9])(02)))([0-9]{2})((1|7){1})([A-Z]{2})([0-9]{1}))$')"
+Expression: "matches('^((((0[1-9]|1[0-9]|2[0-9]|3[0-1])(01|03|05|07|08|10|12))|((0[1-9]|1[0-9]|2[0-9]|30)(04|06|09|11))|((0[1-9]|1[0-9]|2[0-9])(02)))([0-9]{2})((1|7){1})([A-Z]{2})([0-9]{1}))$')"
 
 Profile: DkCoreDeCprIdentifier
 Parent: Identifier
@@ -32,4 +32,4 @@ Description: "This strucure holds the danish [D-eCPR](https://www.nspop.dk/pages
 Invariant: d-ecpr
 Description: "Requirement of danish D-eCPR. See https://www.nspop.dk/pages/viewpage.action?pageId=226757583#eCPRFormater(XeCPRogDeCPR)-Formatetfordecentraleerstatningspersonnumre-D-eCPR"
 Severity: #error
-Expression: "value.matches('^((((0[1-9]|1[0-9]|2[0-9]|3[0-1])(01|03|05|07|08|10|12))|((0[1-9]|1[0-9]|2[0-9]|30)(04|06|09|11))|((0[1-9]|1[0-9]|2[0-9])(02)))([0-9]{2})((0|5|6){1})([A-Z]{2})([0-9]{1}))$')"
+Expression: "matches('^((((0[1-9]|1[0-9]|2[0-9]|3[0-1])(01|03|05|07|08|10|12))|((0[1-9]|1[0-9]|2[0-9]|30)(04|06|09|11))|((0[1-9]|1[0-9]|2[0-9])(02)))([0-9]{2})((0|5|6){1})([A-Z]{2})([0-9]{1}))$')"