Merge pull request #25 from openhie/depenency-test

Update sushi-config.yaml

input/fsh/examples.fsh

@@ -24,6 +24,7 @@ InstanceOf: HIVPatient
 Usage: #example
 Title: "Patient example"
 Description: "Patient example"
+//* meta.profile[+] = Canonical(IHE.PDQm.Patient)
 * identifier[NID].value = "NID1234567"
 * identifier[NID].system = "http://openhie.org/fhir/training-solution-1/identifier/nid"
 * identifier[MR].value = "ORG1-0765712"
@@ -125,6 +126,8 @@ Description: "Showing a confirmed HIV diagnosis"
 * note.text = "Additional information regarding the HIV diagnosis"
 * note.authorReference = Reference(HIVOrganizationExample)
 * note.time = "2015-02-07T13:28:17-05:00"
+* clinicalStatus.coding.code = #active
+* clinicalStatus.coding.system = "http://terminology.hl7.org/CodeSystem/condition-clinical"
 
 Instance: VLSpecimenExample
 InstanceOf: VLSpecimen
@@ -139,7 +142,7 @@ Description: "Viral Load Specimen example"
 * identifier[USID].type.text = "Specimen identifier"
 * type = $SCT#119361006
 * type.text = "Specimen Type"
-* type.coding.display = "Plasma specimen (specimen)"
+* type.coding.display = "Plasma specimen"
 * subject = Reference(HIVPatientExample)
 * collection.collectedDateTime = "2022-07-28"
 * note.authorReference = Reference(HIVOrganizationExample)
@@ -267,7 +270,7 @@ Description: "HIV Lab Order Cancellation Task example"
 * status = #cancelled
 * statusReason = $SCT#281264009
 * statusReason.text = "Reason For Canceling/Rejecting the Lab Order"
-* statusReason.coding.display = "Inappropriate bottle or container for sample (finding)"
+* statusReason.coding.display = "Inappropriate bottle or container for sample"
 * intent = #order
 * executionPeriod.end = "2022-07-30"
 * lastModified = "2022-07-30"
@@ -353,6 +356,7 @@ Description: "Date HIV Test Done example"
 * note.text = "Additional information regarding the HIV test"
 * note.authorReference = Reference(HIVOrganizationExample)
 * note.time = "2015-02-07T13:28:17-05:00"
+* performer = Reference(HIVOrganizationExample)
 
 Instance: ARVTreatmentExample
 InstanceOf: ARVTreatment

input/fsh/hiv-bundle-submit-emr.fsh

@@ -5,37 +5,37 @@ Title: "HIV Submit EMR Bundle Example"
 Description: "HIV Submit EMR Bundle Example"
 * type = #transaction
 
-* entry[+].fullUrl = "Patient/HIVPatientExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Patient/HIVPatientExample"
 * entry[=].resource = HIVPatientExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Patient/HIVPatientExample"
 
-* entry[+].fullUrl = "Encounter/TargetFacilityEncounterExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Encounter/TargetFacilityEncounterExample"
 * entry[=].resource = TargetFacilityEncounterExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Encounter/TargetFacilityEncounterExample"
 
-* entry[+].fullUrl = "Encounter/TransferringFacilityEncounterExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Encounter/TransferringFacilityEncounterExample"
 * entry[=].resource = TransferringFacilityEncounterExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Encounter/TransferringFacilityEncounterExample"
 
-* entry[+].fullUrl = "Condition/HIVDiagnosisExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Condition/HIVDiagnosisExample"
 * entry[=].resource = HIVDiagnosisExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Condition/HIVDiagnosisExample"
 
-* entry[+].fullUrl = "Observation/DateHIVTestDoneExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Observation/DateHIVTestDoneExample"
 * entry[=].resource = DateHIVTestDoneExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Observation/DateHIVTestDoneExample"
 
-* entry[+].fullUrl = "EpisodeOfCare/HIVEpisodeOfCareExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/EpisodeOfCare/HIVEpisodeOfCareExample"
 * entry[=].resource = HIVEpisodeOfCareExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "EpisodeOfCare/HIVEpisodeOfCareExample"
 
-* entry[+].fullUrl = "CarePlan/ARVTreatmentRegimenSwitchedOrSubstitutedExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/CarePlan/ARVTreatmentRegimenSwitchedOrSubstitutedExample"
 * entry[=].resource = ARVTreatmentRegimenSwitchedOrSubstitutedExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "CarePlan/ARVTreatmentRegimenSwitchedOrSubstitutedExample"

input/fsh/hiv-bundle-submit-lab-cancellation.fsh

@@ -4,7 +4,7 @@ Usage: #example
 Title: "HIV Submit Lab Cancellation Bundle Example"
 Description: "HIV Submit Lab Cancellation Bundle Example"
 * type = #transaction
