HL7 · ritikarawlani · Jul 31, 2024 · Jul 31, 2024 · Aug 14, 2024 · Aug 14, 2024
diff --git 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/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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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/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
@@ -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
@@ -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-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
@@ -173,5 +173,4 @@ Usage: #inline
 * criticality = #high
 * code = $sct#373270004 "Substance with penicillin structure and antibacterial mechanism of action (substance)"
 * patient = Reference(urn:uuid:244ad7c3-beeb-41d1-8a2f-c76b8cf720ad)
-* onsetDateTime = "2010"
-
+* onsetDateTime = "2010"
diff --git 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/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
@@ -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 = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><ul><li><div><b>Condition Name</b>: Acute myocardial infarction of anterior wall</div><div><b>Code</b>: <span>54329005</span></div><div><b>Status</b>: <span>Active</span></div></li></ul></div>"
-* 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 = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><ul><li><div><b>Medication Name</b>: Simvastatin 40 MG Disintegrating Oral Tablet</div><div><b>Code</b>: <span>C10AA01</span></div><div><b>Status</b>: <span>Active, started 2014</span></div><div>Instructions: Take 40 mg/day</div></li></ul></div>"
-* 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 = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><ul><li><div><b>Allergy Name</b>: No known allergies</div><div><b>Verification Status</b>: Confirmed</div><div><b>Reaction</b>: <span>no information</span></div></li></ul></div>"
-* section[=].entry = Reference(AllergyIntolerance/eumfh-39-07-1)
+* section[sectionProblems].title = "Active Problems"
+* section[sectionProblems].code = $loinc#11450-4 "Problem list - Reported"
+* section[sectionProblems].text.status = #generated
+* section[sectionProblems].text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><ul><li><div><b>Condition Name</b>: Acute myocardial infarction of anterior wall</div><div><b>Code</b>: <span>54329005</span></div><div><b>Status</b>: <span>Active</span></div></li></ul></div>"
+* 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 = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><ul><li><div><b>Medication Name</b>: Simvastatin 40 MG Disintegrating Oral Tablet</div><div><b>Code</b>: <span>C10AA01</span></div><div><b>Status</b>: <span>Active, started 2014</span></div><div>Instructions: Take 40 mg/day</div></li></ul></div>"
+* 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 = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><ul><li><div><b>Allergy Name</b>: No known allergies</div><div><b>Verification Status</b>: Confirmed</div><div><b>Reaction</b>: <span>no information</span></div></li></ul></div>"
+* section[sectionAllergies].entry = Reference(AllergyIntolerance/eumfh-39-07-1)
diff --git 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

diff --git 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
@@ -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
@@ -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
@@ -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/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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 Instance: specimen-example-1
-InstanceOf: Specimen
+InstanceOf: SpecimenUvIps
 Title: "Specimen: example"
 Description: "Specimen: example"
 Usage: #example