Updated

input/fsh/examples.fsh

@@ -410,7 +410,7 @@ Instance: LabOrderTaskActivityExample
 InstanceOf: LabOrderTaskActivity
 Usage: #example
 Title: "HIV Lab Order Activity Definition"
-Description: "Represents more specific information regarding the task’s lab order request."
+Description: "Represents more specific information regarding the task’s lab order request INCLUDING specimenRequirement Reference."
 * extension[RevisedBy].valueInteger = 2
 * status = #active
 * reviewer.name = "Someone"
@@ -421,6 +421,20 @@ Description: "Represents more specific information regarding the task’s lab or
 * approvalDate = "2023-01-01"
 * specimenRequirement = Canonical(SpecimenConservationExample)
 
+Instance: LabOrderResultTaskActivityExample
+InstanceOf: LabOrderTaskActivity
+Usage: #example
+Title: "HIV Lab Order Activity Definition"
+Description: "Represents more specific information regarding the task’s lab order request EXCLUDING specimenRequirement Reference."
+* extension[RevisedBy].valueInteger = 2
+* status = #active
+* reviewer.name = "Someone"
+* lastReviewDate = "2023-01-01"
+* editor.name = "Someone"
+* date = "2023-01-01"
+* endorser.name = "Someone"
+* approvalDate = "2023-01-01"
+
 Instance: SampleDispatchedToLabExample
 InstanceOf: SampleDispatchedToLab
 Usage: #example

input/fsh/profiles.fsh

@@ -409,7 +409,7 @@ Description: "Represents more specific information regarding the task’s lab or
 * endorser 0..* MS
 * endorser.name 1..1
 * approvalDate 0..1 MS
-* specimenRequirement 1..*
+* specimenRequirement 0..* MS
 * extension contains ResultRevisedBy named RevisedBy 0..1 MS
 
 Extension: ResultRevisedBy

input/fsh/vlsms-vl-result.fsh

