diff --git a/input/fsh/CodingSystem.fsh b/input/fsh/CodingSystem.fsh deleted file mode 100644 index 233723e..0000000 --- a/input/fsh/CodingSystem.fsh +++ /dev/null @@ -1,61 +0,0 @@ -CodeSystem: ObsStatusCS -Id: obs-status-cs -Title: "ObservationStatus" -Description: "Observation Status Code system" -* ^url = https://i-tech-uw.github.io/openelis-global2-fhir-ig/codesystem-observation-status -* #unknown "Unknown" "The authoring/source system does not know which of the status values currently applies for this observation. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring/source system does not know which." -* #final "Final" "The observation is complete and there are no further actions needed. Additional information such \"released\", \"signed\", etc would be represented using [Provenance](provenance.html) which provides not only the act but also the actors and dates and other related data. These act states would be associated with an observation status of `preliminary` until they are all completed and then a status of `final` would be applied." -* #preliminary "Preliminary" "This is an initial or interim observation: data may be incomplete or unverified." - -CodeSystem: TaskStatusCodeSystem -Id: task-status-code-system -Title: "Task Status" -Description: "Task Status Code System" -* ^url = https://i-tech-uw.github.io/openelis-global2-fhir-ig/codesystem-task-status -* #ready "Ready" "The task is ready to be performed, but no action has yet been taken" -* #in-progress "In Pregress" "The task has been started but is not yet complete." -* #completed "Completed" "The task has been completed." - -CodeSystem: TaskIntentCodeSystem -Id: task-intent-code-system -Title: "Task Intent" -Description: "Task Intent Code System" -* ^url = https://i-tech-uw.github.io/openelis-global2-fhir-ig/codesystem-task-intent -* #order "Order" "The request represents a request/demand and authorization for action by a Practitioner." -* #original-order "Original-Order" "The request represents an original authorization for action." - - -CodeSystem: ServiceRequestStatusCodeSystem -Id: service-request-status-code-system -Title: "Service Request Status" -Description: "ServiceRequest Status Code System" -* ^url = https://i-tech-uw.github.io/openelis-global2-fhir-ig/codesystem-service-request-status -* #active "Active" "The request is in force and ready to be acted upon." -* #completed "Completed" " The activity described by the request has been fully performed. No further activity will occur." -* #revoked "Revoked" "The request (and any implicit authorization to act) has been terminated prior to the known full completion of the intended actions. No further activity should occur." - -CodeSystem: ServiceRequestPriorityCodeSystem -Id: service-request-priority-code-system -Title: "Service Request priority" -Description: "ServiceRequest Priority Code System" -* ^url = https://i-tech-uw.github.io/openelis-global2-fhir-ig/codesystem-service-request-priority -* #routine "Routine" "The request has normal priority." - - -CodeSystem: DiagnosticReportStatusCodeSystem -Id: diagnostic-report--status-code-system -Title: "Diagnostic Report Status" -Description: "DiagnosticReport Status Code System" -* ^url = https://i-tech-uw.github.io/openelis-global2-fhir-ig/codesystem-diagnostic-report-status -* #final "Final" "The report is complete and verified by an authorized person." -* #preliminary "Preliminary" "Verified early results are available, but not all results are final." -* #registered "Registered" "The existence of the report is registered, but there is nothing yet available." -* #unknown "Unknown" "The authoring/source system does not know which of the status values currently applies for this observation. Note: This concept is not to be used for \"other\" - one of the listed statuses is presumed to apply, but the authoring/source system does not know which." - - -CodeSystem: SpecimenStatusCodeSystem -Id: specimen-status-code-system -Title: "Specimen Status" -Description: "Specimen Status Code System" -* ^url = https://i-tech-uw.github.io/openelis-global2-fhir-ig/codesystem-specimen-status -* #available "Available" "The physical specimen is present and in good condition." diff --git a/input/fsh/OpenELISDiagnosticReport.fsh b/input/fsh/OpenELISDiagnosticReport.fsh index 89b0666..066ca40 100644 --- a/input/fsh/OpenELISDiagnosticReport.fsh +++ b/input/fsh/OpenELISDiagnosticReport.fsh @@ -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) @@ -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) diff --git a/input/fsh/OpenELISObservation.fsh b/input/fsh/OpenELISObservation.fsh index 6df258e..a30254f 100644 --- a/input/fsh/OpenELISObservation.fsh +++ b/input/fsh/OpenELISObservation.fsh @@ -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) @@ -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) diff --git a/input/fsh/OpenELISOrganization.fsh b/input/fsh/OpenELISOrganization.fsh index 0a1a12c..8b1bfad 100644 --- a/input/fsh/OpenELISOrganization.fsh +++ b/input/fsh/OpenELISOrganization.fsh @@ -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..* @@ -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" diff --git a/input/fsh/OpenELISPractioner.fsh b/input/fsh/OpenELISPractioner.fsh index 0926963..bde1c32 100644 --- a/input/fsh/OpenELISPractioner.fsh +++ b/input/fsh/OpenELISPractioner.fsh @@ -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 diff --git a/input/fsh/OpenELISServiceRequest.fsh b/input/fsh/OpenELISServiceRequest.fsh index e10148f..10d7b69 100644 --- a/input/fsh/OpenELISServiceRequest.fsh +++ b/input/fsh/OpenELISServiceRequest.fsh @@ -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 @@ -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) diff --git a/input/fsh/OpenElisLocation.fsh b/input/fsh/OpenElisLocation.fsh new file mode 100644 index 0000000..f54973d --- /dev/null +++ b/input/fsh/OpenElisLocation.fsh @@ -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" diff --git a/input/fsh/OpenElisPatient.fsh b/input/fsh/OpenElisPatient.fsh index a949357..f600111 100644 --- a/input/fsh/OpenElisPatient.fsh +++ b/input/fsh/OpenElisPatient.fsh @@ -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 @@ -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 diff --git a/input/fsh/OpenElisSpecimen.fsh b/input/fsh/OpenElisSpecimen.fsh index d64df25..4665570 100644 --- a/input/fsh/OpenElisSpecimen.fsh +++ b/input/fsh/OpenElisSpecimen.fsh @@ -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 @@ -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) diff --git a/input/fsh/OpenElisTask.fsh b/input/fsh/OpenElisTask.fsh index 4e0f848..59a6a95 100644 --- a/input/fsh/OpenElisTask.fsh +++ b/input/fsh/OpenElisTask.fsh @@ -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) @@ -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) diff --git a/input/fsh/ValueSet.fsh b/input/fsh/ValueSet.fsh deleted file mode 100644 index e0b51b2..0000000 --- a/input/fsh/ValueSet.fsh +++ /dev/null @@ -1,57 +0,0 @@ - -ValueSet: OpenELISTaskStatusVS -Title: "Task Status Valueset" -Description: "Task Status Valueset" -* TaskStatusCodeSystem#ready -* TaskStatusCodeSystem#in-progress -* TaskStatusCodeSystem#completed "The task has been completed." - -ValueSet: OpenELISTaskIntentVS -Title: "Task Intent Valueset" -Description: "Task Intent Valueset" -* TaskIntentCodeSystem#order -* TaskIntentCodeSystem#original-order - - -ValueSet: OpenELISObservationVS -Title: "Observation Intent Valueset" -Description: "Observation Intent Valueset" -* ObsStatusCS#unknown -* ObsStatusCS#final -* ObsStatusCS#preliminary - -ValueSet: OpenElisServiceRequestIntentVs -Id: open-elis-service-request-intent-vs -Title: "Service Request Intent Valueset" -Description: "OpenElis Service Request Intent Valueset" -* TaskIntentCodeSystem#order -* TaskIntentCodeSystem#original-order - -ValueSet: OpenElisServiceRequestStatusVs -Id: open-elis-service-request-status-vs -Title: "Service Request Status Valueset" -Description: "OpenElis Service Request Status Valueset" -* ServiceRequestStatusCodeSystem#active -* ServiceRequestStatusCodeSystem#completed -* ServiceRequestStatusCodeSystem#revoked - -ValueSet: OpenElisServiceRequestPriorityVs -Id: open-elis-service-request-priority-vs -Title: "Service Request priority Valueset" -Description: "OpenElis Service Request Priority Valueset" -* ServiceRequestPriorityCodeSystem#routine - -ValueSet: OpenElisDiagnosticReportStatusVs -Id: open-elis-diagnostic-report--status-vs -Title: "Diagnostic Report Status Valueset" -Description: "OpenElis Diagnostic Report Status Valueset" -* DiagnosticReportStatusCodeSystem#final -* DiagnosticReportStatusCodeSystem#preliminary -* DiagnosticReportStatusCodeSystem#registered -* DiagnosticReportStatusCodeSystem#unknown - - -ValueSet: OpenElisSpecimenStatusVS -Title: "Specimen status Valueset" -Description: "Specimen status Valueset" -* SpecimenStatusCodeSystem#available \ No newline at end of file diff --git a/local-template/package/.index.db b/local-template/package/.index.db new file mode 100644 index 0000000..504ff47 Binary files /dev/null and b/local-template/package/.index.db differ diff --git a/local-template/package/content/.index.db b/local-template/package/content/.index.db new file mode 100644 index 0000000..504ff47 Binary files /dev/null and b/local-template/package/content/.index.db differ diff --git a/local-template/package/content/assets/.index.db b/local-template/package/content/assets/.index.db new file mode 100644 index 0000000..504ff47 Binary files /dev/null and b/local-template/package/content/assets/.index.db differ diff --git a/local-template/package/content/assets/css/.index.db b/local-template/package/content/assets/css/.index.db new file mode 100644 index 0000000..504ff47 Binary files /dev/null and b/local-template/package/content/assets/css/.index.db differ diff --git a/local-template/package/content/assets/images/.index.db b/local-template/package/content/assets/images/.index.db new file mode 100644 index 0000000..504ff47 Binary files /dev/null and b/local-template/package/content/assets/images/.index.db differ diff --git a/local-template/package/includes/.index.db b/local-template/package/includes/.index.db new file mode 100644 index 0000000..504ff47 Binary files /dev/null and b/local-template/package/includes/.index.db differ diff --git a/sushi-config.yaml b/sushi-config.yaml index 6c361f3..2b45b5b 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -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