Korrektur Abteilungsreferenz war unvollständig

gematik · Feb 16, 2024 · b8665f3 · b8665f3
1 parent 3fa2be3
commit b8665f3
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 26 deletions.
diff --git a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransaction.json
@@ -49,7 +49,7 @@
           "reference": "Patient/PatientinMusterfrau"
         },
         "context": {
-          "reference": "Encounter/Absteilungskontakt"
+          "reference": "Encounter/Fachabteilungskontakt"
         },
         "effectivePeriod": {
           "start": "2021-07-01"

diff --git a/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json b/Resources/fsh-generated/resources/Bundle-ExampleISiKMedikationTransactionResponse.json
@@ -49,7 +49,7 @@
           "reference": "Patient/PatientinMusterfrau"
         },
         "context": {
-          "reference": "Encounter/Absteilungskontakt"
+          "reference": "Encounter/Fachabteilungskontakt"
         },
         "effectivePeriod": {
           "start": "2021-07-01"

diff --git a/.../Encounter-Versorgungsstellenkontakt.json → ...rces/Encounter-Fachabteilungskontakt.json b/.../Encounter-Versorgungsstellenkontakt.json → ...rces/Encounter-Fachabteilungskontakt.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "Encounter",
-  "id": "Versorgungsstellenkontakt",
+  "id": "Fachabteilungskontakt",
   "extension": [
     {
       "url": "http://fhir.de/StructureDefinition/Aufnahmegrund",
@@ -63,7 +63,7 @@
     {
       "coding": [
         {
-          "code": "versorgungsstellenkontakt",
+          "code": "abteilungskontakt",
           "system": "http://fhir.de/CodeSystem/Kontaktebene"
         }
       ]
@@ -150,8 +150,5 @@
       "value": "XYZ"
     },
     "display": "Fachabteilung XYZ"
-  },
-  "partOf": {
-    "reference": "Einrichtungskontakt"
   }
 }
diff --git a/Resources/fsh-generated/resources/List-ExampleISiKMedikationsListe.json b/Resources/fsh-generated/resources/List-ExampleISiKMedikationsListe.json
@@ -20,7 +20,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "encounter": {
-    "reference": "Encounter/Versorgungsstellenkontakt"
+    "reference": "Encounter/Fachabteilungskontakt"
   },
   "date": "2021-07-04",
   "entry": [

diff --git a/...fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json b/...fsh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung.json
@@ -22,7 +22,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Absteilungskontakt"
+    "reference": "Encounter/Fachabteilungskontakt"
   },
   "effectiveDateTime": "2021-07-01"
 }
diff --git a/...sh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json b/...sh-generated/resources/MedicationAdministration-ExampleISiKMedikationsVerabreichung2.json
@@ -22,7 +22,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Absteilungskontakt"
+    "reference": "Encounter/Fachabteilungskontakt"
   },
   "effectiveDateTime": "2024-01-22"
 }