-* entry[+].fullUrl = "Task/HIVLabOrderCancellationTaskExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Task/HIVLabOrderCancellationTaskExample"
 * entry[=].resource = HIVLabOrderCancellationTaskExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Task/HIVLabOrderCancellationTaskExample"

input/fsh/hiv-bundle-submit-lab-order.fsh

@@ -4,27 +4,27 @@ Usage: #example
 Title: "HIV Submit Lab Order Bundle Example"
 Description: "HIV Submit Lab Order Bundle Example"
 * type = #transaction
-* entry[+].fullUrl = "Task/HIVLabOrderTaskExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Task/HIVLabOrderTaskExample"
 * entry[=].resource = HIVLabOrderTaskExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Task/HIVLabOrderTaskExample"
 
-* entry[+].fullUrl = "Organization/HIVServiceRequestLocationExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Organization/HIVServiceRequestLocationExample"
 * entry[=].resource = HIVServiceRequestLocationExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Organization/HIVServiceRequestLocationExample"
 
-* entry[+].fullUrl = "ServiceRequest/HIVServiceRequestExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/ServiceRequest/HIVServiceRequestExample"
 * entry[=].resource = HIVServiceRequestExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "ServiceRequest/HIVServiceRequestExample"
 
-* entry[+].fullUrl = "Practitioner/PractitionerExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Practitioner/PractitionerExample"
 * entry[=].resource = PractitionerExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Practitioner/PractitionerExample"
 
-* entry[+].fullUrl = "Specimen/VLSpecimenExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Specimen/VLSpecimenExample"
 * entry[=].resource = VLSpecimenExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Specimen/VLSpecimenExample"

input/fsh/hiv-bundle-submit-lab-rejection.fsh

@@ -4,7 +4,7 @@ Usage: #example
 Title: "HIV Submit Lab Rejection Bundle Example"
 Description: "HIV Submit Lab Rejection Bundle Example"
 * type = #transaction
-* entry[+].fullUrl = "Task/HIVLabOrderRejectionTaskExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Task/HIVLabOrderRejectionTaskExample"
 * entry[=].resource = HIVLabOrderRejectionTaskExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Task/HIVLabOrderRejectionTaskExample"

input/fsh/hiv-bundle-submit-lab-result.fsh

@@ -4,27 +4,27 @@ Usage: #example
 Title: "HIV Submit Lab Result Bundle Example"
 Description: "HIV Submit Lab Result Bundle Example"
 * type = #transaction
-* entry[+].fullUrl = "Task/HIVLabResultTaskExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Task/HIVLabResultTaskExample"
 * entry[=].resource = HIVLabResultTaskExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Task/HIVLabResultTaskExample"
 
-* entry[+].fullUrl = "DiagnosticReport/HIVLabResultsDiagnosticReportExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/DiagnosticReport/HIVLabResultsDiagnosticReportExample"
 * entry[=].resource = HIVLabResultsDiagnosticReportExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "DiagnosticReport/HIVLabResultsDiagnosticReportExample"
 
-* entry[+].fullUrl = "Practitioner/PractitionerExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Practitioner/PractitionerExample"
 * entry[=].resource = PractitionerExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Practitioner/PractitionerExample"
 
-* entry[+].fullUrl = "Specimen/VLSpecimenExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Specimen/VLSpecimenExample"
 * entry[=].resource = VLSpecimenExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Specimen/VLSpecimenExample"
 
-* entry[+].fullUrl = "Observation/HIVTestResultExample"
+* entry[+].fullUrl = "http://hapi-fhir:8080/fhir/Observation/HIVTestResultExample"
 * entry[=].resource = HIVTestResultExample
 * entry[=].request.method = #PUT
 * entry[=].request.url = "Observation/HIVTestResultExample"

input/fsh/profiles.fsh

@@ -1,5 +1,5 @@
 Profile: HIVPatient
-Parent: Patient
+Parent: IHE.PDQm.Patient
 Id: hiv-patient
 Title: "Patient"
 Description: "A patient resource for an HIV Patient"

sushi-config.yaml

@@ -59,7 +59,11 @@ jurisdiction: http://unstats.un.org/unsd/methods/m49/m49.htm#001 "World"
 # The dependencies property corresponds to IG.dependsOn. The key is the
 # package id and the value is the version (or dev/current). For advanced
 # use cases, the value can be an object with keys for `uri` and `version`.
-#dependencies:
+dependencies:
+  ihe.iti.pdqm:
+    id: IHE_PDQm
+    uri: https://profiles.ihe.net/ITI/PDQm/ImplementationGuide/ihe.iti.pdqm
+    version: current #2.4.0
 #  hl7.fhir.us.core: 3.1.0
 #  hl7.fhir.us.mcode:
 #    id: mcode