Skip to content

Commit

Permalink
Merge pull request #37 from openhie/attend-to-new-publisher-warnings
Browse files Browse the repository at this point in the history
Updated
  • Loading branch information
rmrlangford authored Sep 14, 2023
2 parents f8cf125 + 39cfbcd commit 4f7d228
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 7 deletions.
64 changes: 58 additions & 6 deletions input/fsh/examples.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -19,46 +19,68 @@ Description: "Logically groups all resources into a single document structure."
* section[=].code.coding.code = #Funding-Organization-Information
* section[=].code.coding.system = "http://openhie.org/fhir/rwanda-hiv/CodeSystem/laboratory-report-organization-information"
* section[=].entry[+] = Reference(FundingOrganizationExample)
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"

* section[+].title = "Implementing Partner Information"
* section[=].code.coding.code = #Implementing-Partner-Information
* section[=].code.coding.system = "http://openhie.org/fhir/rwanda-hiv/CodeSystem/laboratory-report-organization-information"
* section[=].entry[+] = Reference(ImplementingPartnerOrganizationExample)
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"

* section[+].title = "Pregnancy Status"
* section[=].code = $LNC#82810-3
* section[=].entry[+] = Reference(PatientPregnantExample)
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"

* section[+].title = "New Patient Consultation"
* section[=].code = $SCT#185387006
* section[=].entry[+] = Reference(HIVPatientIsNewExample)
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"

* section[+].title = "Breastfeeding Status"
* section[=].code = $LNC#63895-7
* section[=].entry[+] = Reference(BreastfeedingExample)
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"

* section[+].title = "Consent Status"
* section[=].code = $SCT#309370004
* section[=].entry[+] = Reference(ReceiveSMSMessagesExample)
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"

* section[+].title = "Viral Load Specimen"
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"

* section[=].section[+].title = "Specimen Information"
* section[=].section[=].code = $LNC#LP7846-1
* section[=].section[=].entry[+] = Reference(VLSpecimenExample)
* section[=].section[=].text.status = #generated
* section[=].section[=].text.div = "<div><p>To be added</p></div>"

* section[=].section[+].title = "Specimen Temperature"
* section[=].section[=].code.coding.code = #Specimen-Conservation-Temperature
* section[=].section[=].code.coding.system = "http://openhie.org/fhir/rwanda-hiv/CodeSystem/laboratory-report-specimen-information"
* section[=].section[=].entry[+] = Reference(SpecimenConservationExample)
* section[=].section[=].text.status = #generated
* section[=].section[=].text.div = "<div><p>To be added</p></div>"

* section[=].section[+].title = "Specimen Transportation"
* section[=].section[=].code.coding.code = #Specimen-Transportation
* section[=].section[=].code.coding.system = "http://openhie.org/fhir/rwanda-hiv/CodeSystem/laboratory-report-specimen-transportation"
* section[=].section[=].entry[+] = Reference(TransportRequestedLocationExample)
* section[=].section[=].entry[+] = Reference(TransportCurrentLocationExample)
* section[=].section[=].text.status = #generated
* section[=].section[=].text.div = "<div><p>To be added</p></div>"

* section[+].title = "Laboratory Services"
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"
* section[=].code = $SCT#46159000
* section[=].entry[+] = Reference(ReasonForHIVTestingExample)
* section[=].entry[+] = Reference(HIVServiceRequestExample)
Expand All @@ -70,6 +92,8 @@ Description: "Logically groups all resources into a single document structure."
* section[=].entry[+] = Reference(PerformingOrganizationExample)
* section[=].entry[+] = Reference(PerformingPractitionerExample)
* section[=].section[+].title = "Result Information"
* section[=].section[=].text.status = #generated
* section[=].section[=].text.div = "<div><p>To be added</p></div>"
* section[=].section[=].code = $SCT#118246004
* section[=].section[=].entry[+] = Reference(HIVLabResultsDiagnosticReportExample)
* section[=].section[=].entry[+] = Reference(ResultDispatchedToRequestingFacilityExample)
Expand All @@ -79,10 +103,14 @@ Description: "Logically groups all resources into a single document structure."
* section[=].section[=].entry[+] = Reference(RepeatHIVTestResultExample)
* section[=].section[=].entry[+] = Reference(SuspendTreatmentHIVTestResultExample)
* section[=].section[=].section[+].title = "Results Interpreter Details"
* section[=].section[=].section[=].text.status = #generated
* section[=].section[=].section[=].text.div = "<div><p>To be added</p></div>"
* section[=].section[=].section[=].code = $SCT#726736004
* section[=].section[=].section[=].entry[+] = Reference(ResultsInterpreterExample)

