From 48717a1c45f34f9238f4981ecf354e043e709abd Mon Sep 17 00:00:00 2001 From: ritikarawlani <38657562+ritikarawlani@users.noreply.github.com> Date: Wed, 31 Jul 2024 11:39:03 +0530 Subject: [PATCH 1/7] move from sushi to fsh --- input/fsh/instances/bundle-minimal.fsh | 74 ++++++++++----------- input/fsh/instances/composition-minimal.fsh | 2 +- sushi-config.yaml | 29 +++----- 3 files changed, 47 insertions(+), 58 deletions(-) diff --git a/input/fsh/instances/bundle-minimal.fsh b/input/fsh/instances/bundle-minimal.fsh index f63f5d74..b804a36b 100644 --- a/input/fsh/instances/bundle-minimal.fsh +++ b/input/fsh/instances/bundle-minimal.fsh @@ -1,5 +1,5 @@ Instance: bundle-minimal -InstanceOf: Bundle +InstanceOf: BundleUvIps Title: "IPS Bundle example - minimal" Description: "IPS Bundle example - minimal" Usage: #example @@ -8,40 +8,40 @@ Usage: #example * identifier.value = "28b95815-76ce-457b-b7ae-a972e527db40" * type = #document * timestamp = "2020-12-11T14:30:00+01:00" -* entry[0].fullUrl = "urn:uuid:f40b07e3-37e8-48c3-bf1c-ae70fe12dab0" -* entry[=].resource = f40b07e3-37e8-48c3-bf1c-ae70fe12dab0 -* entry[+].fullUrl = "urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad" -* entry[=].resource = 244ad7c3-beeb-41d1-8a2f-c76b8cf720ad -* entry[+].fullUrl = "urn:uuid:45271f7f-63ab-4946-970f-3daaaa06637f" -* entry[=].resource = 45271f7f-63ab-4946-970f-3daaaa06637f -* entry[+].fullUrl = "urn:uuid:a21fe796-3594-4ad9-a01e-cc83118ceca9" -* entry[=].resource = a21fe796-3594-4ad9-a01e-cc83118ceca9 -* entry[+].fullUrl = "urn:uuid:d179321e-c091-4cd4-8642-3a27537d506d" -* entry[=].resource = d179321e-c091-4cd4-8642-3a27537d506d -* entry[+].fullUrl = "urn:uuid:e1271efd-18ff-4654-9ee7-45f40019c453" -* entry[=].resource = e1271efd-18ff-4654-9ee7-45f40019c453 -* entry[+].fullUrl = "urn:uuid:95db7c92-566a-4ded-896b-2220ab244a9e" -* entry[=].resource = 95db7c92-566a-4ded-896b-2220ab244a9e -* entry[+].fullUrl = "urn:uuid:74861316-f69d-4652-9fb1-8512a20c7927" -* entry[=].resource = 74861316-f69d-4652-9fb1-8512a20c7927 +* entry[0].fullUrl = "urn:uuid:6e1fb74a-742b-4c7b-8487-171dacb88766" +* entry[=].resource = 6e1fb74a-742b-4c7b-8487-171dacb88766 +* entry[+].fullUrl = "urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94" +* entry[=].resource = 7685713c-e29e-4a75-8a90-45be7ba3be94 +* entry[+].fullUrl = "urn:uuid:98315ba9-ffea-41ef-b59b-a836c039858f" +* entry[=].resource = 98315ba9-ffea-41ef-b59b-a836c039858f +* entry[+].fullUrl = "urn:uuid:bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d" +* entry[=].resource = bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d +* entry[+].fullUrl = "urn:uuid:ad84b7a2-b4dd-474e-bef3-0779e6cb595f" +* entry[=].resource = ad84b7a2-b4dd-474e-bef3-0779e6cb595f +* entry[+].fullUrl = "urn:uuid:6e883e5e-7648-485a-86de-3640a61601fe" +* entry[=].resource = 6e883e5e-7648-485a-86de-3640a61601fe +* entry[+].fullUrl = "urn:uuid:6369a973-afc7-4617-8877-3e9811e05a5b" +* entry[=].resource = 6369a973-afc7-4617-8877-3e9811e05a5b +* entry[+].fullUrl = "urn:uuid:fe2769fd-22c9-4307-9122-ee0466e5aebb" +* entry[=].resource = fe2769fd-22c9-4307-9122-ee0466e5aebb -Instance: f40b07e3-37e8-48c3-bf1c-ae70fe12dab0 +Instance: 6e1fb74a-742b-4c7b-8487-171dacb88766 InstanceOf: Composition Usage: #inline * status = #final * type = $loinc#60591-5 "Patient summary Document" -* subject = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad) +* subject = Reference(urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94) * date = "2020-12-11T14:30:00+01:00" -* author = Reference(urn:uuid:45271f7f-63ab-4946-970f-3daaaa06637f) +* author = Reference(urn:uuid:98315ba9-ffea-41ef-b59b-a836c039858f) * title = "Patient Summary as of December 11, 2020 14:30" * confidentiality = #N * attester[0].mode = #legal * attester[=].time = "2020-12-11T14:30:00+01:00" -* attester[=].party = Reference(urn:uuid:45271f7f-63ab-4946-970f-3daaaa06637f) +* attester[=].party = Reference(urn:uuid:98315ba9-ffea-41ef-b59b-a836c039858f) * attester[+].mode = #legal * attester[=].time = "2020-12-11T14:30:00+01:00" -* attester[=].party = Reference(urn:uuid:a21fe796-3594-4ad9-a01e-cc83118ceca9) -* custodian = Reference(urn:uuid:a21fe796-3594-4ad9-a01e-cc83118ceca9) +* attester[=].party = Reference(urn:uuid:bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d) +* custodian = Reference(urn:uuid:bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d) * relatesTo.code = #appends * relatesTo.targetIdentifier.system = "urn:oid:2.16.724.4.8.10.200.10" * relatesTo.targetIdentifier.value = "20e12ce3-857f-49c0-b888-cb670597f191" @@ -51,19 +51,19 @@ Usage: #inline * section[=].code = $loinc#11450-4 "Problem list - Reported" * section[=].text.status = #generated * section[=].text.div = "
" -* section[=].entry = Reference(urn:uuid:d179321e-c091-4cd4-8642-3a27537d506d) +* section[=].entry = Reference(urn:uuid:ad84b7a2-b4dd-474e-bef3-0779e6cb595f) * section[+].title = "Medication" * section[=].code = $loinc#10160-0 "History of Medication use Narrative" * section[=].text.status = #generated * section[=].text.div = "
" -* section[=].entry = Reference(urn:uuid:e1271efd-18ff-4654-9ee7-45f40019c453) +* section[=].entry = Reference(urn:uuid:6e883e5e-7648-485a-86de-3640a61601fe) * section[+].title = "Allergies and Intolerances" * section[=].code = $loinc#48765-2 "Allergies and adverse reactions Document" * section[=].text.status = #generated * section[=].text.div = "
" -* section[=].entry = Reference(urn:uuid:74861316-f69d-4652-9fb1-8512a20c7927) +* section[=].entry = Reference(urn:uuid:fe2769fd-22c9-4307-9122-ee0466e5aebb) -Instance: 244ad7c3-beeb-41d1-8a2f-c76b8cf720ad +Instance: 7685713c-e29e-4a75-8a90-45be7ba3be94 InstanceOf: Patient Usage: #inline * identifier.system = "urn:oid:2.16.840.1.113883.2.4.6.3" @@ -91,7 +91,7 @@ Usage: #inline * contact.address.postalCode = "69001" * contact.address.country = "FR" -Instance: 45271f7f-63ab-4946-970f-3daaaa06637f +Instance: 98315ba9-ffea-41ef-b59b-a836c039858f InstanceOf: Practitioner Usage: #inline * identifier.system = "urn:oid:2.16.528.1.1007.3.1" @@ -103,7 +103,7 @@ Usage: #inline * qualification.code.coding.version = "2.7" * qualification.code.coding = $v2-0360#MD "Doctor of Medicine" -Instance: a21fe796-3594-4ad9-a01e-cc83118ceca9 +Instance: bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d InstanceOf: Organization Usage: #inline * identifier.system = "urn:oid:2.16.528.1.1007.3.3" @@ -119,7 +119,7 @@ Usage: #inline * address.postalCode = "3311 CE" * address.country = "NL" -Instance: d179321e-c091-4cd4-8642-3a27537d506d +Instance: ad84b7a2-b4dd-474e-bef3-0779e6cb595f InstanceOf: Condition Usage: #inline * identifier.system = "urn:oid:1.2.3.999" @@ -135,25 +135,25 @@ Usage: #inline * code.coding[=].display.extension.extension[=].valueString = "opvliegers" * code.coding[=].display.extension.url = "http://hl7.org/fhir/StructureDefinition/translation" * code.coding[+] = $icd-10#N95.1 "Menopausal and female climacteric states" -* subject = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad) +* subject = Reference(urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94) * onsetDateTime = "2015" * recordedDate = "2016-10" -Instance: e1271efd-18ff-4654-9ee7-45f40019c453 +Instance: 6e883e5e-7648-485a-86de-3640a61601fe InstanceOf: MedicationStatement Usage: #inline * identifier.system = "urn:oid:1.2.3.999" * identifier.value = "8faf0319-89d3-427c-b9d1-e8c8fd390dca" * status = #active -* medicationReference = Reference(urn:uuid:95db7c92-566a-4ded-896b-2220ab244a9e) -* subject = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad) +* medicationReference = Reference(urn:uuid:6369a973-afc7-4617-8877-3e9811e05a5b) +* subject = Reference(urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94) * effectivePeriod.start = "2015-03" * dosage.timing.repeat.count = 1 * dosage.timing.repeat.periodUnit = #d * dosage.route = $standardterms#20053000 "Oral use" * dosage.doseAndRate.doseQuantity = 1 '1' "tablet" -Instance: 95db7c92-566a-4ded-896b-2220ab244a9e +Instance: 6369a973-afc7-4617-8877-3e9811e05a5b InstanceOf: Medication Usage: #inline * code.coding[0] = $sct#108774000 "Product containing anastrozole (medicinal product)" @@ -161,7 +161,7 @@ Usage: #inline * code.coding[+] = urn:oid:2.16.840.1.113883.2.4.4.7#2076667 "ANASTROZOL CF TABLET FILMOMHULD 1MG" * code.coding[+] = $atc#L02BG03 "anastrozole" -Instance: 74861316-f69d-4652-9fb1-8512a20c7927 +Instance: fe2769fd-22c9-4307-9122-ee0466e5aebb InstanceOf: AllergyIntolerance Usage: #inline * identifier.system = "urn:oid:1.2.3.999" @@ -172,6 +172,6 @@ Usage: #inline * category = #medication * criticality = #high * code = $sct#373270004 "Substance with penicillin structure and antibacterial mechanism of action (substance)" -* patient = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad) +* patient = Reference(urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94) * onsetDateTime = "2010" diff --git a/input/fsh/instances/composition-minimal.fsh b/input/fsh/instances/composition-minimal.fsh index a768a382..103c7401 100644 --- a/input/fsh/instances/composition-minimal.fsh +++ b/input/fsh/instances/composition-minimal.fsh @@ -1,5 +1,5 @@ Instance: composition-minimal -InstanceOf: Composition +InstanceOf: CompositionUvIps Title: "IPS Composition example - minimal" Description: "IPS Composition example - minimal" Usage: #example diff --git a/sushi-config.yaml b/sushi-config.yaml index 3caea0a6..13803b66 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -25,16 +25,17 @@ menu: Home: index.html Table of Contents: toc.html General Principles and Design: - General Principles: General-Principles.html - Design Conventions: Design-Conventions.html - Generation and Data Inclusion: Generation-and-Data-Inclusion.html - Privacy and Security Considerations: Privacy-and-Security-Considerations.html - Known Issues and Future Development: Known-Issues-and-Future-Development.html - The "IPS": Structure-of-the-International-Patient-Summary.html + General Principles: principles.html + Design Conventions: design.html + Generation and Data Inclusion: ipsGeneration.html + Privacy and Security Considerations: considerations.html + Known Issues and Future Development: knownIssues.html + The "IPS": ipsStructure.html FHIR Artifacts: - IPS Composition: StructureDefinition-Composition-uv-ips.html - IPS Library (Profiles): profiles.html + The IPS Composition: StructureDefinition-Composition-uv-ips.html + IPS Library: profiles.html Datatypes: datatypes.html + Extensions: extensions.html Terminology: terminology.html Operations: OperationDefinition-summary.html Examples: examples.html @@ -54,14 +55,6 @@ resources: name: 'IPS Bundle example - no information in required sections' description: 'IPS Bundle example - no information in required sections' exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips - Bundle/bundle-minimal: - name: 'IPS Bundle example - minimal' - description: 'IPS Bundle example - minimal' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips - Composition/composition-minimal: - name: 'IPS Composition example - minimal' - description: 'IPS Composition example - minimal' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Composition-uv-ips Medication/eumfh-39-07-1: name: 'Medication : Simvastatin 40 MG Disintegrating Oral Tablet' description: 'Medication : Simvastatin 40 MG Disintegrating Oral Tablet' @@ -198,7 +191,3 @@ resources: name: 'DiagnosticReport: hemoglobin example' description: 'DiagnosticReport: hemoglobin example' exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/DiagnosticReport-uv-ips - Flag/546482: - name: 'Alert Flag (IPS) example' - description: 'Alert Flag (IPS) example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Flag-alert-uv-ips From 6e0f8f34a63e05ebd7bf07ae4d9d5137a4780a21 Mon Sep 17 00:00:00 2001 From: ritikarawlani <38657562+ritikarawlani@users.noreply.github.com> Date: Wed, 31 Jul 2024 12:31:49 +0530 Subject: [PATCH 2/7] add workflows --- .github/workflows/fhirbuild.yml | 23 +++++++++++++++++++++++ .github/workflows/ghbuild.yml | 23 +++++++++++++++++++++++ 2 files changed, 46 insertions(+) create mode 100644 .github/workflows/fhirbuild.yml create mode 100644 .github/workflows/ghbuild.yml diff --git a/.github/workflows/fhirbuild.yml b/.github/workflows/fhirbuild.yml new file mode 100644 index 00000000..15fadec1 --- /dev/null +++ b/.github/workflows/fhirbuild.yml @@ -0,0 +1,23 @@ +# This workflow reuses the openHIE GitHub action for building IGs +# Initial idea by Carl Leitner, developed by Elliot Silver, available from: https://www.argentixinfo.com/archives/156 +# Change log: +# v0.1.0 +# 2021-06-18: publish default branches to / , other branches branches/ +# 2021-11-26: reusable workflow + +name: FHIR CI Build + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events for any main branch + push: + branches-ignore: + - 'gh-pages' + pull_request: + + workflow_dispatch: + +jobs: + # This workflow contains a single job called "build" + call_build: + uses: WorldHealthOrganization/smart-base/.github/workflows/fhirbuild.yml@main diff --git a/.github/workflows/ghbuild.yml b/.github/workflows/ghbuild.yml new file mode 100644 index 00000000..575defd4 --- /dev/null +++ b/.github/workflows/ghbuild.yml @@ -0,0 +1,23 @@ +# This workflow reuses the openHIE GitHub action for building IGs +# Initial idea by Carl Leitner, developed by Elliot Silver, available from: https://www.argentixinfo.com/archives/156 +# Change log: +# v0.1.0 +# 2021-06-18: publish default branches to / , other branches branches/ +# 2021-11-26: reusable workflow + +name: GitHub Pages build + +# Controls when the action will run. +on: + # Triggers the workflow on push or pull request events for any main branch + push: + branches-ignore: + - 'gh-pages' + pull_request: + + workflow_dispatch: + +jobs: + # This workflow contains a single job called "build" + call_build: + uses: WorldHealthOrganization/smart-base/.github/workflows/ghbuild.yml@main From 317da2537ad5cc088117c4c24705011e312e0d30 Mon Sep 17 00:00:00 2001 From: ritikarawlani <38657562+ritikarawlani@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:57:32 +0530 Subject: [PATCH 3/7] update --- input/fsh/instances/composition-minimal.fsh | 30 ++++++++++----------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/input/fsh/instances/composition-minimal.fsh b/input/fsh/instances/composition-minimal.fsh index 103c7401..e754772f 100644 --- a/input/fsh/instances/composition-minimal.fsh +++ b/input/fsh/instances/composition-minimal.fsh @@ -22,18 +22,18 @@ Usage: #example * relatesTo.targetIdentifier.value = "20e12ce3-857f-49c0-b888-cb670597f191" * event.code = $v3-ActClass#PCPR * event.period.end = "2020-12-11T14:30:00+01:00" -* section[0].title = "Active Problems" -* section[=].code = $loinc#11450-4 "Problem list - Reported" -* section[=].text.status = #generated -* section[=].text.div = "
  • Condition Name: Acute myocardial infarction of anterior wall
    Code: 54329005
    Status: Active
