Merge pull request #277 from hl7-be/revert-275-issue-265

Revert "Issue 265"
hl7-be · Oct 19, 2023 · 9ddb43f · 9ddb43f
2 parents 3ce1466 + cac1db9
commit 9ddb43f
Show file tree

Hide file tree

Showing 10 changed files with 35 additions and 144 deletions.
diff --git a/input/fsh/instances/ucgh222p13.fsh b/input/fsh/instances/ucgh222p13.fsh
@@ -3,54 +3,26 @@
 //treated with Flamazine and covered with Melolin 10x10cm. This treatment should 
 //be given by a nurse. 
 
-//Instance: ucgh222p13
-//InstanceOf: BeReferralPrescriptionRequestGroup
-//* action[+].id = "ucgh222p13-1"
-//* action[=].resource = Reference(ucgh222p13-1)
-//* action[+].id = "ucgh222p13-2"
-//* action[=].resource = Reference(ucgh222p13-2)
-//* action.relatedAction.actionId = "ucgh222p13-1"
-//* action.relatedAction.relationship = #after
-//* intent = #order
-//* status = #draft
-
-
-Instance: ucgh222p13-bundle
-InstanceOf: Bundle
-* type = #transaction
-* entry[+].resource = ucgh222p13
-* entry[=].fullUrl = "http://uhmep-server/ServiceRequest/ucgh222p13"
-* entry[=].request.url = "http://uhmep-server/ServiceRequest/ucgh222p13"
-* entry[=].request.method = #PUT
-* entry[+].resource = ucgh222p13-1
-* entry[=].fullUrl = "http://uhmep-server/ServiceRequest/ucgh222p13-1"
-* entry[=].request.url = "http://uhmep-server/ServiceRequest/ucgh222p13-1"
-* entry[=].request.method = #PUT
-* entry[+].resource = ucgh222p13-2
-* entry[=].fullUrl = "http://uhmep-server/ServiceRequest/ucgh222p13-2"
-* entry[=].request.url = "http://uhmep-server/ServiceRequest/ucgh222p13-2"
-* entry[=].request.method = #PUT
-* entry[+].resource = ucgh222p13-1-1
-* entry[=].fullUrl = "http://uhmep-server/PractitionerRole/ucgh222p13-1-1"
-* entry[=].request.url = "http://uhmep-server/ServiceRequest/ucgh222p13-1-1"
-* entry[=].request.method = #PUT
-* entry[+].resource = ucgh222p13-1-2
-* entry[=].fullUrl = "http://uhmep-server/MedicationRequest/ucgh222p13-1-2"
-* entry[=].request.url = "http://uhmep-server/ServiceRequest/ucgh222p13-1-2"
-* entry[=].request.method = #PUT
-* entry[+].resource = ucgh222p13-2-1
-* entry[=].fullUrl = "http://uhmep-server/DeviceRequest/ucgh222p13-2-1"
-* entry[=].request.url = "http://uhmep-server/ServiceRequest/ucgh222p13-2-1"
-* entry[=].request.method = #PUT
-
 Instance: ucgh222p13
+InstanceOf: BeReferralPrescriptionRequestGroup
+* action[+].id = "ucgh222p13-1"
+* action[=].resource = Reference(ucgh222p13-1)
+* action[+].id = "ucgh222p13-2"
+* action[=].resource = Reference(ucgh222p13-2)
+* action.relatedAction.actionId = "ucgh222p13-1"
+* action.relatedAction.relationship = #after
+* intent = #order
+* status = #draft
+
+Instance: ucgh222p13-1
 InstanceOf: BeReferralPrescriptionNursing
+* contained[+] = ucgh222p13-1-1
 * reasonCode = $sct#46541008 //not in belgian extension
 * requester = Reference(ucgh222p13-1-1)
 * authoredOn = "2022-10-03"
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* code = $sct#225358003 
+* code = $sct#18629005
 * category = $sct#9632001
 * intent = #order
 * status = #draft
@@ -61,50 +33,27 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[performerType][=].valueCodeableConcept.coding.code = #persnurse
 * bodySite = $sct#14975008
 * bodySite.extension[bodyLaterality].valueCoding = $sct#419161000
-
-
-
-Instance: ucgh222p13-1
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh222p13)
-* code = $sct#18629005
-* category = $sct#9632001
-* intent = #order
-* status = #draft
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
-
-
-Instance: ucgh222p13-1-2
-InstanceOf: MedicationRequest
-* basedOn = Reference(ucgh222p13-1)
-* intent = #plan
-* status = #draft
-* note.text = "Flamazine"
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
-* medicationCodeableConcept = https://www.ehealth.fgov.be/standards/fhir/medication/NamingSystem/cti-extended-code#093746-01
 * note.text = "Flamazine"
 
 Instance: ucgh222p13-2
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh222p13)
+InstanceOf: BeReferralPrescriptionNursing
+* contained[+] = ucgh222p13-1-1
+* reasonCode = $sct#46541008 //not in belgian extension
+* requester = Reference(ucgh222p13-1-1)
+* authoredOn = "2022-10-03"
 * subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
 * subject.identifier.value = "38012699993"
