From 79fcd11cdb6ccfb51ab9a2fdd5b483c7f047e819 Mon Sep 17 00:00:00 2001 From: rmrlangford Date: Sun, 23 Jul 2023 11:27:03 +0200 Subject: [PATCH] updated --- input/fsh/examples.fsh | 21 ++++++++----------- input/fsh/hiv-bundle-submit-emr.fsh | 10 --------- input/fsh/hiv-bundle-submit-lab-order.fsh | 7 ++++++- input/fsh/hiv-bundle-submit-lab-rejection.fsh | 7 ++++++- input/fsh/hiv-bundle-submit-lab-result.fsh | 12 ++++++++++- input/fsh/profiles.fsh | 4 ++-- 6 files changed, 34 insertions(+), 27 deletions(-) diff --git a/input/fsh/examples.fsh b/input/fsh/examples.fsh index ec71fb44fc..bff159ae7d 100644 --- a/input/fsh/examples.fsh +++ b/input/fsh/examples.fsh @@ -172,8 +172,7 @@ Description: "Lab Order example" * identifier[FILL].type.coding.display = "Filler Identifier" * instantiatesCanonical = Canonical(LabOrderTaskActivityExample) * basedOn[0] = Reference(HIVServiceRequestExample) -* basedOn[1] = Reference(SampleDisptachedToLabTaskExample) -* basedOn[2] = Reference(ResultDisptachedTaskExample) +* basedOn[1] = Reference(SampleDispatchedToLabExample) * status = #requested * intent = #order * executionPeriod.start = "2022-07-28" @@ -196,8 +195,8 @@ Description: "Lab Result Task example" * identifier[FILL].type.text = "Lab order number" * instantiatesCanonical = Canonical(LabOrderTaskActivityExample) * basedOn[0] = Reference(HIVServiceRequestExample) -* basedOn[1] = Reference(SampleDisptachedToLabTaskExample) -* basedOn[2] = Reference(ResultDisptachedTaskExample) +* basedOn[1] = Reference(SampleDispatchedToLabExample) +* basedOn[2] = Reference(ResultDispatchedToRequestingFacilityExample) * status = #completed * intent = #order * executionPeriod.end = "2022-07-30" @@ -223,8 +222,7 @@ Description: "HIV Lab Order Cancellation Task example" * identifier[FILL].type.coding.display = "Filler Identifier" * instantiatesCanonical = Canonical(LabOrderTaskActivityExample) * basedOn[0] = Reference(HIVServiceRequestExample) -* basedOn[1] = Reference(SampleDisptachedToLabTaskExample) -* basedOn[2] = Reference(ResultDisptachedTaskExample) +* basedOn[1] = Reference(SampleDispatchedToLabExample) * status = #cancelled * statusReason.concept = $SCT#281264009 * statusReason.concept.text = "Reason For Canceling/Rejecting the Lab Order" @@ -249,8 +247,7 @@ Description: "HIV Lab Order Rejection Task example" * identifier[FILL].type.coding.display = "Filler Identifier" * instantiatesCanonical = Canonical(LabOrderTaskActivityExample) * basedOn[0] = Reference(HIVServiceRequestExample) -* basedOn[1] = Reference(SampleDisptachedToLabTaskExample) -* basedOn[2] = Reference(ResultDisptachedTaskExample) +* basedOn[1] = Reference(SampleDispatchedToLabExample) * status = #rejected * statusReason.concept = $SCT#123840003 * statusReason.concept.text = "Reason For Canceling/Rejecting the Lab Order" @@ -420,8 +417,8 @@ Description: "HIV lab order task activity." * approvalDate = "2023-01-01" * specimenRequirement = Canonical(SpecimenConservationExample) -Instance: SampleDisptachedToLabTaskExample -InstanceOf: SampleDisptachedToLabTask +Instance: SampleDispatchedToLabExample +InstanceOf: SampleDispatchedToLab Usage: #example Title: "Sample Dispatched to Lab Task" Description: "Sample dispatched to lab task." @@ -535,8 +532,8 @@ Description: "Repeat Viral Load Suppression example" * note.time = "2015-02-07T13:28:17-05:00" * performer = Reference(HIVOrganizationExample) -Instance: ResultDisptachedTaskExample -InstanceOf: ResultDisptachedTask +Instance: ResultDispatchedToRequestingFacilityExample +InstanceOf: ResultDispatchedToRequestingFacility Usage: #example Title: "Result Dispatched" Description: "Result Dispatched" diff --git a/input/fsh/hiv-bundle-submit-emr.fsh b/input/fsh/hiv-bundle-submit-emr.fsh index fa92add191..a8f2f7994b 100644 --- a/input/fsh/hiv-bundle-submit-emr.fsh +++ b/input/fsh/hiv-bundle-submit-emr.fsh @@ -85,16 +85,6 @@ Description: "HIV Submit EMR Bundle Example" * entry[=].request.method = #PUT * entry[=].request.url = "Device/TestingPlatformExample" -* entry[+].fullUrl = "Transport/SampleDisptachedToLabTaskExample" -* entry[=].resource = SampleDisptachedToLabTaskExample -* entry[=].request.method = #PUT -* entry[=].request.url = "Transport/SampleDisptachedToLabTaskExample" - -* entry[+].fullUrl = "Transport/ResultDisptachedTaskExample" -* entry[=].resource = ResultDisptachedTaskExample -* entry[=].request.method = #PUT -* entry[=].request.url = "Transport/ResultDisptachedTaskExample" - * entry[+].fullUrl = "Observation/HIVTestResultAbsoluteDecimalExample" * entry[=].resource = HIVTestResultAbsoluteDecimalExample * entry[=].request.method = #PUT diff --git a/input/fsh/hiv-bundle-submit-lab-order.fsh b/input/fsh/hiv-bundle-submit-lab-order.fsh index 3eed8b2570..5ccd10bb15 100644 --- a/input/fsh/hiv-bundle-submit-lab-order.fsh +++ b/input/fsh/hiv-bundle-submit-lab-order.fsh @@ -37,4 +37,9 @@ Description: "HIV Submit Lab Order Bundle Example" * entry[+].fullUrl = "SpecimenDefinition/SpecimenConservationExample" * entry[=].resource = SpecimenConservationExample * entry[=].request.method = #PUT -* entry[=].request.url = "SpecimenDefinition/SpecimenConservationExample" \ No newline at end of file +* entry[=].request.url = "SpecimenDefinition/SpecimenConservationExample" + +* entry[+].fullUrl = "Transport/SampleDispatchedToLabExample" +* entry[=].resource = SampleDispatchedToLabExample +* entry[=].request.method = #PUT +* entry[=].request.url = "Transport/SampleDispatchedToLabExample" \ No newline at end of file diff --git a/input/fsh/hiv-bundle-submit-lab-rejection.fsh b/input/fsh/hiv-bundle-submit-lab-rejection.fsh index f86fecd796..060a6e7368 100644 --- a/input/fsh/hiv-bundle-submit-lab-rejection.fsh +++ b/input/fsh/hiv-bundle-submit-lab-rejection.fsh @@ -7,4 +7,9 @@ Description: "HIV Submit Lab Rejection Bundle Example" * entry[+].fullUrl = "Task/HIVLabOrderRejectionTaskExample" * entry[=].resource = HIVLabOrderRejectionTaskExample * entry[=].request.method = #PUT -* entry[=].request.url = "Task/HIVLabOrderRejectionTaskExample" \ No newline at end of file +* entry[=].request.url = "Task/HIVLabOrderRejectionTaskExample" + +* entry[+].fullUrl = "Transport/SampleDispatchedToLabExample" +* entry[=].resource = SampleDispatchedToLabExample +* entry[=].request.method = #PUT +* entry[=].request.url = "Transport/SampleDispatchedToLabExample" \ No newline at end of file diff --git a/input/fsh/hiv-bundle-submit-lab-result.fsh b/input/fsh/hiv-bundle-submit-lab-result.fsh index 115aae52de..719ec25933 100644 --- a/input/fsh/hiv-bundle-submit-lab-result.fsh +++ b/input/fsh/hiv-bundle-submit-lab-result.fsh @@ -37,4 +37,14 @@ Description: "HIV Submit Lab Result Bundle Example" * entry[+].fullUrl = "ActivityDefinition/LabOrderTaskActivityExample" * entry[=].resource = LabOrderTaskActivityExample * entry[=].request.method = #PUT -* entry[=].request.url = "ActivityDefinition/LabOrderTaskActivityExample" \ No newline at end of file +* entry[=].request.url = "ActivityDefinition/LabOrderTaskActivityExample" + +* entry[+].fullUrl = "Transport/SampleDispatchedToLabExample" +* entry[=].resource = SampleDispatchedToLabExample +* entry[=].request.method = #PUT +* entry[=].request.url = "Transport/SampleDispatchedToLabExample" + +* entry[+].fullUrl = "Transport/ResultDispatchedToRequestingFacilityExample" +* entry[=].resource = ResultDispatchedToRequestingFacilityExample +* entry[=].request.method = #PUT +* entry[=].request.url = "Transport/ResultDispatchedToRequestingFacilityExample" \ No newline at end of file diff --git a/input/fsh/profiles.fsh b/input/fsh/profiles.fsh index 0e1bdbabf7..1825fd0b7a 100644 --- a/input/fsh/profiles.fsh +++ b/input/fsh/profiles.fsh @@ -455,7 +455,7 @@ Description: "Specimen conservation information." * typeTested.handling.maxDuration 1..1 * typeTested.handling.instruction 0..1 MS -Profile: SampleDisptachedToLabTask +Profile: SampleDispatchedToLab Parent: Transport Id: sample-dispatched-to-lab Title: "Sample Dispatched to Lab Task" @@ -627,7 +627,7 @@ Description: "Repeat lab results." * performer 1..* * note 0..* MS -Profile: ResultDisptachedTask +Profile: ResultDispatchedToRequestingFacility Parent: Transport Id: result-dispatched-to-facility Title: "Result Dispatched"