Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed implementation guide QA issues #13

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 0 additions & 61 deletions input/fsh/CodingSystem.fsh

This file was deleted.

10 changes: 5 additions & 5 deletions input/fsh/OpenELISDiagnosticReport.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Description: "DiagnosticReport resource created by a LIS"
* identifier ^slicing.discriminator.path = "system"
* identifier ^slicing.rules = #open
* identifier contains uuid 1..1
* identifier[uuid].system = "http://openelis-global.org/analysisResult_uuid"
* status from OpenElisDiagnosticReportStatusVs
* identifier[uuid].system = "https://demo.openelis-global.org/analysisResult_uuid"
* status 1..1
* code.coding 1..*
* basedOn 1..1
* basedOn only Reference(OpenELISServiceRequest)
Expand All @@ -25,12 +25,12 @@ InstanceOf: OpenELISDiagnosticReport
Usage: #example
Title: "OpenElis DiagnosticReport Example"
Description: "OpenElis DiagnosticReport Example Resource"
* identifier[uuid].system = "http://openelis-global.org/analysisResult_uuid"
* identifier[uuid].system = "https://demo.openelis-global.org/analysisResult_uuid"
* identifier[uuid].value = "f3c9cf5e-7d41-4a7d-a77b-8c0f4323a0bd"
* status = DiagnosticReportStatusCodeSystem#final
* status = #final
* code.coding[0].system = "http://loinc.org"
* code.coding[0].code = #58410-2
* code.coding[0].display = "Complete blood count (hemogram) panel - Blood by Automated count"
* code.coding[0].display = "CBC panel - Blood by Automated count"
* basedOn = Reference(OpenElisServiceRequestExample)
* specimen = Reference(OpenElisSpecimenExample)
* subject = Reference(example-openelis-patient)
Expand Down
10 changes: 6 additions & 4 deletions input/fsh/OpenELISObservation.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@ Parent: Observation
Id: open-elis-observation
Title: "OpenELIS Observation"
Description: "A Observation Resource used for FHIR Exchange"
* identifier 1..*
* identifier 0..*
* identifier ^slicing.discriminator.type = #value
* identifier ^slicing.discriminator.path = "system"
* identifier ^slicing.rules = #open
* identifier contains uuid 1..1
* identifier[uuid] ^sliceName = "uuid"
* identifier[uuid].system = "https://demo.openelis-global.org/result_uuid"
* status 1..1
* code 1..1
* status from OpenELISObservationVS
* status 1..1
* value[x] 1..1
* basedOn 1..1
* basedOn only Reference(OpenELISServiceRequest)
Expand Down Expand Up @@ -41,9 +43,9 @@ InstanceOf: OpenELISObservation
Usage: #example
Title: "OpenElis Observation Example"
Description: "OpenElis Observation Example Resource"
* identifier[uuid].system = "http://openelis-global.org/result_uuid"
* identifier[uuid].system = "https://demo.openelis-global.org/result_uuid"
* identifier[uuid].value = "158999b0-b295-4dfd-a5b0-81ed58733b5f"
* status = ObsStatusCS#final
* status = #final
* valueQuantity.value = 55
* valueQuantity.unit = "UI/L"
* basedOn = Reference(OpenElisServiceRequestExample)
Expand Down
16 changes: 8 additions & 8 deletions input/fsh/OpenELISOrganization.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ Description: "A Organization Resource used for FHIR Exchange"
* identifier ^slicing.discriminator.path = "system"
* identifier ^slicing.rules = #open
* identifier contains cliaNum 1..1 and shortName 1..1 and code 1..1 and uuid 1..1
* identifier[cliaNum].system = "http://openelis-global.org/org_cliaNum"
* identifier[shortName].system = "http://openelis-global.org/org_shortName"
* identifier[code].system = "http://openelis-global.org/org_code"
* identifier[uuid].system = "http://openelis-global.org/org_uuid"
* identifier[cliaNum].system = "https://demo.openelis-global.org/org_cliaNum"
* identifier[shortName].system = "https://demo.openelis-global.org/org_shortName"
* identifier[code].system = "https://demo.openelis-global.org/org_code"
* identifier[uuid].system = "https://demo.openelis-global.org/org_uuid"
* name 1..1
* address 1..1
* type 1..*
Expand All @@ -22,13 +22,13 @@ Usage: #example
Title: "OpenELIS Organization Example"
Description: "OpenELIS Organization Example"
* id = "bc8479a5-b34b-4578-9d38-a351bc92e614"
* identifier[cliaNum].system = "http://openelis-global.org/org_cliaNum"
* identifier[cliaNum].system = "https://demo.openelis-global.org/org_cliaNum"
* identifier[cliaNum].value = "DEPT"
* identifier[shortName].system = "http://openelis-global.org/org_shortName"
* identifier[shortName].system = "https://demo.openelis-global.org/org_shortName"
* identifier[shortName].value = "EID ICAP"
* identifier[code].system = "http://openelis-global.org/org_code"
* identifier[code].system = "https://demo.openelis-global.org/org_code"
* identifier[code].value = "UG1001"
* identifier[uuid].system = "http://openelis-global.org/org_uuid"
* identifier[uuid].system = "https://demo.openelis-global.org/org_uuid"
* identifier[uuid].value = "a1313f63-29b4-498d-ba12-0e960c683ec0"
* name = "Minity Of Health"
* address[+].line = "KING"
Expand Down
1 change: 1 addition & 0 deletions input/fsh/OpenELISPractioner.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ Description: "OpenELIS Practitioner Example"
* name.family = "Mutesasira"
* name.given = "Moses"
* telecom[0].value = "+256-83434121"
* telecom[0].system = #phone


