Skip to content

Commit

Permalink
Merge pull request #38 from openhie/attend-to-new-publisher-warnings
Browse files Browse the repository at this point in the history
Update examples.fsh
  • Loading branch information
rmrlangford authored Sep 14, 2023
2 parents 4f7d228 + dfe1108 commit 5c7beb0
Show file tree
Hide file tree
Showing 2 changed files with 46 additions and 45 deletions.
31 changes: 16 additions & 15 deletions input/fsh/examples.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -20,67 +20,67 @@ Description: "Logically groups all resources into a single document structure."
* 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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].section[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><p>To be added</p></div>"
* section[=].code = $SCT#46159000
* section[=].entry[+] = Reference(ReasonForHIVTestingExample)
* section[=].entry[+] = Reference(HIVServiceRequestExample)
Expand All @@ -93,7 +93,7 @@ Description: "Logically groups all resources into a single document structure."
* 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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><p>To be added</p></div>"
* section[=].section[=].code = $SCT#118246004
* section[=].section[=].entry[+] = Reference(HIVLabResultsDiagnosticReportExample)
* section[=].section[=].entry[+] = Reference(ResultDispatchedToRequestingFacilityExample)
Expand All @@ -104,13 +104,13 @@ Description: "Logically groups all resources into a single document structure."
* 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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><p>To be added</p></div>"
* section[=].code = $SCT#410684002
* section[=].entry[+] = Reference(ARTInitiatedExample)
* section[=].entry[+] = Reference(ARVRegimenChangeExample)
Expand All @@ -120,7 +120,7 @@ Description: "Logically groups all resources into a single document structure."
* 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[=].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><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 @@ -905,6 +905,7 @@ Description: "Represents a patient whose ARV regimen has been switched to a new
* note.text = "Some comments"
* note.authorReference = Reference(HIVOrganizationExample)
* note.time = "2015-02-07T13:28:17-05:00"
* performer = Reference(ObservationPerformingPractitionerExample)

Instance: TransportRequestedLocationExample
InstanceOf: TransportLocation
Expand Down
60 changes: 30 additions & 30 deletions input/fsh/profiles.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,16 @@ Id: patient-age-months
Title: "Patient Age In Months"
Description: "Age of the patient calculated in months."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Patient"
* ^context[+].type = #element
* ^context[=].expression = "Patient"

Extension: PatientAgeInYears
Id: patient-age-years
Title: "Patient Age In Years"
Description: "Age of the patient calculated in years."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Patient"
* ^context[+].type = #element
* ^context[=].expression = "Patient"

Profile: HIVOrganization
Parent: Organization
Expand Down Expand Up @@ -153,8 +153,8 @@ Id: sample-reordered
Title: "Sample reordered"
Description: "An indication whether the sample was reordered."
* value[x] only boolean
* ^context[0].type = #element
* ^context[0].expression = "Specimen"
* ^context[+].type = #element
* ^context[=].expression = "Specimen"

Profile: HIVServiceRequest
Parent: ServiceRequest
Expand Down Expand Up @@ -230,8 +230,8 @@ Id: result-entered-manually
Title: "Test Result Entered Manually"
Description: "An indication whether the test result was entered manually."
* value[x] only boolean
* ^context[0].type = #element
* ^context[0].expression = "Observation"
* ^context[+].type = #element
* ^context[=].expression = "Observation"

Profile: HIVPractitioner
Parent: Practitioner
Expand All @@ -252,24 +252,24 @@ Id: clinician-user-index
Title: "Clinician User Index"
Description: "The user index for the person who is requesting or performing the service request."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Practitioner"
* ^context[+].type = #element
* ^context[=].expression = "Practitioner"

Extension: ResultStatusIndex
Id: result-status-index
Title: "Result Status Index"
Description: "The result status index."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Task"
* ^context[+].type = #element
* ^context[=].expression = "Task"

Extension: SampleRejectedIndex
Id: sample-rejected-index
Title: "Sample Rejected Index"
Description: "The sample rejection index."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Task"
* ^context[+].type = #element
* ^context[=].expression = "Task"

Profile: HIVLabTask
Parent: Task
Expand Down Expand Up @@ -464,24 +464,24 @@ Id: task-reviewed-by-user-index
Title: "HIV Lab Task Reviewed By"
Description: "The user index for the person who reviewed the HIV lab task."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "ActivityDefinition.reviewer"
* ^context[+].type = #element
* ^context[=].expression = "ActivityDefinition.reviewer"

Extension: LabTaskApprovedBy
Id: task-approved-by-user-index
Title: "HIV Lab Task Approved By"
Description: "The user index for the person who approved the HIV lab task."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "ActivityDefinition.endorser"
* ^context[+].type = #element
* ^context[=].expression = "ActivityDefinition.endorser"

Extension: ResultRevisedBy
Id: revised-by-user-index
Title: "HIV Viral Load Result Revised By"
Description: "The user index for the person who reviewed the viral load result."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "ActivityDefinition"
* ^context[+].type = #element
* ^context[=].expression = "ActivityDefinition"

Profile: ARVAdherence
Parent: Observation
Expand Down Expand Up @@ -576,16 +576,16 @@ Id: performing-organization-province-index
Title: "Performing Organization Province"
Description: "The province index for the performing organization."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Organization"
* ^context[+].type = #element
* ^context[=].expression = "Organization"

Extension: PerformingOrganizationDistrictIndex
Id: performing-organization-district-index
Title: "Performing Organization District"
Description: "The district index for the performing organization."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Organization"
* ^context[+].type = #element
* ^context[=].expression = "Organization"

Profile: RequestingOrganization
Parent: Organization
Expand Down Expand Up @@ -635,8 +635,8 @@ Id: funding-source-index
Title: "Funding Organization"
Description: "The index for the funding organization."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Organization"
* ^context[+].type = #element
* ^context[=].expression = "Organization"

Profile: ImplementingPartnerOrganization
Parent: Organization
Expand Down Expand Up @@ -665,16 +665,16 @@ Id: implementing-partner-index
Title: "Implementing Partner Organization"
Description: "The index for the implementing partner organization."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "Organization"
* ^context[+].type = #element
* ^context[=].expression = "Organization"

Extension: TestedByIndex
Id: tested-by-user-index
Title: "HIV Viral Load Result Tested By"
Description: "The user index for the person who tested the viral load specimen."
* value[x] only integer
* ^context[0].type = #element
* ^context[0].expression = "DiagnosticReport"
* ^context[+].type = #element
* ^context[=].expression = "DiagnosticReport"

Profile: ReceiveSMSMessages
Parent: Consent
Expand Down

0 comments on commit 5c7beb0

Please sign in to comment.