Fhir 51275 and FHIR-51287

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
     "cSpell.words": [
         "EDQM",
+        "EHDS",
         "LOINC",
         "UCUM",
         "WADO",

input/fsh/actors/creator.fsh

@@ -0,0 +1,10 @@
+Instance: ImReportCreator
+InstanceOf: ActorDefinition
+Title: "Imaging Study Report Creator"
+Description: "The actor responsible for creating the Imaging Report resources. Typically this role is combined with the ImReportProvider."
+Usage: #definition
+* name = "ImReportCreator"
+* title = "Imaging study report creator"
+* status = #draft
+* description = "Creates Imaging study reports."
+* type = #system

input/fsh/actors/provider.fsh

@@ -0,0 +1,67 @@
+Instance: ImReportProvider
+InstanceOf: ActorDefinition
+Title: "Imaging Study Report Provider"
+Description: "The actor responsible for providing the Imaging Report resources."
+Usage: #definition
+* name = "ImReportProvider"
+* title = "Imaging study report provider"
+* status = #draft
+* description = "Provides the Imaging study report."
+* documentation = """
+This actor typically represents a system that provides access to radiology reports. Typically this would be systems like a Electronic Health Record (EHR), Radiology Information System (RIS) or a Picture Archiving and Communication System (PACS) that manages and provides access to imaging reports.
+"""
+* type = #system
+
+// Instance: ImReportProviderCapabilityStatement
+// InstanceOf: CapabilityStatement
+// Title: "Imaging Study Report Provider Capability Statement"
+// Description: "Capability Statement for an Imaging Study Report Provider."
+// Usage: #definition
+// * name = "ImReportProviderCapabilityStatement"
+// * title = "Imaging Study Report Provider Capability Statement"
+// * status = #draft
+// * description = "Capability Statement for an Imaging Study Report Provider."
+// * date = 2025-09-10 // YYYY-MM-DD
+// * publisher = "HL7 EU"
+// // * actorDefinition = Reference(ImReportProvider)
+// * kind = #requirements
+// * fhirVersion = #5.0.0
+// * format = #json
+// * rest[+]
+//   * mode = #server
+//   * resource[+]
+//     * type = #Composition
+//     * profile = Canonical(ImComposition)
+//     * interaction[+]
+//       * code = #read
+//       * code = #search-type
+//     * operation[+]
+//       * name = "document"
+//       * definition = "https://hl7.org/fhir/composition-operation-document.html"
+//   * resource[+]
+//     * type = #DiagnosticReport
+//     * profile = Canonical(ImDiagnosticReport)
+//     * interaction[+]
+//       * code = #read
+//       * code = #search-type
+//     * operation[+]
+//       * name = "document"
+//       * definition = Canonical(DiagnosticReport-fhir-report)
+//   * resource[+]
+//     * type = #ImagingStudy
+//     * profile = Canonical(ImImagingStudy)
+//     * interaction[+]
+//       * code = #read
+//       * code = #search-type
+//   * resource[+]
+//     * type = #Patient
+//     * profile = Canonical(ImDiagnosticReport)
+//     * interaction[+]
+//       * code = #read
+//       * code = #search-type
+//   * resource[+]
+//     * type = #DocumentReference
+//     * profile = Canonical(ImReportDocumentReference)
+//     * interaction[+]
+//       * code = #read
+//       * code = #search-type

input/fsh/alias-euroProfiles.fsh

@@ -7,38 +7,38 @@ Alias: $EuAddressUrl           = http://hl7.eu/fhir/base-r5/StructureDefinition/
 Alias: $EuAppointment          = Appointment
 Alias: $EuAppointmentUrl       = http://hl7.org/fhir/StructureDefinition/Appointment
 
-Alias: $EuAllergyIntolerance    = AllergyIntoleranceEu
-Alias: $EuAllergyIntoleranceUrl = http://hl7.eu/fhir/imaging-r5/StructureDefinition/AllergyIntoleranceEu
+Alias: $EuAllergyIntolerance    = AllergyIntolerance
+Alias: $EuAllergyIntoleranceUrl = http://hl7.org/fhir/StructureDefinition/Appointment/AllergyIntolerance
 
 Alias: $EuAttachment           = Attachment
 Alias: $EuAttachmentUrl        = http://hl7.org/fhir/StructureDefinition/Attachment
 
-Alias: $EuBodyStructure        = BodyStructureEu
-Alias: $EuBodyStructureUrl     = http://hl7.eu/fhir/imaging-r5/StructureDefinition/BodyStructureEu
+Alias: $EuBodyStructure        = BodyStructure
+Alias: $EuBodyStructureUrl     = http://hl7.org/fhir/StructureDefinition/BodyStructure
 
-Alias: $EuCondition            = ConditionEu
-Alias: $EuConditionUrl         = http://hl7.eu/fhir/imaging-r5/StructureDefinition/ConditionEu
+Alias: $EuCondition            = Condition
+Alias: $EuConditionUrl         = http://hl7.org/fhir/StructureDefinition/Condition
 
 Alias: $EuCoverage             = Coverage
 Alias: $EuCoverageUrl          = http://hl7.org/fhir/StructureDefinition/Coverage
 
-Alias: $EuCarePlan             = CarePlanEu
-Alias: $EuCarePlanUrl          = http://hl7.eu/fhir/imaging-r5/StructureDefinition/CarePlanEu
+Alias: $EuCarePlan             = CarePlan
+Alias: $EuCarePlanUrl          = http://hl7.eu/fhir/StructureDefinition/CarePlan
 
 Alias: $EuContactPoint         = ContactPoint
 Alias: $EuContactPointUrl      = http://hl7.org/fhir/StructureDefinition/ContactPoint
 
 Alias: $EuDevice               = Device
 Alias: $EuDeviceUrl            = http://hl7.org/fhir/StructureDefinition/Device
 
-Alias: $EuDocumentReference    = DocumentReferenceEu
+Alias: $EuDocumentReference    = DocumentReference
 Alias: $EuDocumentReferenceUrl = http://hl7.org/fhir/StructureDefinition/DocumentReference
 
-Alias: $EuEncounter            = EncounterEu
-Alias: $EuEncounterUrl         = http://hl7.eu/fhir/imaging-r5/StructureDefinition/EncounterEu
+Alias: $EuEncounter            = Encounter
+Alias: $EuEncounterUrl         = http://hl7.org/fhir/StructureDefinition/Encounter
 
-Alias: $EuEndpoint             = EndpointEu
-Alias: $EuEndpointUrl          = http://hl7.eu/fhir/imaging-r5/StructureDefinition/EndpointEu
+Alias: $EuEndpoint             = Endpoint
+Alias: $EuEndpointUrl          = http://hl7.org/fhir/StructureDefinition/Endpoint
 
 Alias: $EuHumanName            = HumanName
 Alias: $EuHumanNameUrl         = http://hl7.org/fhir/StructureDefinition/HumanName
@@ -52,11 +52,11 @@ Alias: $EuImagingStudyUrl      = http://hl7.org/fhir/StructureDefinition/Imaging
 Alias: $EuLocation             = http://hl7.eu/fhir/base-r5/StructureDefinition/location-eu
 Alias: $EuLocationUrl          = http://hl7.eu/fhir/base-r5/StructureDefinition/location-eu
 
-Alias: $EuMedication           = MedicationEu
-Alias: $EuMedicationUrl        = http://hl7.eu/fhir/imaging-r5/StructureDefinition/MedicationEu
+Alias: $EuMedication           = Medication
+Alias: $EuMedicationUrl        = http://hl7.org/fhir/StructureDefinition/ImagingStudy/Medication
 
-Alias: $EuObservation          = ObservationEu
-Alias: $EuObservationUrl       = http://hl7.eu/fhir/imaging-r5/StructureDefinition/ObservationEu
+Alias: $EuObservation          = Observation
+Alias: $EuObservationUrl       = http://hl7.org/fhir/StructureDefinition/Observation
 
 Alias: $EuMedicationAdministration = MedicationAdministration
 Alias: $EuMedicationAdministrationUrl = http://hl7.org/fhir/StructureDefinition/MedicationAdministration
@@ -79,26 +79,26 @@ Alias: $EuPractitionerRoleUrl  = http://hl7.eu/fhir/base-r5/StructureDefinition/
 Alias: $EuPractitioner         = http://hl7.eu/fhir/base-r5/StructureDefinition/practitioner-eu-core
 Alias: $EuPractitionerUrl      = http://hl7.eu/fhir/base-r5/StructureDefinition/practitioner-eu-core
 
-Alias: $EuProcedure            = ProcedureEu
-Alias: $EuProcedureUrl         = http://hl7.eu/fhir/imaging-r5/StructureDefinition/ProcedureEu
+Alias: $EuProcedure            = Procedure
+Alias: $EuProcedureUrl         = http://hl7.org/fhir/StructureDefinition/Procedure
 
-Alias: $EuRange                = RangeEu
-Alias: $EuRangeUrl             = http://hl7.eu/fhir/imaging-r5/StructureDefinition/RangeEu
+Alias: $EuRange                = Range
+Alias: $EuRangeUrl             = http://hl7.org/fhir/StructureDefinition/Range
 
-Alias: $EuRelatedPerson        = RelatedPersonEu
+Alias: $EuRelatedPerson        = RelatedPerson
 Alias: $EuRelatedPersonUrl     = http://hl7.org/fhir/StructureDefinition/RelatedPerson
 
-Alias: $EuServiceRequest       = ServiceRequestEu
-Alias: $EuServiceRequestUrl    = http://hl7.eu/fhir/imaging-r5/StructureDefinition/ServiceRequestEu
+Alias: $EuServiceRequest       = ServiceRequest
+Alias: $EuServiceRequestUrl    = http://hl7.org/fhir/StructureDefinition/ServiceRequest
 
-Alias: $EuQuantity             = QuantityEu
-Alias: $EuQuantityUrl          = http://hl7.eu/fhir/imaging-r5/StructureDefinition/QuantityEu
+Alias: $EuQuantity             = Quantity
+Alias: $EuQuantityUrl          = http://hl7.org/fhir/StructureDefinition/Quantity
 
-Alias: $EuSimpleQuantity       = SimpleQuantityEu
-Alias: $EuSimpleQuantityUrl    = http://hl7.eu/fhir/imaging-r5/StructureDefinition/SimpleQuantityEu
+Alias: $EuSimpleQuantity       = SimpleQuantity
+Alias: $EuSimpleQuantityUrl    = http://hl7.org/fhir/StructureDefinition/SimpleQuantity
 
-Alias: $EuSpecimen             = SpecimenEu
-Alias: $EuSpecimenUrl          = http://hl7.eu/fhir/imaging-r5/StructureDefinition/SpecimenEu
+Alias: $EuSpecimen             = Specimen
+Alias: $EuSpecimenUrl          = http://hl7.org/fhir/StructureDefinition/Specimen
 
 Alias: $EuSubstance            = Substance
 Alias: $EuSubstanceUrl         = http://hl7.org/fhir/StructureDefinition/Substance

input/fsh/alias-extensions.fsh

@@ -1,5 +1,6 @@
 Alias: $allergy-intolerance-certainty-url     = http://hl7.org/fhir/StructureDefinition/allergyintolerance-certainty
 Alias: $allergyintolerance-abatement-url      = http://hl7.org/fhir/StructureDefinition/allergyintolerance-abatement
+Alias: $annotation-type                       = http://hl7.org/fhir/StructureDefinition/annotationType
 Alias: $artifact-description-url              = http://hl7.org/fhir/StructureDefinition/artifact-title
 Alias: $artifact-related-artifact-url         = http://hl7.org/fhir/StructureDefinition/artifact-relatedArtifact
 Alias: $artifact-title-url                    = http://hl7.org/fhir/StructureDefinition/artifact-description

input/fsh/alias-systems.fsh

@@ -8,6 +8,7 @@ Alias: $condition-category = http://terminology.hl7.org/CodeSystem/condition-cat
 Alias: $data-absent-reason = http://terminology.hl7.org/CodeSystem/data-absent-reason
 Alias: $data-absent-reason-cs =  http://terminology.hl7.org/CodeSystem/data-absent-reason
 Alias: $diagnosis-role = http://terminology.hl7.org/CodeSystem/diagnosis-role
+Alias: $diagnostic-service-sections = http://hl7.org/fhir/ValueSet/diagnostic-service-sections
 Alias: $dicomOntology = http://dicom.nema.org/resources/ontology/DCM
 Alias: $edqm = https://standardterms.edqm.eu
 Alias: $encounter-status = http://hl7.org/fhir/encounter-status
@@ -37,6 +38,7 @@ Alias: $v3-NullFlavor = http://terminology.hl7.org/CodeSystem/v3-NullFlavor
 Alias: $v3-ObservationInterpretation = http://terminology.hl7.org/CodeSystem/v3-ObservationInterpretation
 Alias: $v3-ParticipationType = http://terminology.hl7.org/CodeSystem/v3-ParticipationType
 Alias: $v3-RoleCode = http://terminology.hl7.org/CodeSystem/v3-RoleCode
+Alias: $xds-class-code = urn:oid:1.3.6.1.4.1.19376.1.2.6.1
 
 // --- SID
 Alias: $oid = urn:ietf:rfc:1155