Merge pull request #264 from hl7-be/issue-250

Issue 250
hl7-be · Aug 28, 2023 · c1d1315 · c1d1315
2 parents aaf6a5e + 255aa94
commit c1d1315
Show file tree

Hide file tree

Showing 16 changed files with 55 additions and 47 deletions.
diff --git a/...t/fsh/extensions/BePerformerReference.fsh → ...h/extensions/BePerformerReference.fsh_bla b/...t/fsh/extensions/BePerformerReference.fsh → ...h/extensions/BePerformerReference.fsh_bla
diff --git a/input/fsh/extensions/BePerformerType.fsh b/input/fsh/extensions/BePerformerType.fsh
@@ -0,0 +1,7 @@
+Extension: BePerformerType
+Id: be-ext-performer-type 
+Title: "BePerformerType"
+Description: "Types of performers that can execute this request"
+* value[x] only CodeableConcept
+* valueCodeableConcept 0.. MS
+* valueCodeableConcept from https://www.ehealth.fgov.be/standards/fhir/core/ValueSet/be-vs-cd-hcparty (extensible)
diff --git a/input/fsh/instances/uc2a.fsh b/input/fsh/instances/uc2a.fsh
@@ -17,8 +17,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[validity].valuePeriod.start = "2023-01-26"
 * extension[validity].valuePeriod.end = "2023-07-26"
 * extension[feedback].valueBoolean = true
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * reasonCode = $sct#44653001 //niet in Belgische module
 * code =  $sct#385796006
 * status = #active
@@ -100,8 +100,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[feedback].valueBoolean = true
 * occurrenceTiming.repeat.boundsDuration.unit = #mo
 * occurrenceTiming.repeat.boundsDuration.value = 1
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * note.text = "long stretch bandage not available for june release"
 
 Instance: uc2a-3
@@ -123,8 +123,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[feedback].valueBoolean = true
 * occurrenceTiming.repeat.boundsDuration.unit = #mo
 * occurrenceTiming.repeat.boundsDuration.value = 3
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 
 
 

diff --git a/input/fsh/instances/uc5a.fsh b/input/fsh/instances/uc5a.fsh
@@ -24,8 +24,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[validity].valuePeriod.end = "2023-08-07"
 * extension[feedback].valueBoolean = true
 * occurrenceTiming.repeat.count = 1
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * bodySite.extension[bodyLaterality].valueCoding = $sct#419161000
 * bodySite.coding = $sct#14975008
 

diff --git a/input/fsh/instances/ucgh211.fsh b/input/fsh/instances/ucgh211.fsh
@@ -12,8 +12,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * subject.identifier.value = "38012699993"
 * extension[validity].valuePeriod.start = "2022-10-03"
 * extension[validity].valuePeriod.end = "2023-04-03"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persorthotist
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persorthotist
 * extension[coprescriber].extension[coprescriberNumber].valuePositiveInt = 2
 * extension[coprescriber].extension[coprescriber][+].extension[coprescriber].valueReference = Reference(ucgh211-1-1)
 * extension[coprescriber].extension[coprescriber][=].extension[coprescriptionStatus].valueCodeableConcept = TaskStatus#requested

diff --git a/input/fsh/instances/ucgh222p12.fsh b/input/fsh/instances/ucgh222p12.fsh
@@ -19,8 +19,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[validity].valuePeriod.start = "2022-10-03"
 * extension[validity].valuePeriod.end = "2023-04-03"
 * extension[feedback].valueBoolean = false
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * requisition.system = "https://www.ehealth.fgov.be/standards/fhir/referral/NamingSystem/uhmep"
 * requisition.value = "27e5a4a4-e043-11ed-b5ea-0242ac120002"
 * occurrenceDateTime = "2022-10-10"
@@ -39,8 +39,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[validity].valuePeriod.start = "2022-10-03"
 * extension[validity].valuePeriod.end = "2023-04-03"
 * extension[feedback].valueBoolean = false
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * requisition.system = "https://www.ehealth.fgov.be/standards/fhir/referral/NamingSystem/uhmep"
 * requisition.value = "27e5a4a4-e043-11ed-b5ea-0242ac120002"
 * occurrenceDateTime = "2022-10-10"
@@ -63,8 +63,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[feedback].valueBoolean = false
 //* orderDetail = https://www.ehealth.fgov.be/standards/fhir/referral/CodeSystem/be-cs-temp-requested-service-detail#tmp-hube-type-3
 * note.text = "Huber needle type: 20G x 25mm (not available for june release -> is device)"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * requisition.system = "https://www.ehealth.fgov.be/standards/fhir/referral/NamingSystem/uhmep"
 * requisition.value = "27e5a4a4-e043-11ed-b5ea-0242ac120002"
 * occurrenceDateTime = "2022-10-10"

