Merge pull request #279 from hl7ch/issue274_term

move terminology

input/fsh/extensions/ECH46EmailCategory.fsh

@@ -7,6 +7,6 @@ Description: "Extension to define the e-mail category according to eCH-0046"
 * ^context.expression = "ContactPoint.use"
 * url only uri
 * valueCodeableConcept 1..1
-* valueCodeableConcept from ECH46EmailCategory (extensible)
+* valueCodeableConcept from http://fhir.ch/ig/ch-core/ValueSet/ech-46-emailcategory (extensible)
 * valueCodeableConcept.coding ^short = "Predefined category"
 * valueCodeableConcept.text ^short = "Category as free text should only be used if none of the predefined categories apply"

input/fsh/extensions/ECH46InternetCategory.fsh

@@ -7,6 +7,6 @@ Description: "Extension to define the internet category according to eCH-0046"
 * ^context.expression = "ContactPoint.use"
 * url only uri
 * valueCodeableConcept 1..1
-* valueCodeableConcept from ECH46InternetCategory (extensible)
+* valueCodeableConcept from http://fhir.ch/ig/ch-core/ValueSet/ech-46-internetcategory (extensible)
 * valueCodeableConcept.coding ^short = "Predefined category"
 * valueCodeableConcept.text ^short = "Category as free text should only be used if none of the predefined categories apply"

input/fsh/extensions/ECH46PhoneCategory.fsh

@@ -7,6 +7,6 @@ Description: "Extension to define the phone category according to eCH-0046"
 * ^context.expression = "ContactPoint.use"
 * url only uri
 * valueCodeableConcept 1..1
-* valueCodeableConcept from ECH46PhoneCategory (extensible)
+* valueCodeableConcept from http://fhir.ch/ig/ch-core/ValueSet/ech-46-phonecategory (extensible)
 * valueCodeableConcept.coding ^short = "Predefined category"
 * valueCodeableConcept.text ^short = "Category as free text should only be used if none of the predefined categories apply"

input/fsh/instances/patient/UpiEprTestKrcmarevic.fsh

@@ -4,7 +4,7 @@ Usage: #example
 Title: "UPI EPR Test Krcmarevic"
 Description: "Test Patient from UPI for Swiss EPR Projectathon"
 * text.status = #additional
