From f12c897bd97c99b7fbd6aad3a6157465869fc712 Mon Sep 17 00:00:00 2001
From: Michaela Ziegler <michaela1.ziegler@gmail.com>
Date: Thu, 24 Oct 2019 15:32:57 +0200
Subject: [PATCH] iss #11

---
 .../ch.fhir.ig.ch-core.xml                    |  6 ++
 resources/namingsystem/ber.xml                | 33 +++++++
 resources/namingsystem/uidb.xml               | 10 +-
 .../ch-core-organization.xml                  | 94 +++++++++++++++++--
 4 files changed, 130 insertions(+), 13 deletions(-)
 create mode 100644 resources/namingsystem/ber.xml

diff --git a/resources/implementationguide/ch.fhir.ig.ch-core.xml b/resources/implementationguide/ch.fhir.ig.ch-core.xml
index a9e3fc4..53ff940 100644
--- a/resources/implementationguide/ch.fhir.ig.ch-core.xml
+++ b/resources/implementationguide/ch.fhir.ig.ch-core.xml
@@ -259,6 +259,12 @@
       </reference>
       <exampleBoolean value="false"/>
     </resource>
+    <resource>
+      <reference>
+        <reference value="NamingSystem/ber"/>
+      </reference>
+      <exampleBoolean value="false"/>
+    </resource>
     <resource>
       <reference>
         <reference value="NamingSystem/epr-spid"/>
diff --git a/resources/namingsystem/ber.xml b/resources/namingsystem/ber.xml
new file mode 100644
index 0000000..b574c00
--- /dev/null
+++ b/resources/namingsystem/ber.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<NamingSystem xmlns="http://hl7.org/fhir">
+  <id value="ber"/>
+  <name value="BER"/>
+  <status value="active"/>
+  <kind value="identifier"/>
+  <date value="2019-10-24"/>
+  <publisher value="BAKOM/OFCOM"/>
+  <contact>
+    <name value="Bundesamt für Kommunikation"/>
+    <telecom>
+      <system value="email"/>
+      <value value="info@bakom.admin.ch"/>
+    </telecom>
+  </contact>
+  <responsible value="Swiss Federal Statistical Office (FSO)"/>
+  <description value="The Business and Enterprise Register (BER) contains all enterprises and business in private and public law which are domiciled and exercise an economic activity in Switzerland.
+                      (in French, Registre des entreprises et des établissements (REE))
+                      (in German, Betriebs- und Unternehmensregister (BUR))
+                      (in Italian, Registro delle imprese e degli stabilimenti (RIS))"/>
+  <jurisdiction>
+    <coding>
+      <system value="urn:iso:std:iso:3166"/>
+      <code value="CH"/>
+    </coding>
+  </jurisdiction>
+  <uniqueId>
+    <type value="oid"/>
+    <value value="2.16.756.5.45"/>
+    <comment value="This is the official identifier"/>
+  </uniqueId>
+</NamingSystem>
\ No newline at end of file
diff --git a/resources/namingsystem/uidb.xml b/resources/namingsystem/uidb.xml
index 6b58079..47de829 100644
--- a/resources/namingsystem/uidb.xml
+++ b/resources/namingsystem/uidb.xml
@@ -5,13 +5,13 @@
   <name value="UIDB"/>
   <status value="active"/>
   <kind value="identifier"/>
-  <date value="2013-04-30"/>
+  <date value="2019-10-24"/>
   <publisher value="BAKOM/OFCOM"/>
   <contact>
-    <name value="OID Repository"/>
+    <name value="Bundesamt für Kommunikation"/>
     <telecom>
-      <system value="url"/>
-      <value value="http://oid-info.com/get/1.3.183"/>
+      <system value="email"/>
+      <value value="info@bakom.admin.ch"/>
     </telecom>
   </contact>
   <responsible value="Swiss Federal Statistical Office (FSO)"/>
@@ -25,7 +25,7 @@
   </jurisdiction>
   <uniqueId>
     <type value="oid"/>
-    <value value="1.3.183"/>
+    <value value="2.16.756.5.35"/>
     <comment value="This is the official identifier"/>
   </uniqueId>
 </NamingSystem>