diff --git a/input/fsh/instances/ucgh222p13.fsh b/input/fsh/instances/ucgh222p13.fsh
@@ -29,8 +29,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[validity].valuePeriod.start = "2022-10-03"
 * extension[validity].valuePeriod.end = "2023-04-03"
 * extension[feedback].valueBoolean = false
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * bodySite = $sct#14975008
 * bodySite.extension[bodyLaterality].valueCoding = $sct#419161000
 * note.text = "Flamazine"
@@ -52,8 +52,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[validity].valuePeriod.end = "2023-04-03"
 * extension[feedback].valueBoolean = false
 * note.text = "Melolin 10x10cm"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" //other code?
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 
 
 Instance: ucgh222p13-1-1

diff --git a/input/fsh/instances/ucgh241p110.fsh b/input/fsh/instances/ucgh241p110.fsh
@@ -12,8 +12,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * category =  $sct#9632001
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * contained[+] = ucgh241p110-1-1
 //disorientation (time/space), incontinency (nocturnal/occasional) cannot be added to the prescription.
 //Katz score cannot be added to the prescription

diff --git a/input/fsh/instances/ucgh241p111.fsh b/input/fsh/instances/ucgh241p111.fsh
@@ -13,8 +13,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * category =  $sct#9632001
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * contained[+] = ucgh241p111-1-1
 // only one reasonCode possible
 