Mapping: OpenELISPractitionerMapping
Expand Down
27 changes: 13 additions & 14 deletions input/fsh/OpenELISServiceRequest.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@ Description: "OpenELIS service request"
* identifier ^slicing.discriminator.path = "system"
* identifier ^slicing.rules = #open
* identifier contains uuid 1..1 and labNo 1..1
* identifier[uuid].system = "http://openelis-global.org/analysis_uuid"
* identifier[labNo].system = "http://openelis-global.org/samp_labNo"
* intent from OpenElisServiceRequestIntentVs
* status from OpenElisServiceRequestStatusVs
* identifier[uuid].system = "https://demo.openelis-global.org/analysis_uuid"
* identifier[labNo].system = "https://demo.openelis-global.org/samp_labNo"
* intent 1..1
* status 1..1
* code 1..1
* code.coding 1..*
* subject only Reference(OpenELISPatient)
* encounter only Reference(Encounter)
* locationReference 1..1
* locationReference 0..*
* locationReference only Reference(Location)
* priority from OpenElisServiceRequestIntentVs
* priority 1..1
* category 0..1
* authoredOn 0..1
* note 0..1
Expand All @@ -34,19 +33,19 @@ InstanceOf: OpenELISServiceRequest
Usage: #example
Title: "OpenElis Service Request Example"
Description: "OpenElis ServiceRequest Example Resource"
* identifier[uuid].system = "http://openelis-global.org/analysis_uuid"
* identifier[uuid].system = "https://demo.openelis-global.org/analysis_uuid"
* identifier[uuid].value = "0a65ab46-179e-4506-9fa3-09d342268576"
* identifier[labNo].system = "http://openelis-global.org/samp_labNo"
* identifier[labNo].system = "https://demo.openelis-global.org/samp_labNo"
* identifier[labNo].value = "TESTA230000000001749"
* intent = TaskIntentCodeSystem#original-order
* status = ServiceRequestStatusCodeSystem#active
* intent = #original-order
* status = #active
* specimen = Reference(OpenElisSpecimenExample)
* code.coding[0].system = "http://loinc.org"
* code.coding[0].code = #24627-2
* subject = Reference(example-openelis-patient)
* locationReference = Reference(Location)
* priority = ServiceRequestPriorityCodeSystem#routine
* category[0].coding.system = "http://openelis-global.org/sample_program"
* locationReference = Reference(LocationExample)
* priority = #routine
// * category[0].coding.system = "https://demo.openelis-global.org/sample_program"
* authoredOn = 2023-02-03
* requester = Reference(OpenELISPractitionerExample)

Expand Down
15 changes: 15 additions & 0 deletions input/fsh/OpenElisLocation.fsh
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Profile: OpenELISLocation
Parent: Location
Id: open-elis-location
Title: "OpenELIS Facility Location"
Description: "A Location Resource used for FHIR Exchange"
* name 0..1
* description 0..1