@@ -0,0 +1,176 @@
+Instance: VLSMSVLResult
+InstanceOf: Bundle
+Usage: #example
+Title: "VLSMS VL Result Bundle"
+Description: "Represents the VLSMS VL Result Bundle."
+* type = #transaction
+
+* entry[+].fullUrl = "Patient/HIVPatientExample"
+* entry[=].resource = HIVPatientExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Patient/HIVPatientExample"
+
+* entry[+].fullUrl = "Specimen/VLSpecimenExample"
+* entry[=].resource = VLSpecimenExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Specimen/VLSpecimenExample"
+
+* entry[+].fullUrl = "Organization/RequestingOrganizationExample"
+* entry[=].resource = RequestingOrganizationExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Organization/RequestingOrganizationExample"
+
+* entry[+].fullUrl = "Organization/PerformingOrganizationExample"
+* entry[=].resource = PerformingOrganizationExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Organization/PerformingOrganizationExample"
+
+* entry[+].fullUrl = "ServiceRequest/HIVServiceRequestExample"
+* entry[=].resource = HIVServiceRequestExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "ServiceRequest/HIVServiceRequestExample"
+
+* entry[+].fullUrl = "Practitioner/RequestingPractitionerExample"
+* entry[=].resource = RequestingPractitionerExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Practitioner/RequestingPractitionerExample"
+
+* entry[+].fullUrl = "Practitioner/PerformingPractitionerExample"
+* entry[=].resource = PerformingPractitionerExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Practitioner/PerformingPractitionerExample"
+
+* entry[+].fullUrl = "Observation/ReasonForHIVTestingExample"
+* entry[=].resource = ReasonForHIVTestingExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/ReasonForHIVTestingExample"
+
+* entry[+].fullUrl = "Observation/PatientPregnantExample"
+* entry[=].resource = PatientPregnantExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/PatientPregnantExample"
+
+* entry[+].fullUrl = "Observation/HIVPatientIsNewExample"
+* entry[=].resource = HIVPatientIsNewExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/HIVPatientIsNewExample"
+
+* entry[+].fullUrl = "Observation/BreastfeedingExample"
+* entry[=].resource = BreastfeedingExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/BreastfeedingExample"
+
+* entry[+].fullUrl = "CarePlan/ARVTreatmentRegimenChangedExample"
+* entry[=].resource = ARVTreatmentRegimenChangedExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "CarePlan/ARVTreatmentRegimenChangedExample"
+
+* entry[+].fullUrl = "CarePlan/ARVTreatmentInitiatedExample"
+* entry[=].resource = ARVTreatmentInitiatedExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "CarePlan/ARVTreatmentInitiatedExample"
+
+* entry[+].fullUrl = "MedicationRequest/ARVRegimenMedicationRequestRegimenChangedExample"
+* entry[=].resource = ARVRegimenMedicationRequestRegimenChangedExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "MedicationRequest/ARVRegimenMedicationRequestRegimenChangedExample"
+
+* entry[+].fullUrl = "MedicationRequest/ARVRegimenMedicationRequestInitiatedARTExample"
+* entry[=].resource = ARVRegimenMedicationRequestInitiatedARTExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "MedicationRequest/ARVRegimenMedicationRequestInitiatedARTExample"
+
+* entry[+].fullUrl = "Encounter/TargetFacilityEncounterExample"
+* entry[=].resource = TargetFacilityEncounterExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Encounter/TargetFacilityEncounterExample"
+
+* entry[+].fullUrl = "Observation/HIVTestResultExample"
+* entry[=].resource = HIVTestResultExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/HIVTestResultExample"
+
+* entry[+].fullUrl = "Task/HIVLabResultTaskExample"
+* entry[=].resource = HIVLabResultTaskExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Task/HIVLabResultTaskExample"
+
+* entry[+].fullUrl = "ActivityDefinition/LabOrderResultTaskActivityExample"
+* entry[=].resource = LabOrderResultTaskActivityExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "ActivityDefinition/LabOrderResultTaskActivityExample"
+
+* 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"
+
+* entry[+].fullUrl = "Location/TransportRequestedLocationExample"
+* entry[=].resource = TransportRequestedLocationExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Location/TransportRequestedLocationExample"
+
+* entry[+].fullUrl = "Location/TransportCurrentLocationExample"
+* entry[=].resource = TransportCurrentLocationExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Location/TransportCurrentLocationExample"
+
+* entry[+].fullUrl = "DiagnosticReport/HIVLabResultsDiagnosticReportExample"
+* entry[=].resource = HIVLabResultsDiagnosticReportExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "DiagnosticReport/HIVLabResultsDiagnosticReportExample"
+
+* entry[+].fullUrl = "Practitioner/ResultsInterpreterExample"
+* entry[=].resource = ResultsInterpreterExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Practitioner/ResultsInterpreterExample"
+
+* entry[+].fullUrl = "Consent/ReceiveSMSMessagesExample"
+* entry[=].resource = ReceiveSMSMessagesExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Consent/ReceiveSMSMessagesExample"
+
+* entry[+].fullUrl = "Observation/ARVAdherenceExample"
+* entry[=].resource = ARVAdherenceExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/ARVAdherenceExample"
+
+* entry[+].fullUrl = "Observation/RepeatHIVTestResultExample"
+* entry[=].resource = RepeatHIVTestResultExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/RepeatHIVTestResultExample"
+
+* entry[+].fullUrl = "Observation/SuspendTreatmentHIVTestResultExample"
+* entry[=].resource = SuspendTreatmentHIVTestResultExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/SuspendTreatmentHIVTestResultExample"
+
+* entry[+].fullUrl = "Device/TestingPlatformExample"
+* entry[=].resource = TestingPlatformExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Device/TestingPlatformExample"
+
+* entry[+].fullUrl = "Observation/HIVTestResultViralLoadLogExample"
+* entry[=].resource = HIVTestResultViralLoadLogExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/HIVTestResultViralLoadLogExample"
+
+* entry[+].fullUrl = "Observation/HIVTestResultAbsoluteDecimalExample"
+* entry[=].resource = HIVTestResultAbsoluteDecimalExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Observation/HIVTestResultAbsoluteDecimalExample"
+
+* entry[+].fullUrl = "Organization/FundingOrganizationExample"
+* entry[=].resource = FundingOrganizationExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Organization/FundingOrganizationExample"
+
+* entry[+].fullUrl = "Organization/ImplementingPartnerOrganizationExample"
+* entry[=].resource = ImplementingPartnerOrganizationExample
+* entry[=].request.method = #PUT
+* entry[=].request.url = "Organization/ImplementingPartnerOrganizationExample"