* section[+].title = "ART Status"
* section[=].text.status = #generated
* section[=].text.div = "<div><p>To be added</p></div>"
* section[=].code = $SCT#410684002
* section[=].entry[+] = Reference(ARTInitiatedExample)
* section[=].entry[+] = Reference(ARVRegimenChangeExample)
Expand All @@ -91,6 +119,8 @@ Description: "Logically groups all resources into a single document structure."
* section[=].entry[+] = Reference(ARVTreatmentRegimenChangedExample)
* section[=].entry[+] = Reference(ARVTreatmentInitiatedExample)
* section[=].section[+].title = "Prescribed ARV Medication"
* section[=].section[=].text.status = #generated
* section[=].section[=].text.div = "<div><p>To be added</p></div>"
* section[=].section[=].code = $LNC#45260-7
* section[=].section[=].entry[+] = Reference(ARVRegimenMedicationRequestRegimenChangedExample)
* section[=].section[=].entry[+] = Reference(ARVRegimenMedicationRequestARVExample)
Expand Down Expand Up @@ -137,10 +167,12 @@ Description: "Represents whether this is a new patient."
* code.text = "New Patient Indication"
* subject = Reference(HIVPatientExample)
* encounter = Reference(TargetFacilityEncounterExample)
* effectiveDateTime = "2022-11-30"
* valueBoolean = true
* note.authorReference = Reference(HIVOrganizationExample)
* note.text = "additional notes here"
* note.time = "2015-02-07T13:28:17-05:00"
* performer = Reference(ObservationPerformingPractitionerExample)

Instance: PatientPregnantExample
InstanceOf: PatientPregnancyStatus
Expand All @@ -159,6 +191,7 @@ Description: "Represents the pregnancy status of a patient."
* note.authorReference = Reference(HIVOrganizationExample)
* note.text = "additional notes here"
* note.time = "2015-02-07T13:28:17-05:00"
* performer = Reference(ObservationPerformingPractitionerExample)

Instance: TargetFacilityEncounterExample
InstanceOf: TargetFacilityEncounter
Expand Down Expand Up @@ -235,6 +268,18 @@ Description: "Represents the practitioner who must perform the VL examination."
* telecom.system = #phone
* telecom.value = "27537687534"

Instance: ObservationPerformingPractitionerExample
InstanceOf: HIVPractitioner
Usage: #example
Title: "Practitioner"
Description: "Represents the practitioner who is responsible for the observation."
* extension[ClinicianUserIndex].valueInteger = 15
* name.given = "Amy"
* name.family = "White"
* telecom.system = #phone
* telecom.value = "27537687534"