Instance: LocationExample
InstanceOf: OpenELISLocation
Usage: #example
Title: "Location Example"
Description: "Health Facility Location example resource"
* name = "Outpatient Clinic"
* description = "Outpatient Clinic"
20 changes: 10 additions & 10 deletions input/fsh/OpenElisPatient.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ Description: "A patient used for OpenELIS FHIR Exchange"
* identifier ^slicing.discriminator.path = "system"
* identifier ^slicing.rules = #open
* identifier contains nationalid 1..1 and subjectnumber 1..1 and stnumber 1..1 and guid 1..1 and uuid 1..1
* identifier[nationalid].system = "http://openelis-global.org/pat_nationalId"
* identifier[subjectnumber].system = "http://openelis-global.org/pat_subjectNumber"
* identifier[stnumber].system = "http://openelis-global.org/pat_stNumber"
* identifier[guid].system = "http://openelis-global.org/pat_guid"
* identifier[uuid].system = "http://openelis-global.org/pat_uuid"
* identifier[nationalid].system = "https://demo.openelis-global.org/pat_nationalId"
* identifier[subjectnumber].system = "https://demo.openelis-global.org/pat_subjectNumber"
* identifier[stnumber].system = "https://demo.openelis-global.org/pat_stNumber"
* identifier[guid].system = "https://demo.openelis-global.org/pat_guid"
* identifier[uuid].system = "https://demo.openelis-global.org/pat_uuid"
* name 1..1
* gender 1..1
* birthDate 1..1
Expand All @@ -26,15 +26,15 @@ Usage: #example
Description: "OpenELIS Patient Example"
Title: "OpenELIS Patient Example Resource"
* id = "329f09da-0fc9-419d-9575-ace68954426A"
* identifier[nationalid].system = "http://openelis-global.org/pat_nationalId"
* identifier[nationalid].system = "https://demo.openelis-global.org/pat_nationalId"
* identifier[nationalid].value = "NA121212"
* identifier[subjectnumber].system = "http://openelis-global.org/pat_subjectNumber"
* identifier[subjectnumber].system = "https://demo.openelis-global.org/pat_subjectNumber"
* identifier[subjectnumber].value = "121213"
* identifier[stnumber].system = "http://openelis-global.org/pat_stNumber"
* identifier[stnumber].system = "https://demo.openelis-global.org/pat_stNumber"
* identifier[stnumber].value = "121214"
* identifier[guid].system = "http://openelis-global.org/pat_guid"
* identifier[guid].system = "https://demo.openelis-global.org/pat_guid"
* identifier[guid].value = "329f09da-0fc9-419d-9575-ace689544229"
* identifier[uuid].system = "http://openelis-global.org/pat_uuid"
* identifier[uuid].system = "https://demo.openelis-global.org/pat_uuid"
* identifier[uuid].value = "329f09da-0fc9-419d-9575-ace689544269"
* birthDate = "1988-03-02"
* gender = #male
Expand Down
12 changes: 6 additions & 6 deletions input/fsh/OpenElisSpecimen.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ Description: "A Specimen Resource used for FHIR Exchange"
* identifier ^slicing.discriminator.path = "system"
* identifier ^slicing.rules = #open
* identifier contains uuid 1..1
* identifier[uuid].system = "http://openelis-global.org/sampleItem_uuid"
* identifier[uuid].system = "https://demo.openelis-global.org/sampleItem_uuid"
* accessionIdentifier 1..1
* type 1..1
* status 1..1
* status from OpenElisSpecimenStatusVS
* status 1..1
* receivedTime 1..1
* collection 1..1
* collection.collectedDateTime 1..1
Expand Down Expand Up @@ -42,13 +42,13 @@ InstanceOf: OpenElisSpecimen
Usage: #example
Title: "OpenElis Specimen Example"
Description: "OpenElis Specimen Example Resource"
* accessionIdentifier[0].system = "http://openelis-global.org/sampleItem_labNo"
* accessionIdentifier[0].system = "https://demo.openelis-global.org/sampleItem_labNo"
* accessionIdentifier[0].value = "TESTA230000000001751"
* identifier[uuid].system = "http://openelis-global.org/sampleItem_uuid"
* identifier[uuid].system = "https://demo.openelis-global.org/sampleItem_uuid"
* identifier[uuid].value = "9df49e2d-57f7-4e7b-abb1-54d0a1933253"
* type.coding.system = "http://openelis-global.org/sampleType"
* type.coding.system = "http://loinc.org"
* type.coding.display = "Plasma"
* status = SpecimenStatusCodeSystem#available
* status = #available
* receivedTime = "2023-03-03T07:03:00Z"
* collection.collectedDateTime = 2023-02-03
* request = Reference(OpenElisServiceRequestExample)
Expand Down
8 changes: 4 additions & 4 deletions input/fsh/OpenElisTask.fsh
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ Description: "A Task resource for tracking order state"
* encounter only Reference(Encounter)
* owner only Reference(Practitioner or Organization or HealthcareService)
* authoredOn 1..1
* status from OpenELISTaskStatusVS
* intent from OpenELISTaskIntentVS
* status 1..1
* intent 1..1
* output.type.text = "DiagnosticReport"
* output.value[x] only Reference(OpenELISDiagnosticReport)

Expand All @@ -37,8 +37,8 @@ Usage: #example
Title: "OpenElis Task Example"
Description: "OpenElis Task Example Resource"
* id = "49ef249a-3a8b-49e3-9e16-7e56e92d0c77"
* intent = TaskIntentCodeSystem#order
* status = TaskStatusCodeSystem#in-progress
* intent = #order
* status = #in-progress
* basedOn = Reference(OpenElisServiceRequestExample)
* for = Reference(example-openelis-patient)
* owner = Reference(OpenELISPractitionerExample)
Expand Down
57 changes: 0 additions & 57 deletions input/fsh/ValueSet.fsh

This file was deleted.

Binary file added local-template/package/.index.db
Binary file not shown.
Binary file added local-template/package/content/.index.db
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added local-template/package/includes/.index.db
Binary file not shown.
10 changes: 5 additions & 5 deletions sushi-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ name: OpenELISImplementationGuide
title: OpenELIS GLOBAL2 Implementation Guide
status: draft
publisher: I-TECH-UW
contact:
- name: I-TECH-UW
telecom:
- system: url
value: www.github.com/i-tech-uw
# contact:
# - name: I-TECH-UW
# telecom:
# - system: url
# value: https://i-tech-uw.github.io/openelis-global2-fhir-ig
description: An Implementation Guide covering the OpenELIS GLOBAL2 implementation of FHIR
license: CC-BY-SA-4.0
fhirVersion: 4.0.1
Expand Down
Loading