" -* section[=].entry = Reference(Condition/eumfh-39-07-1) -* section[+].title = "Medication" -* section[=].code = $loinc#10160-0 "History of Medication use Narrative" -* section[=].text.status = #generated -* section[=].text.div = "
  • Medication Name: Simvastatin 40 MG Disintegrating Oral Tablet
    Code: C10AA01
    Status: Active, started 2014
    Instructions: Take 40 mg/day
" -* section[=].entry = Reference(MedicationStatement/eumfh-39-07-1) -* section[+].title = "Allergies and Intolerances" -* section[=].code = $loinc#48765-2 "Allergies and adverse reactions Document" -* section[=].text.status = #generated -* section[=].text.div = "
  • Allergy Name: No known allergies
    Verification Status: Confirmed
    Reaction: no information
" -* section[=].entry = Reference(AllergyIntolerance/eumfh-39-07-1) \ No newline at end of file +* section[sectionProblems].title = "Active Problems" +* section[sectionProblems].code = $loinc#11450-4 "Problem list - Reported" +* section[sectionProblems].text.status = #generated +* section[sectionProblems].text.div = "
  • Condition Name: Acute myocardial infarction of anterior wall
    Code: 54329005
    Status: Active
" +* section[sectionProblems].entry = Reference(Condition/eumfh-39-07-1) +* section[sectionMedications].title = "Medication" +* section[sectionMedications].code = $loinc#10160-0 "History of Medication use Narrative" +* section[sectionMedications].text.status = #generated +* section[sectionMedications].text.div = "
  • Medication Name: Simvastatin 40 MG Disintegrating Oral Tablet
    Code: C10AA01
    Status: Active, started 2014
    Instructions: Take 40 mg/day
