Merge branch 'master' into feature/ipa-support

_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

build-notes.txt

@@ -0,0 +1 @@
+jkiddo@badSeed work % java -jar publisher.jar -go-publish -source /Users/jkiddo/work/dk-core  -web /Users/jkiddo/work/dk-website/fhir -temp /Users/jkiddo/work/temp -registry ig-registry/fhir-ig-list.json -history fhir-ig-history-template -templates /Users/jkiddo/work/dk-website/fhir/templates

ig.ini

@@ -1,3 +1,4 @@
 [IG]
 ig = fsh-generated/resources/ImplementationGuide-hl7.fhir.dk.core.json
 template = https://github.com/hl7dk/dk-ig-template
+;template = fhir.base.template#current 

input/fsh/AuthorizationIdentifier.fsh

@@ -8,11 +8,8 @@ Description: "Identifier holding the official [authorization identifier](https:/
 * value 1..
   * obeys authorization-id-format
   * ^maxLength = 5
-// WARNING: The constraint index in the following rule (e.g., constraint[0]) may be incorrect.
-// Please compare with the constraint array in the original definition's snapshot and adjust as necessary.
-  * ^constraint.source = "https://stps.dk/da/autorisation/om-autorisationer/autorisations-id/"
-
+
 Invariant: authorization-id-format
-Description: "Authorization ID consists of exactly 5 consonants and Y and or numbers in any order"
+Description: "Authorization ID consists of exactly 5 consonants and Y and or numbers in any order. See https://stps.dk/da/autorisation/om-autorisationer/autorisations-id/"
 Severity: #error
-Expression: "matches('^([b-df-hj-np-tv-zB-DF-HJ-NP-TV-Z0-9]){5}$')"
+Expression: "matches('^([b-df-hj-np-tv-zB-DF-HJ-NP-TV-Z0-9]){5}$')"

input/fsh/CVRIdentifier.fsh

@@ -3,7 +3,6 @@ Parent: Identifier
 Id: dk-core-cvr-identifier
 Title: "Danish Central Business Register (CVR) Identifier"
 Description: "Identifier holding a danish [CVR](https://datacvr.virk.dk/data/) number."
-* ^status = #draft
 * use = #official (exactly)
 * system 1..
 * system = "http://cvr.dk" (exactly)
@@ -13,9 +12,9 @@ Description: "Identifier holding a danish [CVR](https://datacvr.virk.dk/data/) n
 Invariant: CVR-length
 Description: "CVR must be exactly 8 numeric characters long"
 Severity: #error
-Expression: "value.matches('^[0-9]{8}$')"
+Expression: "matches('^[0-9]{8}$')"
 
 Invariant: CVR-modulus-11
 Description: "CVR must pass the modulus 11 check"
 Severity: #error
-Expression: "((\n    (value.substring(0,1).toInteger()*2)+\n    (value.substring(1,1).toInteger()*7)+\n    (value.substring(2,1).toInteger()*6)+\n    (value.substring(3,1).toInteger()*5)+\n    (value.substring(4,1).toInteger()*4)+\n    (value.substring(5,1).toInteger()*3)+\n    (value.substring(6,1).toInteger()*2)+\n    (value.substring(7,1).toInteger()*1)) mod(11)=0)"
+Expression: "((\n    (substring(0,1).toInteger()*2)+\n    (substring(1,1).toInteger()*7)+\n    (substring(2,1).toInteger()*6)+\n    (substring(3,1).toInteger()*5)+\n    (substring(4,1).toInteger()*4)+\n    (substring(5,1).toInteger()*3)+\n    (substring(6,1).toInteger()*2)+\n    (substring(7,1).toInteger()*1)) mod(11)=0)"

input/fsh/DkCoreCondition.fsh

@@ -84,6 +84,22 @@ Usage: #example
 * clinicalStatus = $condition-clinical#active
 * verificationStatus = $condition-ver-status#confirmed
 
+Instance: JohnFracture
+InstanceOf: DkCoreCondition
+Title: "John fraktur"
+Description: "Johns fraktur-diagnose, udskrivningsdiagnose fra hospitalet med tillægskode"
+Usage: #example
+* code.coding[SKS-D] = urn:oid:1.2.208.176.2.4.12#DS721+TUL1 "Pertrokantær femurfraktur, højresidig"
+* subject.reference = "Patient/john"
+* asserter.reference = "Practitioner/AbrahamLaege"
+* recorder.reference = "Practitioner/AbrahamLaege"
+* category = $condition-category#encounter-diagnosis
+* onsetDateTime = "2022-04-26"
+* recordedDate = "2022-04-27"
+* clinicalStatus = $condition-clinical#active
+* verificationStatus = $condition-ver-status#confirmed
+
+
 Instance: JohnMelanoma
 InstanceOf: DkCoreCondition
 Title: "John mistanke om Modermærkekræft"

input/fsh/DkCoreCprIdentifier.fsh

@@ -3,22 +3,16 @@ Parent: Identifier
 Id: dk-core-cpr-identifier
 Title: "Danish Central Person Register (CPR) Identifier"
 Description: "This structure holds the danish [CPR](https://cpr.dk/) identifier"
-* ^status = #draft
 * use = #official (exactly)
 * system 1..
 * system = "urn:oid:1.2.208.176.1.2" (exactly)
 * value 1..
   * obeys cpr
   * ^maxLength = 10
-// WARNING: The constraint index in the following rule (e.g., constraint[0]) may be incorrect.
-// Please compare with the constraint array in the original definition's snapshot and adjust as necessary.
-  * ^constraint.source = "https://cpr.dk/cpr-systemet/opbygning-af-cpr-nummeret/#:~:text=5%20%2D%206%20position%20angiver%20personens,i%20personnummeret%20angiver%20personens%20k%C3%B8n."
-// WARNING: The constraint index in the following rule (e.g., constraint[0]) may be incorrect.
-// Please compare with the constraint array in the original definition's snapshot and adjust as necessary.
-  * ^constraint.requirements = "Requirement of danish civil registration numbers"
   * ^mustSupport = false
 
 Invariant: cpr
-Description: "Requirement of danish civil registration numbers"
+Description: "Requirement of danish civil registration numbers. See https://cpr.dk/cpr-systemet/opbygning-af-cpr-nummeret/#:~:text=5%20%2D%206%20position%20angiver%20personens,i%20personnummeret%20angiver%20personens%20k%C3%B8n."
 Severity: #error
-Expression: "value.matches('^(?:(?:31(?:0[13578]|1[02])|(?:30|29)(?:0[13-9]|1[0-2])|(?:0[1-9]|1[0-9]|2[0-8])(?:0[1-9]|1[0-2]))[0-9]{2}[0-9]|290200[4-9]|2902(?:(?!00)[02468][048]|[13579][26])[0-3])[0-9]{3}$')"
+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]{6})$')"
+* requirements = "Requirement of danish civil registration numbers"