\ No newline at end of file
diff --git a/resources/structuredefinition/ch-core-organization.xml b/resources/structuredefinition/ch-core-organization.xml
index 7a93baa..94d94c1 100644
--- a/resources/structuredefinition/ch-core-organization.xml
+++ b/resources/structuredefinition/ch-core-organization.xml
@@ -56,6 +56,13 @@
         </element>
         <element id="Organization.identifier">
             <path value="Organization.identifier"/>
+            <slicing>
+                <discriminator>
+                    <type value="value" />
+                    <path value="system" />
+                </discriminator>
+                <rules value="open" />
+            </slicing>
             <min value="1"/>
             <max value="*"/>
             <type>
@@ -67,14 +74,85 @@
                 <map value="n/a"/>
             </mapping>
         </element>
-        <element id="Organization.identifier.system">
-            <path value="Organization.identifier.system"/>
-            <min value="1"/>
-            <max value="1"/>
-            <type>
-                <code value="uri"/>
-            </type>
-            <isModifier value="false"/>
+        <element id="Organization.identifier:BER">
+            <path value="Organization.identifier" />
+            <sliceName value="BER" />
+            <short value="BER (Business and Enterprise Register)" />
+            <definition value="BER (Business and Enterprise Register)" />
+            <max value="1" />
+        </element>
+        <element id="Organization.identifier:BER.system">
+            <path value="Organization.identifier.system" />
+            <short value="OID of the BER" />
+            <definition value="OID of the BER" />
+            <min value="1" />
+            <fixedUri value="urn:oid:2.16.756.5.45" />
+        </element>
+        <element id="Organization.identifier:BER.value">
+            <path value="Organization.identifier.value" />
+            <short value="BER of the organization" />
+            <definition value="BER of the organization"/>
+            <min value="1" />
+        </element>
+        <element id="Organization.identifier:UIDB">
+            <path value="Organization.identifier" />
+            <sliceName value="UIDB" />
+            <short value="Unique IDentification Business (UIDB)" />
+            <definition value="Unique IDentification Business (UIDB)" />
+            <max value="1" />
+        </element>
+        <element id="Organization.identifier:UIDB.system">
+            <path value="Organization.identifier.system" />
+            <short value="OID of the UIDB" />
+            <definition value="OID of the UIDB" />
+            <min value="1" />
+            <fixedUri value="urn:oid:2.16.756.5.35" />
+        </element>
+        <element id="Organization.identifier:UIDB.value">
+            <path value="Organization.identifier.value" />
+            <short value="UIDB of the Organization" />
+            <definition value="UIDB of the Organization" />
+            <min value="1" />
+        </element>
+        <element id="Organization.identifier:ZSR">
+            <path value="Organization.identifier" />
+            <sliceName value="ZSR" />
+            <short value="Zahlstellenregister (ZSR)" />
+            <definition value="Zahlstellenregister (ZSR)" />
+            <max value="1" />
+        </element>
+        <element id="Organization.identifier:ZSR.system">
+            <path value="Organization.identifier.system" />
+            <short value="OID of the ZSR" />
+            <definition value="OID of the ZSR" />
+            <min value="1" />
+            <fixedUri value="urn:oid:2.16.756.5.30.1.123.100.2.1.1" />
+        </element>
+        <element id="Organization.identifier:ZSR.value">
+            <path value="Organization.identifier.value" />
+            <short value="ZSR of the Organization" />
+            <definition value="ZSR of the Organization" />
+            <min value="1" />
+        </element>
+        <element id="Organization.identifier:GLN">
+            <path value="Organization.identifier" />
+            <sliceName value="GLN" />
+            <short value="Global Location Number (GLN)" />
+            <definition value="Global Location Number (GLN)" />
+            <max value="1" />
+        </element>
+        <element id="Organization.identifier:GLN.system">
+            <path value="Organization.identifier.system" />
+            <short value="OID of the GLN" />
+            <definition value="OID of the GLN" />
+            <min value="1" />
+            <fixedUri value="urn:oid:2.51.1.3" />
+        </element>
+        <element id="Organization.identifier:GLN.value">
+            <path value="Organization.identifier.value" />
+            <short value="GLN of the Organization" />
+            <definition value="GLN of the Organization" />
+            <min value="1" />
         </element>
         <element id="Organization.active">
             <path value="Organization.active"/>