" +* section[sectionMedications].entry = Reference(MedicationStatement/eumfh-39-07-1) +* section[sectionAllergies].title = "Allergies and Intolerances" +* section[sectionAllergies].code = $loinc#48765-2 "Allergies and adverse reactions Document" +* section[sectionAllergies].text.status = #generated +* section[sectionAllergies].text.div = "
  • Allergy Name: No known allergies
    Verification Status: Confirmed
    Reaction: no information
" +* section[sectionAllergies].entry = Reference(AllergyIntolerance/eumfh-39-07-1) \ No newline at end of file From 07fcfa6e212b9361b7f4b6cc74877d5444646f87 Mon Sep 17 00:00:00 2001 From: ritikarawlani <38657562+ritikarawlani@users.noreply.github.com> Date: Wed, 14 Aug 2024 18:07:43 +0530 Subject: [PATCH 4/7] update --- input/fsh/instances/allergyIntolerance-39-07-1.fsh | 2 +- input/fsh/instances/allergyIntolerance-with-abatement.fsh | 2 +- input/fsh/instances/allergyintolerance-multiple-codings.fsh | 2 +- input/fsh/instances/bundle-no-info-required-sections.fsh | 2 +- input/fsh/instances/condition-39-07-1.fsh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/input/fsh/instances/allergyIntolerance-39-07-1.fsh b/input/fsh/instances/allergyIntolerance-39-07-1.fsh index 137478ae..cea98b59 100644 --- a/input/fsh/instances/allergyIntolerance-39-07-1.fsh +++ b/input/fsh/instances/allergyIntolerance-39-07-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-39-07-1-of-AllergyIntolerance -InstanceOf: AllergyIntolerance +InstanceOf: AllergyIntoleranceUvIps Title: "AllergyIntolerance: No known allergies" Description: "AllergyIntolerance: No known allergies" Usage: #example diff --git a/input/fsh/instances/allergyIntolerance-with-abatement.fsh b/input/fsh/instances/allergyIntolerance-with-abatement.fsh index f7a3abba..218a78b7 100644 --- a/input/fsh/instances/allergyIntolerance-with-abatement.fsh +++ b/input/fsh/instances/allergyIntolerance-with-abatement.fsh @@ -1,5 +1,5 @@ Instance: allergyintolerance-with-abatement -InstanceOf: AllergyIntolerance +InstanceOf: AllergyIntoleranceUvIps Title: "AllergyIntolerance: resolved allergy" Description: "AllergyIntolerance: resolved allergy" Usage: #example diff --git a/input/fsh/instances/allergyintolerance-multiple-codings.fsh b/input/fsh/instances/allergyintolerance-multiple-codings.fsh index f01cf1c3..dc3b9999 100644 --- a/input/fsh/instances/allergyintolerance-multiple-codings.fsh +++ b/input/fsh/instances/allergyintolerance-multiple-codings.fsh @@ -1,5 +1,5 @@ Instance: allergyintolerance-multiple-codings -InstanceOf: AllergyIntolerance +InstanceOf: AllergyIntoleranceUvIps Title: "AllergyIntolerance: multiple codings" Description: "AllergyIntolerance: multiple codings" Usage: #example diff --git a/input/fsh/instances/bundle-no-info-required-sections.fsh b/input/fsh/instances/bundle-no-info-required-sections.fsh index e7543d2b..39f5e58d 100644 --- a/input/fsh/instances/bundle-no-info-required-sections.fsh +++ b/input/fsh/instances/bundle-no-info-required-sections.fsh @@ -1,5 +1,5 @@ Instance: bundle-no-info-required-sections -InstanceOf: Bundle +InstanceOf: BundleUvIps Title: "IPS Bundle example - no information in required sections" Description: "IPS Bundle example - no information in required sections" Usage: #example diff --git a/input/fsh/instances/condition-39-07-1.fsh b/input/fsh/instances/condition-39-07-1.fsh index 532b2706..33aba42a 100644 --- a/input/fsh/instances/condition-39-07-1.fsh +++ b/input/fsh/instances/condition-39-07-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-39-07-1-of-Condition -InstanceOf: Condition +InstanceOf: ConditionUvIps Title: "Condition: Acute myeloid leukemia" Description: "Condition: Acute myeloid leukemia" Usage: #example From 62947fdd842c057f743de27e7513535144a2a53b Mon Sep 17 00:00:00 2001 From: ritikarawlani <38657562+ritikarawlani@users.noreply.github.com> Date: Wed, 14 Aug 2024 18:33:52 +0530 Subject: [PATCH 5/7] update --- input/fsh/instances/IPS-bundle-01.fsh | 2 +- .../IPS-bundle-with-immunization.fsh | 2 +- input/fsh/instances/Immunization-75680.fsh | 2 +- ...edicationRequest-eumfh-39-07-1-request.fsh | 2 +- input/fsh/instances/medication-39-07-1.fsh | 2 +- .../instances/medicationStatement-39-07-1.fsh | 2 +- sushi-config.yaml | 28 ------------------- 7 files changed, 6 insertions(+), 34 deletions(-) diff --git a/input/fsh/instances/IPS-bundle-01.fsh b/input/fsh/instances/IPS-bundle-01.fsh index 3b878c2e..3006a503 100644 --- a/input/fsh/instances/IPS-bundle-01.fsh +++ b/input/fsh/instances/IPS-bundle-01.fsh @@ -1,5 +1,5 @@ Instance: IPS-examples-Bundle-01 -InstanceOf: Bundle +InstanceOf: BundleUvIps Title: "IPS Bundle example" Description: "IPS Bundle example" Usage: #example diff --git a/input/fsh/instances/IPS-bundle-with-immunization.fsh b/input/fsh/instances/IPS-bundle-with-immunization.fsh index e2f551d4..182d60e1 100644 --- a/input/fsh/instances/IPS-bundle-with-immunization.fsh +++ b/input/fsh/instances/IPS-bundle-with-immunization.fsh @@ -1,5 +1,5 @@ Instance: IPS-examples-Bundle-with-immunization -InstanceOf: Bundle +InstanceOf: BundleUvIps Title: "IPS Bundle example with Immunization" Description: "IPS Bundle example with Immunization section" Usage: #example diff --git a/input/fsh/instances/Immunization-75680.fsh b/input/fsh/instances/Immunization-75680.fsh index 300b3bdc..d9f9e992 100644 --- a/input/fsh/instances/Immunization-75680.fsh +++ b/input/fsh/instances/Immunization-75680.fsh @@ -1,5 +1,5 @@ Instance: 75680 -InstanceOf: Immunization +InstanceOf: ImmunizationUvIps Title: "Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)" Description: "Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)" Usage: #example diff --git a/input/fsh/instances/MedicationRequest-eumfh-39-07-1-request.fsh b/input/fsh/instances/MedicationRequest-eumfh-39-07-1-request.fsh index 9ed14212..efb28b99 100644 --- a/input/fsh/instances/MedicationRequest-eumfh-39-07-1-request.fsh +++ b/input/fsh/instances/MedicationRequest-eumfh-39-07-1-request.fsh @@ -1,5 +1,5 @@ Instance: eumfh-39-07-1-request -InstanceOf: MedicationRequest +InstanceOf: MedicationRequestIPS Title: "MedicationRequest: Simvastatin request" Description: "MedicationRequest: Simvastatin request" Usage: #example diff --git a/input/fsh/instances/medication-39-07-1.fsh b/input/fsh/instances/medication-39-07-1.fsh index 6f80c816..0df6ec27 100644 --- a/input/fsh/instances/medication-39-07-1.fsh +++ b/input/fsh/instances/medication-39-07-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-39-07-1-of-Medication -InstanceOf: Medication +InstanceOf: MedicationIPS Title: "Medication : Simvastatin 40 MG Disintegrating Oral Tablet" Description: "Medication : Simvastatin 40 MG Disintegrating Oral Tablet" Usage: #example diff --git a/input/fsh/instances/medicationStatement-39-07-1.fsh b/input/fsh/instances/medicationStatement-39-07-1.fsh index 37142922..42c0831d 100644 --- a/input/fsh/instances/medicationStatement-39-07-1.fsh +++ b/input/fsh/instances/medicationStatement-39-07-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-39-07-1-of-MedicationStatement -InstanceOf: MedicationStatement +InstanceOf: MedicationStatementIPS Title: "MedicationStatement: on-going Simvastatin treatment" Description: "MedicationStatement: on-going Simvastatin treatment" Usage: #example diff --git a/sushi-config.yaml b/sushi-config.yaml index 13803b66..8eac972c 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -43,34 +43,6 @@ menu: Copyrights: copyrights.html Change Log: changes.html resources: - Bundle/IPS-examples-Bundle-01: - name: 'IPS Bundle example' - description: 'IPS Bundle example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips - Bundle/IPS-examples-Bundle-with-immunization: - name: 'IPS Bundle example with Immunization' - description: 'IPS Bundle example with Immunization section' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips - Bundle/bundle-no-info-required-sections: - name: 'IPS Bundle example - no information in required sections' - description: 'IPS Bundle example - no information in required sections' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Bundle-uv-ips - Medication/eumfh-39-07-1: - name: 'Medication : Simvastatin 40 MG Disintegrating Oral Tablet' - description: 'Medication : Simvastatin 40 MG Disintegrating Oral Tablet' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Medication-uv-ips - MedicationStatement/eumfh-39-07-1: - name: 'MedicationStatement: on-going Simvastatin treatment' - description: 'MedicationStatement: on-going Simvastatin treatment' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/MedicationStatement-uv-ips - MedicationRequest/eumfh-39-07-1-request: - name: 'MedicationRequest: Simvastatin request' - description: 'MedicationRequest: Simvastatin request' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/MedicationRequest-uv-ips - Immunization/75680: - name: 'Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)' - description: 'Immunization: Vaccin anti diphtérie-coqueluche-tétanos-poliomyélite (Luxembourg)' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Immunization-uv-ips AllergyIntolerance/eumfh-39-07-1: name: 'AllergyIntolerance: No known allergies' description: 'AllergyIntolerance: No known allergies' From 392e8206d73740fa63caf4347a902798685f2f65 Mon Sep 17 00:00:00 2001 From: ritikarawlani <38657562+ritikarawlani@users.noreply.github.com> Date: Wed, 14 Aug 2024 19:39:08 +0530 Subject: [PATCH 6/7] update --- .../instances/DiagnosticReport-hemoglobin.fsh | 2 +- .../fsh/instances/Organization-simple-org.fsh | 2 +- input/fsh/instances/Patient-66033.fsh | 2 +- .../instances/PractitionerRole-simple-pr.fsh | 2 +- input/fsh/instances/device-70-275-1.fsh | 2 +- .../instances/device-imaging-example-1.fsh | 2 +- .../instances/deviceUseStatement-70-275-1.fsh | 2 +- .../instances/imagingStudy-imaging-ex-5-1.fsh | 2 +- .../instances/observation-alcoholuse-1.fsh | 2 +- .../fsh/instances/observation-hemoglobin.fsh | 2 +- .../observation-imaging-example-1.fsh | 2 +- .../observation-imaging-example-4.fsh | 2 +- .../observation-pathology-cancer.fsh | 2 +- .../instances/observation-pregnancy-edd-1.fsh | 2 +- .../observation-pregnancy-outcome-1.fsh | 2 +- .../observation-pregnancy-status-1.fsh | 2 +- .../observation-serum-creatinine-adult.fsh | 2 +- .../instances/observation-tobaccouse-1.fsh | 2 +- .../instances/observation-urine-wbc-range.fsh | 2 +- .../organization-imaging-example-1.fsh | 2 +- .../instances/organization-lab-example-1.fsh | 2 +- input/fsh/instances/patient-39-07-1.fsh | 2 +- .../fsh/instances/patient-example-female.fsh | 2 +- input/fsh/instances/practictioner-39-07-1.fsh | 2 +- input/fsh/instances/procedure-39-07-1.fsh | 2 +- input/fsh/instances/specimen-example-1.fsh | 2 +- sushi-config.yaml | 121 ------------------ 27 files changed, 26 insertions(+), 147 deletions(-) diff --git a/input/fsh/instances/DiagnosticReport-hemoglobin.fsh b/input/fsh/instances/DiagnosticReport-hemoglobin.fsh index 171365d4..d0802cc2 100644 --- a/input/fsh/instances/DiagnosticReport-hemoglobin.fsh +++ b/input/fsh/instances/DiagnosticReport-hemoglobin.fsh @@ -1,5 +1,5 @@ Instance: hemoglobin-of-DiagnosticReport -InstanceOf: DiagnosticReport +InstanceOf: DiagnosticReportUvIps Title: "DiagnosticReport: hemoglobin example" Description: "DiagnosticReport: hemoglobin example" Usage: #example diff --git a/input/fsh/instances/Organization-simple-org.fsh b/input/fsh/instances/Organization-simple-org.fsh index a7df80ce..d88fe686 100644 --- a/input/fsh/instances/Organization-simple-org.fsh +++ b/input/fsh/instances/Organization-simple-org.fsh @@ -1,5 +1,5 @@ Instance: simple-org -InstanceOf: Organization +InstanceOf: OrganizationUvIps Title: "Organization: simple example" Description: "Very Simple Organization example" Usage: #example diff --git a/input/fsh/instances/Patient-66033.fsh b/input/fsh/instances/Patient-66033.fsh index b01818dd..96d79baf 100644 --- a/input/fsh/instances/Patient-66033.fsh +++ b/input/fsh/instances/Patient-66033.fsh @@ -1,5 +1,5 @@ Instance: 66033 -InstanceOf: Patient +InstanceOf: PatientUvIps Title: "Patient: minimal example" Description: "Patient: minimal example" Usage: #example diff --git a/input/fsh/instances/PractitionerRole-simple-pr.fsh b/input/fsh/instances/PractitionerRole-simple-pr.fsh index 3d11df13..1de6b346 100644 --- a/input/fsh/instances/PractitionerRole-simple-pr.fsh +++ b/input/fsh/instances/PractitionerRole-simple-pr.fsh @@ -1,5 +1,5 @@ Instance: simple-pr -InstanceOf: PractitionerRole +InstanceOf: PractitionerRoleUvIps Title: "PractitionerRole: simple example" Description: "Very Simple PractitionerRole example" Usage: #example diff --git a/input/fsh/instances/device-70-275-1.fsh b/input/fsh/instances/device-70-275-1.fsh index 438311a9..8acc4bb1 100644 --- a/input/fsh/instances/device-70-275-1.fsh +++ b/input/fsh/instances/device-70-275-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-70-275-1-of-Device -InstanceOf: Device +InstanceOf: DeviceUvIps Title: "Device: No known devices in use" Description: "Device: No known devices in use" Usage: #example diff --git a/input/fsh/instances/device-imaging-example-1.fsh b/input/fsh/instances/device-imaging-example-1.fsh index 117e9e01..803f9f35 100644 --- a/input/fsh/instances/device-imaging-example-1.fsh +++ b/input/fsh/instances/device-imaging-example-1.fsh @@ -1,5 +1,5 @@ Instance: ips-example-imaging-1-of-Device -InstanceOf: Device +InstanceOf: DeviceObserverUvIps Title: "Device: device observer example" Description: "Device: device observer example" Usage: #example diff --git a/input/fsh/instances/deviceUseStatement-70-275-1.fsh b/input/fsh/instances/deviceUseStatement-70-275-1.fsh index 7255a235..d1e7c6e3 100644 --- a/input/fsh/instances/deviceUseStatement-70-275-1.fsh +++ b/input/fsh/instances/deviceUseStatement-70-275-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-70-275-1-of-DeviceUseStatement -InstanceOf: DeviceUseStatement +InstanceOf: DeviceUseStatementUvIps Title: "DeviceUseStatement: No known devices in use" Description: "DeviceUseStatement: No known devices in use" Usage: #example diff --git a/input/fsh/instances/imagingStudy-imaging-ex-5-1.fsh b/input/fsh/instances/imagingStudy-imaging-ex-5-1.fsh index fa3f413e..2980e6a7 100644 --- a/input/fsh/instances/imagingStudy-imaging-ex-5-1.fsh +++ b/input/fsh/instances/imagingStudy-imaging-ex-5-1.fsh @@ -1,5 +1,5 @@ Instance: TII-ImagingStudy-5-1 -InstanceOf: ImagingStudy +InstanceOf: ImagingStudyUvIps Title: "ImagingStudy: referred DICOM study" Description: "ImagingStudy: referred DICOM study" Usage: #example diff --git a/input/fsh/instances/observation-alcoholuse-1.fsh b/input/fsh/instances/observation-alcoholuse-1.fsh index 8dcacb5e..3bdd4866 100644 --- a/input/fsh/instances/observation-alcoholuse-1.fsh +++ b/input/fsh/instances/observation-alcoholuse-1.fsh @@ -1,5 +1,5 @@ Instance: alcohol-use-example -InstanceOf: Observation +InstanceOf: ObservationAlcoholUseUvIps Title: "Observation: SH alcohol use example" Description: "Observation: SH alcohol use example" Usage: #example diff --git a/input/fsh/instances/observation-hemoglobin.fsh b/input/fsh/instances/observation-hemoglobin.fsh index 5309c1d7..afde3498 100644 --- a/input/fsh/instances/observation-hemoglobin.fsh +++ b/input/fsh/instances/observation-hemoglobin.fsh @@ -1,5 +1,5 @@ Instance: hemoglobin-of-Observation -InstanceOf: Observation +InstanceOf: ObservationResultsLaboratoryPathologyUvIps Title: "Observation: hemoglobin example" Description: "Observation: hemoglobin example" Usage: #example diff --git a/input/fsh/instances/observation-imaging-example-1.fsh b/input/fsh/instances/observation-imaging-example-1.fsh index 05afaea7..e2a4800d 100644 --- a/input/fsh/instances/observation-imaging-example-1.fsh +++ b/input/fsh/instances/observation-imaging-example-1.fsh @@ -1,5 +1,5 @@ Instance: ips-example-imaging-1-of-Observation -InstanceOf: Observation +InstanceOf: ObservationResultsRadiologyUvIps Title: "Observation: imaging CT Abdomen W contrast IV" Description: "Observation: imaging CT Abdomen W contrast IV" Usage: #example diff --git a/input/fsh/instances/observation-imaging-example-4.fsh b/input/fsh/instances/observation-imaging-example-4.fsh index fd7ca140..0a40e241 100644 --- a/input/fsh/instances/observation-imaging-example-4.fsh +++ b/input/fsh/instances/observation-imaging-example-4.fsh @@ -1,5 +1,5 @@ Instance: ips-example-imaging-4 -InstanceOf: Observation +InstanceOf: ObservationResultsRadiologyUvIps Title: "Observation: imaging CT Abdomen W contrast IV, sub-observations" Description: "Observation: imaging CT Abdomen W contrast IV,sub-observations" Usage: #example diff --git a/input/fsh/instances/observation-pathology-cancer.fsh b/input/fsh/instances/observation-pathology-cancer.fsh index b1c00628..efe3757d 100644 --- a/input/fsh/instances/observation-pathology-cancer.fsh +++ b/input/fsh/instances/observation-pathology-cancer.fsh @@ -1,5 +1,5 @@ Instance: pathology-cancer -InstanceOf: Observation +InstanceOf: ObservationResultsLaboratoryPathologyUvIps Title: "Observation: estrogen receptor in tissue example" Description: "Observation: estrogen receptor in tissue example" Usage: #example diff --git a/input/fsh/instances/observation-pregnancy-edd-1.fsh b/input/fsh/instances/observation-pregnancy-edd-1.fsh index 67c8b9a0..d77def80 100644 --- a/input/fsh/instances/observation-pregnancy-edd-1.fsh +++ b/input/fsh/instances/observation-pregnancy-edd-1.fsh @@ -1,5 +1,5 @@ Instance: pregnancy-edd-example -InstanceOf: Observation +InstanceOf: ObservationPregnancyEddUvIps Title: "Observation: pregnancy edd example" Description: "Observation: pregnancy edd example" Usage: #example diff --git a/input/fsh/instances/observation-pregnancy-outcome-1.fsh b/input/fsh/instances/observation-pregnancy-outcome-1.fsh index 7f441487..9ce23ea1 100644 --- a/input/fsh/instances/observation-pregnancy-outcome-1.fsh +++ b/input/fsh/instances/observation-pregnancy-outcome-1.fsh @@ -1,5 +1,5 @@ Instance: pregnancy-outcome-example -InstanceOf: Observation +InstanceOf: ObservationPregnancyOutcomeUvIps Title: "Observation: pregnancy outcome example" Description: "Observation: pregnancy outcome example" Usage: #example diff --git a/input/fsh/instances/observation-pregnancy-status-1.fsh b/input/fsh/instances/observation-pregnancy-status-1.fsh index f36bd198..4fe02ba0 100644 --- a/input/fsh/instances/observation-pregnancy-status-1.fsh +++ b/input/fsh/instances/observation-pregnancy-status-1.fsh @@ -1,5 +1,5 @@ Instance: pregnancy-status-example -InstanceOf: Observation +InstanceOf: ObservationPregnancyStatusUvIps Title: "Observation: pregnancy status example" Description: "Observation: pregnancy status example" Usage: #example diff --git a/input/fsh/instances/observation-serum-creatinine-adult.fsh b/input/fsh/instances/observation-serum-creatinine-adult.fsh index dbf97fcb..b23edb25 100644 --- a/input/fsh/instances/observation-serum-creatinine-adult.fsh +++ b/input/fsh/instances/observation-serum-creatinine-adult.fsh @@ -1,5 +1,5 @@ Instance: serum-creatinine-adult -InstanceOf: Observation +InstanceOf: ObservationResultsLaboratoryPathologyUvIps Title: "Observation: serum creatinine example" Description: "Observation: serum creatinine example" Usage: #example diff --git a/input/fsh/instances/observation-tobaccouse-1.fsh b/input/fsh/instances/observation-tobaccouse-1.fsh index cf33f2df..2bf0ecf5 100644 --- a/input/fsh/instances/observation-tobaccouse-1.fsh +++ b/input/fsh/instances/observation-tobaccouse-1.fsh @@ -1,5 +1,5 @@ Instance: tobacco-use-example -InstanceOf: Observation +InstanceOf: ObservationTobaccoUseUvIps Title: "Observation: SH tobacco use example" Description: "Observation: SH tobacco use example" Usage: #example diff --git a/input/fsh/instances/observation-urine-wbc-range.fsh b/input/fsh/instances/observation-urine-wbc-range.fsh index 2c0359d4..f6e5fcc6 100644 --- a/input/fsh/instances/observation-urine-wbc-range.fsh +++ b/input/fsh/instances/observation-urine-wbc-range.fsh @@ -1,5 +1,5 @@ Instance: urine-wbc-range -InstanceOf: Observation +InstanceOf: ObservationResultsLaboratoryPathologyUvIps Title: "Observation: urine wbc range example" Description: "Observation: urine wbc range example" Usage: #example diff --git a/input/fsh/instances/organization-imaging-example-1.fsh b/input/fsh/instances/organization-imaging-example-1.fsh index 624b5080..6d4d2f2d 100644 --- a/input/fsh/instances/organization-imaging-example-1.fsh +++ b/input/fsh/instances/organization-imaging-example-1.fsh @@ -1,5 +1,5 @@ Instance: TII-Organization1 -InstanceOf: Organization +InstanceOf: OrganizationUvIps Title: "Organization: example" Description: "Organization: example" Usage: #example diff --git a/input/fsh/instances/organization-lab-example-1.fsh b/input/fsh/instances/organization-lab-example-1.fsh index 8c6276ab..845e945f 100644 --- a/input/fsh/instances/organization-lab-example-1.fsh +++ b/input/fsh/instances/organization-lab-example-1.fsh @@ -1,5 +1,5 @@ Instance: lab-org-example -InstanceOf: Organization +InstanceOf: OrganizationUvIps Title: "Organization: lab example" Description: "Best Hospital Lab Organization example" Usage: #example diff --git a/input/fsh/instances/patient-39-07-1.fsh b/input/fsh/instances/patient-39-07-1.fsh index 52d58192..b72710d0 100644 --- a/input/fsh/instances/patient-39-07-1.fsh +++ b/input/fsh/instances/patient-39-07-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-39-07-of-Patient -InstanceOf: Patient +InstanceOf: PatientUvIps Title: "Patient: male patient" Description: "Patient: male patient" Usage: #example diff --git a/input/fsh/instances/patient-example-female.fsh b/input/fsh/instances/patient-example-female.fsh index a0d3e75c..2c8da84f 100644 --- a/input/fsh/instances/patient-example-female.fsh +++ b/input/fsh/instances/patient-example-female.fsh @@ -1,5 +1,5 @@ Instance: patient-example-female -InstanceOf: Patient +InstanceOf: PatientUvIps Title: "Patient: female patient" Description: "Patient: female patient" Usage: #example diff --git a/input/fsh/instances/practictioner-39-07-1.fsh b/input/fsh/instances/practictioner-39-07-1.fsh index f83cbca9..9dd339b9 100644 --- a/input/fsh/instances/practictioner-39-07-1.fsh +++ b/input/fsh/instances/practictioner-39-07-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-39-07-of-Practitioner -InstanceOf: Practitioner +InstanceOf: PractitionerUvIps Title: "Practitioner example" Description: "Practitioner example" Usage: #example diff --git a/input/fsh/instances/procedure-39-07-1.fsh b/input/fsh/instances/procedure-39-07-1.fsh index bb7ed286..5d23eb5d 100644 --- a/input/fsh/instances/procedure-39-07-1.fsh +++ b/input/fsh/instances/procedure-39-07-1.fsh @@ -1,5 +1,5 @@ Instance: eumfh-39-07-1-of-Procedure -InstanceOf: Procedure +InstanceOf: ProcedureUvIps Title: "Procedure: Surgical procedure" Description: "Procedure: Surgical procedure" Usage: #example diff --git a/input/fsh/instances/specimen-example-1.fsh b/input/fsh/instances/specimen-example-1.fsh index c38b4a81..fc3cebf8 100644 --- a/input/fsh/instances/specimen-example-1.fsh +++ b/input/fsh/instances/specimen-example-1.fsh @@ -1,5 +1,5 @@ Instance: specimen-example-1 -InstanceOf: Specimen +InstanceOf: SpecimenUvIps Title: "Specimen: example" Description: "Specimen: example" Usage: #example diff --git a/sushi-config.yaml b/sushi-config.yaml index 8eac972c..74136dc1 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -42,124 +42,3 @@ menu: Downloads: downloads.html Copyrights: copyrights.html Change Log: changes.html -resources: - AllergyIntolerance/eumfh-39-07-1: - name: 'AllergyIntolerance: No known allergies' - description: 'AllergyIntolerance: No known allergies' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips - AllergyIntolerance/allergyintolerance-with-abatement: - name: 'AllergyIntolerance: resolved allergy' - description: 'AllergyIntolerance: resolved allergy' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips - AllergyIntolerance/allergyintolerance-multiple-codings: - name: 'AllergyIntolerance: multiple codings' - description: 'AllergyIntolerance: multiple codings' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/AllergyIntolerance-uv-ips - Condition/eumfh-39-07-1: - name: 'Condition: Acute myocardial infarction of anterior wall' - description: 'Condition: Acute myocardial infarction of anterior wall' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Condition-uv-ips - Procedure/eumfh-39-07-1: - name: 'Procedure: Surgical procedure' - description: 'Procedure: Surgical procedure' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Procedure-uv-ips - Practitioner/eumfh-39-07: - name: 'Practitioner example' - description: 'Practitioner example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Practitioner-uv-ips - PractitionerRole/simple-pr: - name: 'PractitionerRole: simple example' - description: 'Very Simple PractitionerRole example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/PractitionerRole-uv-ips - Patient/eumfh-39-07: - name: 'Patient: male patient' - description: 'Patient: male patient' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips - Patient/66033: - name: 'Patient: minimal example' - description: 'Patient: minimal example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips - Patient/patient-example-female: - name: 'Patient: female patient' - description: 'Patient: female patient' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Patient-uv-ips - DeviceUseStatement/eumfh-70-275-1: - name: 'DeviceUseStatement: No known devices in use' - description: 'DeviceUseStatement: No known devices in use' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/DeviceUseStatement-uv-ips - Device/eumfh-70-275-1: - name: 'Device: No known devices in use' - description: 'Device: No known devices in use' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Device-uv-ips - Device/ips-example-imaging-1: - name: 'Device: device observer example' - description: 'Device: device observer example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Device-observer-uv-ips - Observation/ips-example-imaging-1: - name: 'Observation: imaging CT Abdomen W contrast IV' - description: 'Observation: imaging CT Abdomen W contrast IV' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-radiology-uv-ips - Observation/ips-example-imaging-4: - name: 'Observation: imaging CT Abdomen W contrast IV, sub-observations' - description: 'Observation: imaging CT Abdomen W contrast IV,sub-observations' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-radiology-uv-ips - ImagingStudy/TII-ImagingStudy-5-1: - name: 'ImagingStudy: referred DICOM study' - description: 'ImagingStudy: referred DICOM study' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/ImagingStudy-uv-ips - Organization/TII-Organization1: - name: 'Organization: example' - description: 'Organization: example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips - Organization/simple-org: - name: 'Organization: simple example' - description: 'Very Simple Organization example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips - Organization/lab-org-example: - name: 'Organization: lab example' - description: 'Best Hospital Lab Organization example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Organization-uv-ips - Observation/pregnancy-edd-example: - name: 'Observation: pregnancy edd example' - description: 'Observation: pregnancy edd example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-edd-uv-ips - Observation/pregnancy-status-example: - name: 'Observation: pregnancy status example' - description: 'Observation: pregnancy status example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-status-uv-ips - Observation/pregnancy-outcome-example: - name: 'Observation: pregnancy outcome example' - description: 'Observation: pregnancy outcome example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-pregnancy-outcome-uv-ips - Observation/tobacco-use-example: - name: 'Observation: SH tobacco use example' - description: 'Observation: SH tobacco use example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-tobaccouse-uv-ips - Observation/alcohol-use-example: - name: 'Observation: SH alcohol use example' - description: 'Observation: SH alcohol use example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-alcoholuse-uv-ips - Specimen/specimen-example-1: - name: 'Specimen: example' - description: 'Specimen: example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Specimen-uv-ips - Observation/serum-creatinine-adult: - name: 'Observation: serum creatinine example' - description: 'Observation: serum creatinine example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips - Observation/hemoglobin: - name: 'Observation: hemoglobin example' - description: 'Observation: hemoglobin example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips - Observation/urine-wbc-range: - name: 'Observation: urine wbc range example' - description: 'Observation: urine wbc range example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips - Observation/pathology-cancer: - name: 'Observation: estrogen receptor in tissue example' - description: 'Observation: estrogen receptor in tissue example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/Observation-results-laboratory-pathology-uv-ips - DiagnosticReport/hemoglobin: - name: 'DiagnosticReport: hemoglobin example' - description: 'DiagnosticReport: hemoglobin example' - exampleCanonical: http://hl7.org/fhir/uv/ips/StructureDefinition/DiagnosticReport-uv-ips From 1dc3ca51985d181b79fb04b2027d649671b78d33 Mon Sep 17 00:00:00 2001 From: ritikarawlani <38657562+ritikarawlani@users.noreply.github.com> Date: Wed, 14 Aug 2024 20:04:20 +0530 Subject: [PATCH 7/7] sync to fhir ips master --- .github/workflows/fhirbuild.yml | 23 -------- .github/workflows/ghbuild.yml | 23 -------- input/fsh/instances/bundle-minimal.fsh | 75 +++++++++++++------------- sushi-config.yaml | 19 ++++--- 4 files changed, 46 insertions(+), 94 deletions(-) delete mode 100644 .github/workflows/fhirbuild.yml delete mode 100644 .github/workflows/ghbuild.yml diff --git a/.github/workflows/fhirbuild.yml b/.github/workflows/fhirbuild.yml deleted file mode 100644 index 15fadec1..00000000 --- a/.github/workflows/fhirbuild.yml +++ /dev/null @@ -1,23 +0,0 @@ -# This workflow reuses the openHIE GitHub action for building IGs -# Initial idea by Carl Leitner, developed by Elliot Silver, available from: https://www.argentixinfo.com/archives/156 -# Change log: -# v0.1.0 -# 2021-06-18: publish default branches to / , other branches branches/ -# 2021-11-26: reusable workflow - -name: FHIR CI Build - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events for any main branch - push: - branches-ignore: - - 'gh-pages' - pull_request: - - workflow_dispatch: - -jobs: - # This workflow contains a single job called "build" - call_build: - uses: WorldHealthOrganization/smart-base/.github/workflows/fhirbuild.yml@main diff --git a/.github/workflows/ghbuild.yml b/.github/workflows/ghbuild.yml deleted file mode 100644 index 575defd4..00000000 --- a/.github/workflows/ghbuild.yml +++ /dev/null @@ -1,23 +0,0 @@ -# This workflow reuses the openHIE GitHub action for building IGs -# Initial idea by Carl Leitner, developed by Elliot Silver, available from: https://www.argentixinfo.com/archives/156 -# Change log: -# v0.1.0 -# 2021-06-18: publish default branches to / , other branches branches/ -# 2021-11-26: reusable workflow - -name: GitHub Pages build - -# Controls when the action will run. -on: - # Triggers the workflow on push or pull request events for any main branch - push: - branches-ignore: - - 'gh-pages' - pull_request: - - workflow_dispatch: - -jobs: - # This workflow contains a single job called "build" - call_build: - uses: WorldHealthOrganization/smart-base/.github/workflows/ghbuild.yml@main diff --git a/input/fsh/instances/bundle-minimal.fsh b/input/fsh/instances/bundle-minimal.fsh index b804a36b..db16f5b9 100644 --- a/input/fsh/instances/bundle-minimal.fsh +++ b/input/fsh/instances/bundle-minimal.fsh @@ -8,40 +8,40 @@ Usage: #example * identifier.value = "28b95815-76ce-457b-b7ae-a972e527db40" * type = #document * timestamp = "2020-12-11T14:30:00+01:00" -* entry[0].fullUrl = "urn:uuid:6e1fb74a-742b-4c7b-8487-171dacb88766" -* entry[=].resource = 6e1fb74a-742b-4c7b-8487-171dacb88766 -* entry[+].fullUrl = "urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94" -* entry[=].resource = 7685713c-e29e-4a75-8a90-45be7ba3be94 -* entry[+].fullUrl = "urn:uuid:98315ba9-ffea-41ef-b59b-a836c039858f" -* entry[=].resource = 98315ba9-ffea-41ef-b59b-a836c039858f -* entry[+].fullUrl = "urn:uuid:bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d" -* entry[=].resource = bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d -* entry[+].fullUrl = "urn:uuid:ad84b7a2-b4dd-474e-bef3-0779e6cb595f" -* entry[=].resource = ad84b7a2-b4dd-474e-bef3-0779e6cb595f -* entry[+].fullUrl = "urn:uuid:6e883e5e-7648-485a-86de-3640a61601fe" -* entry[=].resource = 6e883e5e-7648-485a-86de-3640a61601fe -* entry[+].fullUrl = "urn:uuid:6369a973-afc7-4617-8877-3e9811e05a5b" -* entry[=].resource = 6369a973-afc7-4617-8877-3e9811e05a5b -* entry[+].fullUrl = "urn:uuid:fe2769fd-22c9-4307-9122-ee0466e5aebb" -* entry[=].resource = fe2769fd-22c9-4307-9122-ee0466e5aebb +* entry[0].fullUrl = "urn:uuid:f40b07e3-37e8-48c3-bf1c-ae70fe12dab0" +* entry[=].resource = f40b07e3-37e8-48c3-bf1c-ae70fe12dab0 +* entry[+].fullUrl = "urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad" +* entry[=].resource = 244ad7c3-beeb-41d1-8a2f-c76b8cf720ad +* entry[+].fullUrl = "urn:uuid:45271f7f-63ab-4946-970f-3daaaa06637f" +* entry[=].resource = 45271f7f-63ab-4946-970f-3daaaa06637f +* entry[+].fullUrl = "urn:uuid:a21fe796-3594-4ad9-a01e-cc83118ceca9" +* entry[=].resource = a21fe796-3594-4ad9-a01e-cc83118ceca9 +* entry[+].fullUrl = "urn:uuid:d179321e-c091-4cd4-8642-3a27537d506d" +* entry[=].resource = d179321e-c091-4cd4-8642-3a27537d506d +* entry[+].fullUrl = "urn:uuid:e1271efd-18ff-4654-9ee7-45f40019c453" +* entry[=].resource = e1271efd-18ff-4654-9ee7-45f40019c453 +* entry[+].fullUrl = "urn:uuid:95db7c92-566a-4ded-896b-2220ab244a9e" +* entry[=].resource = 95db7c92-566a-4ded-896b-2220ab244a9e +* entry[+].fullUrl = "urn:uuid:74861316-f69d-4652-9fb1-8512a20c7927" +* entry[=].resource = 74861316-f69d-4652-9fb1-8512a20c7927 -Instance: 6e1fb74a-742b-4c7b-8487-171dacb88766 +Instance: f40b07e3-37e8-48c3-bf1c-ae70fe12dab0 InstanceOf: Composition Usage: #inline * status = #final * type = $loinc#60591-5 "Patient summary Document" -* subject = Reference(urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94) +* subject = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad) * date = "2020-12-11T14:30:00+01:00" -* author = Reference(urn:uuid:98315ba9-ffea-41ef-b59b-a836c039858f) +* author = Reference(urn:uuid:45271f7f-63ab-4946-970f-3daaaa06637f) * title = "Patient Summary as of December 11, 2020 14:30" * confidentiality = #N * attester[0].mode = #legal * attester[=].time = "2020-12-11T14:30:00+01:00" -* attester[=].party = Reference(urn:uuid:98315ba9-ffea-41ef-b59b-a836c039858f) +* attester[=].party = Reference(urn:uuid:45271f7f-63ab-4946-970f-3daaaa06637f) * attester[+].mode = #legal * attester[=].time = "2020-12-11T14:30:00+01:00" -* attester[=].party = Reference(urn:uuid:bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d) -* custodian = Reference(urn:uuid:bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d) +* attester[=].party = Reference(urn:uuid:a21fe796-3594-4ad9-a01e-cc83118ceca9) +* custodian = Reference(urn:uuid:a21fe796-3594-4ad9-a01e-cc83118ceca9) * relatesTo.code = #appends * relatesTo.targetIdentifier.system = "urn:oid:2.16.724.4.8.10.200.10" * relatesTo.targetIdentifier.value = "20e12ce3-857f-49c0-b888-cb670597f191" @@ -51,19 +51,19 @@ Usage: #inline * section[=].code = $loinc#11450-4 "Problem list - Reported" * section[=].text.status = #generated * section[=].text.div = "
  • Condition Name: Menopausal Flushing
    Code: 198436008
    Status: Active
