IHE · dvribeira · May 7, 2026 · Apr 23, 2026 · Apr 23, 2026 · May 7, 2026
diff --git a/input/fsh/models/DeviceBasic.fsh b/input/fsh/models/DeviceBasic.fsh
@@ -0,0 +1,8 @@
+Logical: DeviceBasic
+Title: "Device (model)"
+Description: "Logical model for a device (basic data relevant for the IHE MPD use cases)"
+Characteristics: #can-be-target
+* identifier 0..* Identifier "Identifiers for a device"
+* name 0..* BackboneElement "The name or names of the device as known to the manufacturer and/or patient"
+  * value 1..1 string "The term that names the device"
+  * type 1..1 code "The type of name"
diff --git a/input/fsh/models/IHEMedicationDispense.fsh b/input/fsh/models/IHEMedicationDispense.fsh
@@ -6,8 +6,8 @@ Characteristics: #can-be-target
 
 * identifier 0..* Identifier "Identifier for the dispense"
 * patient 1..1 Reference(PatientBasic) "The person for whom the medication is prescribed/ordered"
-* receiver 0..1 Reference( PatientBasic or PractitionerBasic or RelatedPerson or PractitionerRole) "Identification of the person who received the dispensed medication, especially when it was not the patient"
-* dispenser 1..1 Reference(PractitionerBasic or Organization or Device) "The person who dispensed the product, and takes the responsibility of the dispensation" //TODO not all models exist, references FHIR resources
+* receiver 0..1 Reference( PatientBasic or PractitionerBasic or RelatedPersonBasic or PractitionerRoleBasic) "Identification of the person who received the dispensed medication, especially when it was not the patient"
+* dispenser 1..1 Reference(PractitionerBasic or OrganizationBasic or DeviceBasic) "The person who dispensed the product, and takes the responsibility of the dispensation" //TODO not all models exist, references FHIR resources
 * relatedRequest 0..* Reference(IHEMedicationOrderModel) "Prescription/request/order the dispense is related to"
 * medication 1..1 Reference(MedicinalProductModel) "Exact dispensed product"
 * dispensedQuantity 1..1 Quantity "Number of dispensed packages if the pack size is known, or number of smaller items/units"

diff --git a/input/fsh/models/IHEMedicationOrderModel.fsh b/input/fsh/models/IHEMedicationOrderModel.fsh
@@ -8,13 +8,13 @@ Description: "Logical model for medication prescription or other types of medica
 
 * identifier 1..* Identifier "Business identifier(s) for the prescription"
 //1
-* prescriber 1..1 Reference(PractitionerBasic or PractitionerRole) "The person who made the prescription, and who takes the responsibility of the treatment" "Question: would we want to add basic Practicioner model?"
+* prescriber 1..1 Reference(PractitionerBasic or PractitionerRoleBasic) "The person who made the prescription, and who takes the responsibility of the treatment" "Question: would we want to add basic Practicioner model?"
 //2
 * issueDate 1..1 dateTime "Time of issuing (signing) the prescription by health care practicioner"
 //3
 * patient 1..1 Reference(PatientBasic) "The person for whom the medication is prescribed/ordered" "Question: would we want to add basic Patient model?"
 //4
-* recorder 0..1 Reference(PractitionerBasic or PractitionerRole) "The recorder of the prescription/draft in the information system"
+* recorder 0..1 Reference(PractitionerBasic or PractitionerRoleBasic) "The recorder of the prescription/draft in the information system"
 //8
 * recordingDate 0..1 dateTime "Time of authoring the prescription/draft in the information system"
 //9

diff --git a/input/fsh/models/IHEMultilineOrderModel.fsh b/input/fsh/models/IHEMultilineOrderModel.fsh
@@ -8,10 +8,10 @@ Description: "Logical model for multiline medication prescription"
 //1
 * patient 1..1 Reference(PatientBasic) "The person for whom the medication is prescribed/ordered" "Question: would we want to add basic Patient model?"
 //4
-* prescriber 1..1 Reference(PractitionerBasic or PractitionerRole) "The person who made the prescription, and who takes the responsibility of the treatment" "Question: would we want to add basic Practicioner model?"
+* prescriber 1..1 Reference(PractitionerBasic or PractitionerRoleBasic) "The person who made the prescription, and who takes the responsibility of the treatment" "Question: would we want to add basic Practicioner model?"
 //2
 * issueDate 1..1 dateTime "Time of issuing (signing) the prescription by health care practicioner"
-* recorder 0..1 Reference(PractitionerBasic or PractitionerRole) "The recorder of the prescription/draft in the information system"
+* recorder 0..1 Reference(PractitionerBasic or PractitionerRoleBasic) "The recorder of the prescription/draft in the information system"
 //8
 * recordingDate 0..1 dateTime "Time of authoring the prescription/draft in the information system"
 //9

diff --git a/input/fsh/models/MedicinalProductModel.fsh b/input/fsh/models/MedicinalProductModel.fsh
@@ -28,7 +28,7 @@ Characteristics: #can-be-target
   * amount 0..1 Quantity "Number of such manufactured items in this product (5 vials)"
 * device 0..* Base "Administration device included in the product"
   * deviceQuantity 1..1 Quantity "Number of such devices"
-  * device[x] 1..1 CodeableConcept or Reference(Device) "Device coded"
+  * device[x] 1..1 CodeableConcept or Reference(DeviceBasic) "Device coded"
 * characteristic 0..* Base "Other features of the product"
   * type 1..1 CodeableConcept "A code expressing the type of characteristic"
   * value[x] 0..1 boolean or CodeableConcept or string or Quantity or dateTime or unsignedInt or decimal or Ratio "Description of the characteristic"

diff --git a/input/fsh/models/OrganizationBasic.fsh b/input/fsh/models/OrganizationBasic.fsh
@@ -0,0 +1,7 @@
+Logical: OrganizationBasic
+Title: "Organization (model)"
+Description: "Logical model for an organization (basic data relevant for IHE MPD use cases)"
+Characteristics: #can-be-target
+* identifier 0..* Identifier "Identifiers for an organization"
+* type 0..* CodeableConcept "Type of organization"
+* name 0..1 string "Name used for the organization"
diff --git a/input/fsh/models/PractitionerRoleBasic.fsh b/input/fsh/models/PractitionerRoleBasic.fsh
@@ -0,0 +1,8 @@
+Logical: PractitionerRoleBasic
+Title: "Practitioner role (model)"
+Description: "Logical model for a practitioner role within an organization (basic data relevant for this use case)"
+Characteristics: #can-be-target
+* identifier 0..* Identifier "Identifiers for a role"
+* practitioner 1..1 Reference(PractitionerBasic) "Practitioner that provide services for the organization"
+* organization 0..1 Reference(OrganizationBasic) "Organization where the roles are available"
+* role 0..* CodeableConcept "Roles which this practitioner may perform"
diff --git a/input/fsh/models/RelatedPersonBasic.fsh b/input/fsh/models/RelatedPersonBasic.fsh
@@ -0,0 +1,8 @@
+Logical: RelatedPersonBasic
+Title: "Related person (model)"
+Description: "Logical model for a related person with basic data relevant to the IHE MPD use cases."
+Characteristics: #can-be-target
+* identifier 0..* Identifier "Human identifier for this person"
+* patient 1..1 Reference(PatientBasic) "The patient this person is related to"
+* relationship 0..* CodeableConcept "The relationship of the related person to the patient"
+* name 0..* HumanName "A name associated with this person"