diff --git a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung.json
@@ -38,7 +38,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "encounter": {
-    "reference": "Encounter/Absteilungskontakt"
+    "reference": "Encounter/Fachabteilungskontakt"
   },
   "authoredOn": "2021-07-01",
   "requester": {

diff --git a/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json b/Resources/fsh-generated/resources/MedicationRequest-ExampleISiKMedikationsVerordnung2.json
@@ -39,7 +39,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "encounter": {
-    "reference": "Encounter/Absteilungskontakt"
+    "reference": "Encounter/Fachabteilungskontakt"
   },
   "authoredOn": "2024-01-17",
   "requester": {

diff --git a/...urces/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json b/...urces/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation1.json
@@ -37,7 +37,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Absteilungskontakt"
+    "reference": "Encounter/Fachabteilungskontakt"
   },
   "effectivePeriod": {
     "start": "2021-07-01"

diff --git a/...urces/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json b/...urces/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation2.json
@@ -36,7 +36,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Absteilungskontakt"
+    "reference": "Encounter/Fachabteilungskontakt"
   },
   "effectivePeriod": {
     "start": "2021-07-04"

diff --git a/...urces/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json b/...urces/fsh-generated/resources/MedicationStatement-ExampleISiKMedikationsInformation3.json
@@ -38,7 +38,7 @@
     "reference": "Patient/PatientinMusterfrau"
   },
   "context": {
-    "reference": "Encounter/Absteilungskontakt"
+    "reference": "Encounter/Fachabteilungskontakt"
   },
   "effectivePeriod": {
     "start": "2024-01-22",

diff --git a/Resources/input/fsh/ISiKMedikationsInformation.fsh b/Resources/input/fsh/ISiKMedikationsInformation.fsh
@@ -258,7 +258,7 @@ Usage: #example
 * status = #active
 * medicationReference.reference = "Medication/ExampleISiKMedikament1"
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Absteilungskontakt"
+* context.reference = "Encounter/Fachabteilungskontakt"
 * effectivePeriod.start = 2021-07-01
 * dateAsserted = 2021-07-01
 * reasonReference.reference = "Condition/BehandlungsDiagnoseFreitext"
@@ -279,7 +279,7 @@ Usage: #example
 * status = #active
 * medicationReference.reference = "Medication/ExampleISiKMedikament2"
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Absteilungskontakt"
+* context.reference = "Encounter/Fachabteilungskontakt"
 * effectivePeriod.start = 2021-07-04
 * dateAsserted = 2021-07-03
 * dosage
@@ -300,7 +300,7 @@ Usage: #example
 * status = #active
 * medicationReference = Reference(ExampleISiKMedikament8)
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Absteilungskontakt"
+* context.reference = "Encounter/Fachabteilungskontakt"
 * effectivePeriod
   * start = 2024-01-22
   * end = 2024-02-26

diff --git a/Resources/input/fsh/ISiKMedikationsListe.fsh b/Resources/input/fsh/ISiKMedikationsListe.fsh
@@ -50,7 +50,7 @@ Usage: #example
 * status = #current
 * mode = #working
 * subject.reference = "Patient/PatientinMusterfrau"
-* encounter.reference = "Encounter/Versorgungsstellenkontakt"
+* encounter.reference = "Encounter/Fachabteilungskontakt"
 * date = 2021-07-04
 * entry[+]
   * date = 2021-07-01

diff --git a/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh b/Resources/input/fsh/ISiKMedikationsVerabreichung.fsh
@@ -134,7 +134,7 @@ Usage: #example
 * status = #completed
 * medicationReference.reference = "Medication/ExampleISiKMedikament1"
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Absteilungskontakt"
+* context.reference = "Encounter/Fachabteilungskontakt"
 * effectiveDateTime = 2021-07-01
 * dosage
   * dose
@@ -149,7 +149,7 @@ Usage: #example
 * status = #completed
 * medicationReference = Reference(ExampleISiKMedikament9)
 * subject.reference = "Patient/PatientinMusterfrau"
-* context.reference = "Encounter/Absteilungskontakt"
+* context.reference = "Encounter/Fachabteilungskontakt"
 * effectiveDateTime = 2024-01-22
 * dosage
   * dose

diff --git a/Resources/input/fsh/ISiKMedikationsVerordnung.fsh b/Resources/input/fsh/ISiKMedikationsVerordnung.fsh
@@ -256,7 +256,7 @@ Usage: #example
 * intent = #order
 * medicationReference.reference = "Medication/ExampleISiKMedikament1"
 * subject.reference = "Patient/PatientinMusterfrau"
-* encounter.reference = "Encounter/Absteilungskontakt"
+* encounter.reference = "Encounter/Fachabteilungskontakt"
 * authoredOn = 2021-07-01
 * requester.reference = "Practitioner/PractitionerWalterArzt"
 * reasonReference.reference = "Condition/BehandlungsDiagnoseFreitext"
@@ -278,7 +278,7 @@ Usage: #example
 * intent = #order
 * medicationReference = Reference(ExampleISiKMedikament8)
 * subject.reference = "Patient/PatientinMusterfrau"
-* encounter.reference = "Encounter/Absteilungskontakt"
+* encounter.reference = "Encounter/Fachabteilungskontakt"
 * authoredOn = 2024-01-17
 * requester.reference = "Practitioner/PractitionerWalterArzt"
 * dosageInstruction

diff --git a/Resources/input/fsh/referencedExamples.fsh b/Resources/input/fsh/referencedExamples.fsh
@@ -50,7 +50,7 @@ Usage: #example
 * address[=].postalCode = "98764"
 * address[=].country = "DE"
 
-Instance: Versorgungsstellenkontakt
+Instance: Fachabteilungskontakt
 InstanceOf: Encounter
 Usage: #example
 * extension.url = "http://fhir.de/StructureDefinition/Aufnahmegrund"
@@ -66,7 +66,7 @@ Usage: #example
 * status = #finished
 * class = $v3-ActCode#IMP
 * type[0] = $kontaktart-de#operation
-* type[+] = $Kontaktebene#versorgungsstellenkontakt
+* type[+] = $Kontaktebene#abteilungskontakt
 * serviceType = $FachabteilungsschluesselCS#0100
 * subject = Reference(PatientinMusterfrau)
 * period.start = "2021-02-12"
@@ -85,4 +85,3 @@ Usage: #example
 * serviceProvider.identifier.system = "https://test.krankenhaus.de/fhir/sid/fachabteilungsid"
 * serviceProvider.identifier.value = "XYZ"
 * serviceProvider.display = "Fachabteilung XYZ"
-* partOf = Reference(Einrichtungskontakt)