" -* section[=].entry = Reference(urn:uuid:ad84b7a2-b4dd-474e-bef3-0779e6cb595f) +* section[=].entry = Reference(urn:uuid:d179321e-c091-4cd4-8642-3a27537d506d) * section[+].title = "Medication" * section[=].code = $loinc#10160-0 "History of Medication use Narrative" * section[=].text.status = #generated * section[=].text.div = "
  • Medication Name: Oral anastrozole 1mg tablet
    Code:
    Status: Active, started March 2015
    Instructions: Take 1 time per day
" -* section[=].entry = Reference(urn:uuid:6e883e5e-7648-485a-86de-3640a61601fe) +* section[=].entry = Reference(urn:uuid:e1271efd-18ff-4654-9ee7-45f40019c453) * section[+].title = "Allergies and Intolerances" * section[=].code = $loinc#48765-2 "Allergies and adverse reactions Document" * section[=].text.status = #generated * section[=].text.div = "
  • Allergy Name: Pencillins
    Verification Status: Confirmed
    Reaction: no information
" -* section[=].entry = Reference(urn:uuid:fe2769fd-22c9-4307-9122-ee0466e5aebb) +* section[=].entry = Reference(urn:uuid:74861316-f69d-4652-9fb1-8512a20c7927) -Instance: 7685713c-e29e-4a75-8a90-45be7ba3be94 +Instance: 244ad7c3-beeb-41d1-8a2f-c76b8cf720ad InstanceOf: Patient Usage: #inline * identifier.system = "urn:oid:2.16.840.1.113883.2.4.6.3" @@ -91,7 +91,7 @@ Usage: #inline * contact.address.postalCode = "69001" * contact.address.country = "FR" -Instance: 98315ba9-ffea-41ef-b59b-a836c039858f +Instance: 45271f7f-63ab-4946-970f-3daaaa06637f InstanceOf: Practitioner Usage: #inline * identifier.system = "urn:oid:2.16.528.1.1007.3.1" @@ -103,7 +103,7 @@ Usage: #inline * qualification.code.coding.version = "2.7" * qualification.code.coding = $v2-0360#MD "Doctor of Medicine" -Instance: bb6bdf4f-7fcb-4d44-96a5-b858ad031d1d +Instance: a21fe796-3594-4ad9-a01e-cc83118ceca9 InstanceOf: Organization Usage: #inline * identifier.system = "urn:oid:2.16.528.1.1007.3.3" @@ -119,7 +119,7 @@ Usage: #inline * address.postalCode = "3311 CE" * address.country = "NL" -Instance: ad84b7a2-b4dd-474e-bef3-0779e6cb595f +Instance: d179321e-c091-4cd4-8642-3a27537d506d InstanceOf: Condition Usage: #inline * identifier.system = "urn:oid:1.2.3.999" @@ -135,25 +135,25 @@ Usage: #inline * code.coding[=].display.extension.extension[=].valueString = "opvliegers" * code.coding[=].display.extension.url = "http://hl7.org/fhir/StructureDefinition/translation" * code.coding[+] = $icd-10#N95.1 "Menopausal and female climacteric states" -* subject = Reference(urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94) +* subject = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad) * onsetDateTime = "2015" * recordedDate = "2016-10" -Instance: 6e883e5e-7648-485a-86de-3640a61601fe +Instance: e1271efd-18ff-4654-9ee7-45f40019c453 InstanceOf: MedicationStatement Usage: #inline * identifier.system = "urn:oid:1.2.3.999" * identifier.value = "8faf0319-89d3-427c-b9d1-e8c8fd390dca" * status = #active -* medicationReference = Reference(urn:uuid:6369a973-afc7-4617-8877-3e9811e05a5b) -* subject = Reference(urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94) +* medicationReference = Reference(urn:uuid:95db7c92-566a-4ded-896b-2220ab244a9e) +* subject = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad) * effectivePeriod.start = "2015-03" * dosage.timing.repeat.count = 1 * dosage.timing.repeat.periodUnit = #d * dosage.route = $standardterms#20053000 "Oral use" * dosage.doseAndRate.doseQuantity = 1 '1' "tablet" -Instance: 6369a973-afc7-4617-8877-3e9811e05a5b +Instance: 95db7c92-566a-4ded-896b-2220ab244a9e InstanceOf: Medication Usage: #inline * code.coding[0] = $sct#108774000 "Product containing anastrozole (medicinal product)" @@ -161,7 +161,7 @@ Usage: #inline * code.coding[+] = urn:oid:2.16.840.1.113883.2.4.4.7#2076667 "ANASTROZOL CF TABLET FILMOMHULD 1MG" * code.coding[+] = $atc#L02BG03 "anastrozole" -Instance: fe2769fd-22c9-4307-9122-ee0466e5aebb +Instance: 74861316-f69d-4652-9fb1-8512a20c7927 InstanceOf: AllergyIntolerance Usage: #inline * identifier.system = "urn:oid:1.2.3.999" @@ -172,6 +172,5 @@ Usage: #inline * category = #medication * criticality = #high * code = $sct#373270004 "Substance with penicillin structure and antibacterial mechanism of action (substance)" -* patient = Reference(urn:uuid:7685713c-e29e-4a75-8a90-45be7ba3be94) -* onsetDateTime = "2010" - +* patient = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad) +* onsetDateTime = "2010" \ No newline at end of file diff --git a/sushi-config.yaml b/sushi-config.yaml index 74136dc1..23483b8a 100644 --- a/sushi-config.yaml +++ b/sushi-config.yaml @@ -25,20 +25,19 @@ menu: Home: index.html Table of Contents: toc.html General Principles and Design: - General Principles: principles.html - Design Conventions: design.html - Generation and Data Inclusion: ipsGeneration.html - Privacy and Security Considerations: considerations.html - Known Issues and Future Development: knownIssues.html - The "IPS": ipsStructure.html + General Principles: General-Principles.html + Design Conventions: Design-Conventions.html + Generation and Data Inclusion: Generation-and-Data-Inclusion.html + Privacy and Security Considerations: Privacy-and-Security-Considerations.html + Known Issues and Future Development: Known-Issues-and-Future-Development.html + The "IPS": Structure-of-the-International-Patient-Summary.html FHIR Artifacts: - The IPS Composition: StructureDefinition-Composition-uv-ips.html - IPS Library: profiles.html + IPS Composition: StructureDefinition-Composition-uv-ips.html + IPS Library (Profiles): profiles.html Datatypes: datatypes.html - Extensions: extensions.html Terminology: terminology.html Operations: OperationDefinition-summary.html Examples: examples.html Downloads: downloads.html Copyrights: copyrights.html - Change Log: changes.html + Change Log: changes.html \ No newline at end of file