Instance: HIVServiceRequestExample
InstanceOf: HIVServiceRequest
Usage: #example
Expand Down Expand Up @@ -278,7 +323,7 @@ Description: "Represents a New Lab Order."
* basedOn[+] = Reference(HIVServiceRequestExample)
* basedOn[+] = Reference(SampleDispatchedToLabExample)
* status = #requested
* intent = #order
* intent = #original-order
* executionPeriod.start = "2022-07-28"
* lastModified = "2022-07-28"
* note.authorReference = Reference(HIVOrganizationExample)
Expand All @@ -304,7 +349,7 @@ Description: "Represents a Lab Result."
* for = Reference(HIVPatientExample)
* encounter = Reference(TargetFacilityEncounterExample)
* status = #completed
* intent = #order
* intent = #original-order
* executionPeriod.end = "2022-07-30"
* lastModified = "2022-07-30"
* note.authorReference = Reference(HIVOrganizationExample)
Expand Down Expand Up @@ -334,7 +379,7 @@ Description: "Represents HIV Lab Order Cancellation."
* statusReason.concept = $SCT#281264009
* statusReason.concept.text = "Reason For Canceling/Rejecting the Lab Order"
* statusReason.concept.coding.display = "Inappropriate bottle or container for sample (finding)"
* intent = #order
* intent = #original-order
* executionPeriod.end = "2022-07-30"
* lastModified = "2022-07-30"
* note.authorReference = Reference(HIVOrganizationExample)
Expand All @@ -361,7 +406,7 @@ Description: "Represents HIV Lab Order Rejection"
* statusReason.concept = $SCT#123840003
* statusReason.concept.text = "Reason For Canceling/Rejecting the Lab Order"
* statusReason.concept.coding.display = "Sample contaminated"
* intent = #order
* intent = #original-order
* executionPeriod.end = "2022-07-30"
* lastModified = "2022-07-30"
* note.authorReference = Reference(HIVOrganizationExample)
Expand Down Expand Up @@ -435,7 +480,7 @@ Description: "Represents an ARV CarePlan for a patient whose regimen was changed
* identifier[PLAC].type.coding.display = "Placer identifier"
* identifier[PLAC].type.text = "Unique ART number"
* status = #active
* intent = #plan
* intent = #order
* subject = Reference(HIVPatientExample)
* encounter = Reference(TargetFacilityEncounterExample)
* period.start = "2022-12-01"
Expand All @@ -459,7 +504,7 @@ Description:
* identifier[PLAC].type.coding.display = "Placer identifier"
* identifier[PLAC].type.text = "Unique ART number"
* status = #active
* intent = #plan
* intent = #order
* subject = Reference(HIVPatientExample)
* encounter = Reference(TargetFacilityEncounterExample)
* period.start = "2022-12-01"
Expand Down Expand Up @@ -501,6 +546,8 @@ Description: "Represents a patient’s adherence to ARV treatment."
* note.authorReference = Reference(HIVOrganizationExample)
* note.text = "additional notes here"
* note.time = "2015-02-07T13:28:17-05:00"
* performer = Reference(ObservationPerformingPractitionerExample)
* effectiveDateTime = "2022-11-30"

Instance: BreastfeedingExample
InstanceOf: Breastfeeding
Expand All @@ -516,6 +563,8 @@ Description: "Represents a breastfeeding patient."
* note.authorReference = Reference(HIVOrganizationExample)
* note.text = "additional notes here"
* note.time = "2015-02-07T13:28:17-05:00"
* performer = Reference(ObservationPerformingPractitionerExample)
* effectiveDateTime = "2022-11-30"

Instance: LabOrderTaskActivityExample
InstanceOf: LabOrderTaskActivity
Expand Down Expand Up @@ -782,6 +831,7 @@ Description: "Represents the reason for HIV VL testing services."
* note.text = "Some comments"
* note.authorReference = Reference(HIVOrganizationExample)
* note.time = "2015-02-07T13:28:17-05:00"
* performer = Reference(ObservationPerformingPractitionerExample)

Instance: ARVRegimenChangeExample
InstanceOf: ARVRegimenChange
Expand All @@ -803,6 +853,7 @@ Description: "Represents a patient whose ARV regimen was changed."
* note.authorReference = Reference(HIVOrganizationExample)
* note.time = "2015-02-07T13:28:17-05:00"
* derivedFrom = Reference(ARTRegimenSwitchedOrSubstitutedExample)
* performer = Reference(ObservationPerformingPractitionerExample)

Instance: ARVRegimenMedicationRequestARVExample
InstanceOf: ARVRegimenMedicationRequest
Expand Down Expand Up @@ -835,6 +886,7 @@ Description: "Represents a patient who is initiated on ART."
* note.text = "Some comments"
* note.authorReference = Reference(HIVOrganizationExample)
* note.time = "2015-02-07T13:28:17-05:00"
* performer = Reference(ObservationPerformingPractitionerExample)

Instance: ARTRegimenSwitchedOrSubstitutedExample
InstanceOf: ARTRegimenSwitchedOrSubstituted
Expand Down
2 changes: 1 addition & 1 deletion input/fsh/profiles.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ Description:
* statusReason 0..1 MS
* statusReason from VSReasonForSampleCancellationOrRejection (extensible)
* statusReason.concept.text = "Reason For Canceling/Rejecting the Lab Order"
* intent = #order
* intent 1..1
* executionPeriod 0..1 MS
* lastModified 1..1
* note 0..* MS
Expand Down

0 comments on commit 4f7d228

Please sign in to comment.