-* text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><div><ul><li><b>EPR-SPID</b>: 7560521127080</li><li><b>Date of Birth</b>: 20.03.1982</li><li><b>First Name</b>: Claude-Hélène Marguerite</li><li><b>Official Name</b>: Krcmarevic</li><li><b>Original Name</b>: Scheuble</li><li><b>Sex</b>: 2 (Needs transformation to HL7 ValueSet, see <a href=\"ConceptMap-sex-ech11-to-fhir.html\">ConceptMap Sex eCH-011 to FHIR mapping</a>)</li><li><b>Mother</b></li><ul><li><b>First Name</b>: Hui Xue</li><li><b>Last Name</b>: Dalkiliç</li></ul><li><b>Father</b></li><ul><li><b>First Name</b>: Fabio Nicola</li><li><b>Last Name</b>: Dalkiliç</li></ul><li><b>Nationality</b>: Switzerland (8100)</li><li><b>Country of Birth</b>: Switzerland (8100)</li><li><b>Place of Birth</b>: Zürich (261)</li></ul></div><div>\r\n                Base test data for Projectathon from UPI, see <a href=\"https://docs.google.com/spreadsheets/d/1yWPhTI7DDgYDMXPVFGRmdb50c8TuUnQp9fECM3iGTBo/edit#gid=0\">Google Doc for more examples.</a></div></div>"
+* text.div = "<div xmlns=\"http://www.w3.org/1999/xhtml\"><div><ul><li><b>EPR-SPID</b>: 7560521127080</li><li><b>Date of Birth</b>: 20.03.1982</li><li><b>First Name</b>: Claude-Hélène Marguerite</li><li><b>Official Name</b>: Krcmarevic</li><li><b>Original Name</b>: Scheuble</li><li><b>Sex</b>: 2 (Needs transformation to HL7 ValueSet, see <a href=\"https://fhir.ch/ig/ch-term/ConceptMap-sex-ech11-to-fhir.html\">ConceptMap Sex eCH-011 to FHIR mapping</a>)</li><li><b>Mother</b></li><ul><li><b>First Name</b>: Hui Xue</li><li><b>Last Name</b>: Dalkiliç</li></ul><li><b>Father</b></li><ul><li><b>First Name</b>: Fabio Nicola</li><li><b>Last Name</b>: Dalkiliç</li></ul><li><b>Nationality</b>: Switzerland (8100)</li><li><b>Country of Birth</b>: Switzerland (8100)</li><li><b>Place of Birth</b>: Zürich (261)</li></ul></div><div>\r\n                Base test data for Projectathon from UPI, see <a href=\"https://docs.google.com/spreadsheets/d/1yWPhTI7DDgYDMXPVFGRmdb50c8TuUnQp9fECM3iGTBo/edit#gid=0\">Google Doc for more examples.</a></div></div>"
 
 * extension[citizenship].extension.url = "code"
 * extension[citizenship].extension.valueCodeableConcept = urn:iso:std:iso:3166#CH "Switzerland"

input/fsh/profiles-resources/CHCoreEncounter.fsh

@@ -22,7 +22,7 @@ Description: "Base definition of the Encounter resource for use in Swiss specifi
 * priority ^short = "BFS Medizinische Statistik - Eintrittsart / Mode d’admission / Genere di ricovero"
 * subject 1..
 * subject only Reference(CHCorePatient)
-* participant.type from ChCoreEncounterParticipationType (extensible)
+* participant.type from http://fhir.ch/ig/ch-core/ValueSet/ch-core-encounter-participation-type (extensible)
 * participant.individual only Reference(CHCorePractitioner)
 
 * hospitalization.extension ^slicing.discriminator.type = #value

input/pagecontent/changelog.md

@@ -9,6 +9,7 @@ All significant changes to this FHIR implementation guide will be documented on
 * [#272](https://github.com/hl7ch/ch-core/issues/272): Update the CHCoreDocumentReference EPR-XDS mapping
 * [#269](https://github.com/hl7ch/ch-core/issues/269): max cardinality for only one gln for practitioner
 * [CH Term #23](https://github.com/hl7ch/ch-epr-term/issues/23): Changes according to the renaming of CH EPR Term to CH Term
+* [#274](https://github.com/hl7ch/ch-core/issues/274): Move terminology to CH Term
 
 #### Fixed
 
@@ -81,7 +82,7 @@ All significant changes to this FHIR implementation guide will be documented on
 * [#163](https://github.com/hl7ch/ch-core/issues/163): Typo
 * [#159](https://github.com/hl7ch/ch-core/issues/159): Add element 'experimental' (false) to CS/VS
 * [#161](https://github.com/hl7ch/ch-core/issues/161): Use 'patternCodeableConcept' instead of 'fixedCodeableConcept' for [Consent.policyRule](StructureDefinition-ch-core-epr-consent.html)
-* [#167](https://github.com/hl7ch/ch-core/issues/167): Fix URIs in ConceptMaps ([MaritalStatus eCH-011 to FHIR mapping](ConceptMap-maritalstatus-ech11-to-fhir.html), [Sex eCH-011 to FHIR mapping](ConceptMap-sex-ech11-to-fhir.html))
+* [#167](https://github.com/hl7ch/ch-core/issues/167): Fix URIs in ConceptMaps 'MaritalStatus eCH-011 to FHIR mapping', 'Sex eCH-011 to FHIR mapping'
 * [#152](https://github.com/hl7ch/ch-core/issues/152): Changes status form 'draft' to 'active'
 
 #### Issues resolved without amendment (in IG)

input/pagecontent/index.md

@@ -18,38 +18,33 @@ This guide is a working specification. We anticipate that it will be implemented
 **Download**: You can download this implementation guide in [NPM format](https://confluence.hl7.org/display/FHIR/NPM+Package+Specification) from [here](package.tgz).
 
 ### Relation to the Swiss EPR
-
 The Annexes to the Swiss [Electronic Patient Record](https://www.patientendossier.ch/en) (EPR) law specify the technical and semantic requirements for interoperability.
 
 #### Metadata (Annex 3 and Annex 9)
-
 Metadata relating to the Swiss EPR is defined in Annexes 3 and 9 by the [Ministry of Health](https://www.bag.admin.ch/bag/de/home/gesetze-und-bewilligungen/gesetzgebung/gesetzgebung-mensch-gesundheit/gesetzgebung-elektronisches-patientendossier.html). [eHealth Suisse](https://www.e-health-suisse.ch/en/home.html) maintains the value sets with additional provided translations in ART-DECOR in the [CH-EPR](https://art-decor.org/art-decor/decor-project--ch-epr-) project. All code systems and value sets from the CH-EPR project are exported to the FHIR implementation guide [CH Term](http://fhir.ch/ig/ch-term/index.html), which forms the basis for CH Core.
 
 #### Exchange formats (Annex 4)
-
 Exchange formats for the Swiss EPR are defined in Annex 4. Exchange formats can be represented as FHIR documents.
 
 - [CH Core Document Profile EPR](StructureDefinition-ch-core-document.html): the base definition for a structured document in the Swiss EPR.
 - [CH Core Composition Profile EPR](StructureDefinition-ch-core-composition-epr.html): the base definition for a composition, providing the basic structure of the FHIR document. 
 
 #### XDS (Annex 5, Amendment 1)
-
 Requirements for IHE XDS are given in Annex 5. The [CH Core DocumentReference Profile EPR](StructureDefinition-ch-core-documentreference-epr.html) defines how metadata used in the EPR is to be mapped to XDS Metadata. Please note that the IHE MHD profile, which includes the document reference resource, is not yet specified in the Annexes, a draft implementation guide is [CH EPR mHealth](http://fhir.ch/ig/ch-epr-mhealth/index.html).
 
 #### CH:ATC Profile (Annex 5, Amendment 2.2)
-
 The CH ATC profile defines the requirements for a patient’s audit trail. [CH ATC](http://fhir.ch/ig/ch-atc/index.html) is a FHIR implementation guide based on FHIR STU3 and R4. There is currently no relationship between CH ATC and CH Core.
-### Scope
 
-This document presents Swiss use concepts defined via FHIR processable artefacts.
+### Scope
+This document presents Swiss use concepts defined via FHIR processable artifacts:
 
 * [Profiles](profiles.html) - useful constraints of essential FHIR resources and data types for Swiss use. 
 * [Extensions](extensions.html) -  FHIR extensions that are added for local use, covering necessary Swiss concepts. 
-* [Terminologies](terminology.html) - defined or referenced code systems and value sets for Switzerland. 
+* [Terminology](https://fhir.ch/ig/ch-term/index.html) - defined or referenced code systems and value sets for Switzerland. 
 
 ### Governance
-
 The CH Core implementation guide is managed by HL7 Switzerland in the [HL7 Switzerland FHIR technical committee](https://www.hl7.ch/technisches-komitee/), see also [source](https://github.com/hl7ch/ch-core).
+
 ### Collaboration
 This guide is the product of collaborative work undertaken with participants from:
 
@@ -61,7 +56,7 @@ This guide is the product of collaborative work undertaken with participants fro
 This implementation guide defines data elements, resources, formats, and methods for exchanging healthcare data between different participants in the healthcare process. As such, clinical safety is a key concern. Additional guidance regarding safety for the specification’s many and various implementations is available at: [https://www.hl7.org/FHIR/safety.html](https://www.hl7.org/FHIR/safety.html).
 
 Although the present specification does gives users the opportunity to observe data protection and data security regulations, its use does not guarantee compliance with these regulations. Effective compliance must be ensured by appropriate measures during implementation projects and in daily operations. The corresponding implementation measures are explained in the standard. 
-In addition, the present specification can only influence compliance with the security regulations in the technical area of standardisation. It cannot influence organisational and contractual matters.
+In addition, the present specification can only influence compliance with the security regulations in the technical area of standardization. It cannot influence organizational and contractual matters.
 
 ### IP Statements
 This document is licensed under Creative Commons "No Rights Reserved" ([CC0](https://creativecommons.org/publicdomain/zero/1.0/)).