-* code = $sct#3895009
+* code = $sct#225358003
+* orderDetail = $sct#3895009
 * category = $sct#9632001
 * intent = #order
 * status = #draft
-
-
-Instance: ucgh222p13-2-1
-InstanceOf: DeviceRequest
-* basedOn = Reference(ucgh222p13-2)
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
-* codeCodeableConcept = https://www.ehealth.fgov.be/standards/fhir/medication/NamingSystem/cnk-codes#0191353
-* intent = #plan
+* extension[validity].valuePeriod.start = "2022-10-03"
+* extension[validity].valuePeriod.end = "2023-04-03"
+* extension[feedback].valueBoolean = false
 * note.text = "Melolin 10x10cm"
+* 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
@@ -18,14 +18,6 @@ InstanceOf: BeReferralPrescriptionNursing
 //disorientation (time/space), incontinency (nocturnal/occasional) cannot be added to the prescription.
 //Katz score cannot be added to the prescription
 
-Instance: ucgh241p110-1-2
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh241p110-1)
-* code = $sct#225964003
-* status = #draft
-* intent = #order
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
 
 
 

diff --git a/input/fsh/instances/ucgh241p111.fsh b/input/fsh/instances/ucgh241p111.fsh
@@ -18,15 +18,6 @@ InstanceOf: BeReferralPrescriptionNursing
 * contained[+] = ucgh241p111-1-1
 // only one reasonCode possible
 
-Instance: ucgh241p111-1-2
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh241p111-1)
-* code = $sct#225230008
-* status = #draft
-* intent = #order
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
-
 
 
 

diff --git a/input/fsh/instances/ucgh241p15.fsh b/input/fsh/instances/ucgh241p15.fsh
@@ -19,14 +19,7 @@ InstanceOf: BeReferralPrescriptionNursing
 * note.extension[https://www.ehealth.fgov.be/standards/fhir/core/StructureDefinition/be-ext-codeableconcept].valueCodeableConcept = $sct#410666004
 * note.text = "geen medische reden voor terugbetaling"
 
-Instance: ucgh241p15-1-2
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh241p15-1)
-* code = $temp-service#tmp-prep-rsed-5
-* status = #draft
-* intent = #order
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
+
 
 
 

diff --git a/input/fsh/instances/ucgh241p16.fsh b/input/fsh/instances/ucgh241p16.fsh
@@ -20,14 +20,7 @@ InstanceOf: BeReferralPrescriptionNursing
 * extension[performerType][=].valueCodeableConcept.coding.code = #persdiabeticeducator 
 * contained[+] = ucgh241p16-1-1
 
-Instance: ucgh241p16-1-2
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh241p16-1)
-* code = $sct#385805005
-* status = #draft
-* intent = #order
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
+
 
 
 

diff --git a/input/fsh/instances/ucgh241p17.fsh b/input/fsh/instances/ucgh241p17.fsh
@@ -23,14 +23,7 @@ InstanceOf: BeReferralPrescriptionNursing
 * contained[+] = ucgh241p17-1-1
 //BMI, hypertension are Observations, and cannot be added to the prescription.
 
-Instance: ucgh241p17-1-2
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh241p17-1)
-* code = $sct#385805005
-* status = #draft
-* intent = #order
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
+
 
 
 

diff --git a/input/fsh/instances/ucgh241p18.fsh b/input/fsh/instances/ucgh241p18.fsh
@@ -24,14 +24,7 @@ InstanceOf: BeReferralPrescriptionNursing
 * contained[+] = ucgh241p18-1-1
 //Insulin treatment, care path contract, GMF cannot be added to the prescription.
 
-Instance: ucgh241p18-1-2
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh241p18-1)
-* code = $sct#385805005
-* status = #draft
-* intent = #order
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
+
 
 
 

diff --git a/input/fsh/instances/ucgh241p19.fsh b/input/fsh/instances/ucgh241p19.fsh
@@ -24,14 +24,11 @@ InstanceOf: BeReferralPrescriptionNursing
 * contained[+] = ucgh241p19-1-1
 //Insulin treatment, care path contract, GMF cannot be added to the prescription.
 
-Instance: ucgh241p19-1-2
-InstanceOf: BeNursingCareRequest
-* basedOn = Reference(ucgh241p19-1)
-* code = $sct#385805005
-* status = #draft
-* intent = #order
-* subject.identifier.system = "https://www.ehealth.fgov.be/standards/fhir/core/NamingSystem/ssin"
-* subject.identifier.value = "38012699993"
+
+
+
+
+
 
 
 Instance: ucgh241p19-1-1

diff --git a/input/fsh/profiles/BeNursingCareRequest.fsh b/input/fsh/profiles/BeNursingCareRequest.fsh
diff --git a/input/fsh/valuesets/BeVSRequestNoteType.fsh b/input/fsh/valuesets/BeVSRequestNoteType.fsh
@@ -4,5 +4,4 @@ Id: be-vs-request-note-type
 Description: "Types of notes used in a referral prescription"
 * ^experimental = false
 * include $sct#103306004
-* include $sct#410666004
-* include $sct#385805005
+* include $sct#410666004