diff --git a/input/fsh/instances/ucgh241p15.fsh b/input/fsh/instances/ucgh241p15.fsh
@@ -13,8 +13,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * category =  $sct#9632001
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" 
-* performer[=].identifier.value = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" 
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * contained[+] = ucgh241p15-1-1
 * note.extension[https://www.ehealth.fgov.be/standards/fhir/core/StructureDefinition/be-ext-codeableconcept].valueCodeableConcept = $sct#410666004
 * note.text = "geen medische reden voor terugbetaling"

diff --git a/input/fsh/instances/ucgh241p16.fsh b/input/fsh/instances/ucgh241p16.fsh
@@ -14,10 +14,10 @@ InstanceOf: BeReferralPrescriptionNursing
 * category =  $sct#9632001
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" 
-* performer[=].identifier.value = #persnurse
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
-* performer[=].identifier.value = #persdiabeticeducator 
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" 
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
+* extension[performerType][=].valueCodeableConcept.coding.code = #persdiabeticeducator 
 * contained[+] = ucgh241p16-1-1
 
 

diff --git a/input/fsh/instances/ucgh241p17.fsh b/input/fsh/instances/ucgh241p17.fsh
@@ -14,10 +14,10 @@ InstanceOf: BeReferralPrescriptionNursing
 * category =  $sct#9632001
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" 
-* performer[=].identifier.value = #persnurse
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
-* performer[=].identifier.value = #persdiabeticeducator 
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty" 
+* extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
+* extension[performerType][+].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
+* extension[performerType][=].valueCodeableConcept.coding.code = #persdiabeticeducator 
 * occurrenceTiming[+].repeat.count  = 4
 * occurrenceTiming[=].repeat.boundsPeriod.end = "2023-12-31"
 * contained[+] = ucgh241p17-1-1

diff --git a/input/fsh/instances/ucgh241p18.fsh b/input/fsh/instances/ucgh241p18.fsh
@@ -14,8 +14,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * category =  $sct#9632001
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
-* performer[=].identifier.value = #persdiabeticeducator 
+* extension[performerType].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
+* extension[performerType].valueCodeableConcept.coding.code = #persdiabeticeducator 
 * occurrenceTiming[+].repeat.count  = 5
 * occurrenceTiming[=].repeat.duration = 0.5
 * occurrenceTiming[=].repeat.durationUnit = #h

diff --git a/input/fsh/instances/ucgh241p19.fsh b/input/fsh/instances/ucgh241p19.fsh
@@ -14,8 +14,8 @@ InstanceOf: BeReferralPrescriptionNursing
 * category =  $sct#9632001
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* performer[+].identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
-* performer[=].identifier.value = #persdiabeticeducator 
+* extension[performerType].valueCodeableConcept.coding.system = "https://www.ehealth.fgov.be/standards/fhir/core/CodeSystem/cd-hcparty"
+* extension[performerType].valueCodeableConcept.coding.code = #persdiabeticeducator 
 * occurrenceTiming[+].repeat.count  = 10
 * occurrenceTiming[=].repeat.duration = 0.5
 * occurrenceTiming[=].repeat.durationUnit = #h

diff --git a/input/fsh/logicals/BeModelReferralPrescription.fsh b/input/fsh/logicals/BeModelReferralPrescription.fsh
@@ -3,12 +3,12 @@ Description: "Logical model describing the model for the prescription referral.
 * recordedDate 1..1 dateTime "When this prescription was created" "When this prescription was created"
 * recorder 1..1 Reference "The person who is responsable for the content, not necessarily the person who entered the content. This is either the prescriber, a co-prescriber or a performer. It is the last person who updated the resources." "The person who is responsable for the content, not necessarily the person who entered the content. This is either the prescriber, a co-prescriber or a performer. It is the last person who updated the resources."
 * prescriber 1..1 Reference "The prescribing healthcare party" "The prescribing healthcare party"
-* co-prescriberNumber 1..1 positiveInt "Number of co-prescribers that must sign the prescription to activate it" "Number of co-prescribers that must sign the prescription to activate it"
-* co-prescriber 0..* BackboneElement "Information about co prescribers" "Information about co prescribers"
-* co-prescriber.co-prescriber 0..1 Reference "The co-prescriber party" "The co-prescriber party"
-* co-prescriber.co-prescriberType 1..1 code "Type of the practitioner" "Type of the practitioner"
-* co-prescriber.status 0..1 code "Status of co prescribing status (to sign, signed or refused)" "Status of co prescribing status (to sign, signed or refused)"
-* co-prescriber.required 1..1 positiveInt "Type of mandatory for the signature of the co-prescriber (1= required: the co-prescriber SHALL sign to make the prescription valid, 2= conditionally required: the co-prescriber SHALL sign if the number of co-prescribers with a signature is lower than the number in co-prescriber number 3= optional: the signature does not affect the validity of the prescription, but is for information only"
+* coprescriberNumber 1..1 positiveInt "Number of co-prescribers that must sign the prescription to activate it" "Number of co-prescribers that must sign the prescription to activate it"
+* coprescriber 0..* BackboneElement "Information about co prescribers" "Information about co prescribers"
+* coprescriber.coprescriber 0..1 Reference "The co-prescriber party" "The co-prescriber party"
+* coprescriber.coprescriberType 1..1 code "Type of the practitioner" "Type of the practitioner"
+* coprescriber.status 0..1 code "Status of co prescribing status (to sign, signed or refused)" "Status of co prescribing status (to sign, signed or refused)"
+* coprescriber.required 1..1 positiveInt "Type of mandatory for the signature of the co-prescriber (1= required: the co-prescriber SHALL sign to make the prescription valid, 2= conditionally required: the co-prescriber SHALL sign if the number of co-prescribers with a signature is lower than the number in co-prescriber number 3= optional: the signature does not affect the validity of the prescription, but is for information only"
 * patient 1..1 Reference "The SSIN of the person for which the referral is prescribed." "The SSIN of the person for which the referral is prescribed."
 * prescriptionNumber 1..1 Identifier "An identifier for the ReferralPrescription, e.g. the UHMEP identifier, once available" "An identifier for the ReferralPrescription, e.g. the UHMEP identifier, once available"
 * pssNumber 0..1 Identifier "An identifier for the Prescription Search Support"

diff --git a/input/fsh/profiles/BeReferralPrescription.fsh b/input/fsh/profiles/BeReferralPrescription.fsh
@@ -29,7 +29,8 @@ Description: "The common structure for referral prescription."
     BeProposalType named proposalType 0..1 MS and
     //BeTaskReference named task 0..1 MS and
     BePSSInfo named pss 0..1 MS and
-    BeExtRecorder named recorder 0..1 MS
+    BeExtRecorder named recorder 0..1 MS and
+    BePerformerType named performerType 0..* MS
 * extension[statusReason].valueCodeableConcept 1..1
 * extension[statusReason].valueCodeableConcept from BeVSPrescriptionStatusReason (extensible)
 * extension[coprescriber] ^short = "Info about the other parties that have to take part in the prescription."
@@ -38,6 +39,7 @@ Description: "The common structure for referral prescription."
 * extension[feedback] ^short = "Give feedback to the prescriber"
 * extension[recorder] ^short = "The person responsable for this information, not necessarily the person who recorded the information"
 * extension[latestDraft] ^short = "The prescription must have left the draft status befor this moment"
+* extension[performerType] ^short = "Discipline of provider. Replaces .performerType because of wrong cardinality"
 //* extension[performertasks] ^short = "The subtasks as executed by different performers. Together they form the execution of the prescription as described in task extension"
 * identifier MS
 * identifier ^slicing.discriminator.type = #value
@@ -72,8 +74,7 @@ Description: "The common structure for referral prescription."
 * requester only BeContainedOrLogicalReference
 * requester only Reference(BePractitionerRole)
 * requester ^short = "Prescriber of the requested service"
-* performerType ..0 MS
-* performerType ^short = "Discipline of provider"
+* performerType 0..0 MS
 * performer  MS
 * performer only BeContainedOrLogicalReference
 * performer only Reference( BePractitionerRole )