feat: extracted minimal changes as discussed

gematik · Mar 16, 2024 · e71cf1d · e71cf1d
1 parent 4f8817c
commit e71cf1d
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 10 deletions.
diff --git a/changelog.md b/changelog.md
@@ -0,0 +1,46 @@
+# Changelog
+
+## 2024-03-16 - Version 0.11.0
+
+### EndpointDirectory
+- EndpointVisibility Extension hinzugefügt
+
+### Extensions
+- OrganizationVisibility hinzugefügt
+- EndpointVisibility hinzugefügt
+
+### LocationDirectory
+- partOf `MS`
+- managingOrganization `MS`
+
+### HealthcareServiceDirectory
+- category `MS` & binding an: IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare
+- type `MS` binding auf HealthcareServiceTypeVS (HealthcareServiceTypeVS enthält jetzt die Codes zuvor in HealthcareServiceSpecialtyVS enthalten waren)
+- speciality binding auf neues VS: HealthcareServiceSpecialityVS
+- characteristics `MS` & binding an: HealthCareServiceCharacteristicVS
+
+### OrganizationDirectory
+- OrganizationVisibility Extension hinzugefügt
+- type OrganizationTypeVS aufgeteilt in zwei ValueSets & Slices: type[providerType] & type[profession], dient nur der besseren Sichtbarkeit, keine Auswirkungen auf Dateninstanzen
+- address `MS`
+- partOf `MS`
+
+### PractitionerDirectory
+- identifier[TelematikID] maximal Kardinalität auf `1` reduziert 
+
+### Terminology
+#### ValueSets
+- HealthcareServiceSpecialtyVS entfernt, Konzepte jetzt in: HealthcareServiceTypeVS enthalten
+- OrganizationTypeVS enthält nicht mehr: OrganizationProfessionOID (wurde in VS OrganizationProfessionOIDTypeVS ausgelagert, kein Einfluss auf Dateninstanzen)
+- Neu: HealthcareServiceSpecialityVS
+- Neu: HealthcareServiceTypeVS (enthält die Konzepte aus dem entfernten VS: HealthcareServiceSpecialtyVS)
+- Neu: IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare
+- Neu: HealthCareServiceCharacteristicVS
+- Neu: OrganizationProfessionOIDTypeVS
+- Entfernt: PharmacyHealthcareServiceTypeVS (wurde nicht in Profilen genutzt)
+- Entfernt: PharmacyTypeVS (wurde nicht in Profilen genutzt)
+
+#### CodeSystems
+- PharmacyHealthcareServiceTypeCS umbenannt: PharmacyHealthcareSpecialityCS (wurde nicht in Profilen genutzt)
+- EndpointDirectoryConnectionType Liste der Konzepte angepasst
+- PharmacyTypeCS Liste der Konzepte angepasst (wurde nicht in Profilen genutzt)
diff --git a/src/fhir/fsh-generated/fsh-index.json b/src/fhir/fsh-generated/fsh-index.json
@@ -296,10 +296,10 @@
     "endLine": 4
   },
   {
-    "outputFile": "ValueSet-OrganizationProviderTypeVS.json",
-    "fshName": "OrganizationProviderTypeVS",
+    "outputFile": "ValueSet-OrganizationTypeVS.json",
+    "fshName": "OrganizationTypeVS",
     "fshType": "ValueSet",
-    "fshFile": "valuesets/OrganizationProviderTypeVS.fsh",
+    "fshFile": "valuesets/OrganizationTypeVS.fsh",
     "startLine": 1,
     "endLine": 4
   },

diff --git a/src/fhir/fsh-generated/fsh-index.txt b/src/fhir/fsh-generated/fsh-index.txt
@@ -36,7 +36,7 @@ ValueSet-HealthcareServiceTypeVS.json                                   Healthca
 ValueSet-HealthcareSpecialityTypeVS.json                                HealthcareServiceSpecialityVS                             ValueSet    valuesets/HealthcareServiceSpecialityVS.fsh            1 - 7
 ValueSet-IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare.json  IHEXDShealthcareFacilityTypeCodePatientRelatedHealthcare  ValueSet    valuesets/HealthCareServiceCategory.fsh                3 - 62
 ValueSet-OrganizationProfessionOIDTypeVS.json                           OrganizationProfessionOIDTypeVS                           ValueSet    valuesets/OrganizationProfessionOIDTypeVS.fsh          1 - 4
-ValueSet-OrganizationProviderTypeVS.json                                OrganizationProviderTypeVS                                ValueSet    valuesets/OrganizationProviderTypeVS.fsh               1 - 4
+ValueSet-OrganizationTypeVS.json                                        OrganizationTypeVS                                        ValueSet    valuesets/OrganizationTypeVS.fsh                       1 - 4
 ValueSet-OrganizationVisibilityVS.json                                  OrganizationVisibilityVS                                  ValueSet    profiles/Extension.fsh                                 18 - 23
 ValueSet-OriginVS.json                                                  OriginVS                                                  ValueSet    valuesets/OriginVS.fsh                                 1 - 4
 ValueSet-PractitionerQualificationVS.json                               PractitionerQualificationVS                               ValueSet    valuesets/PractitionerQualificationVS.fsh              1 - 457

diff --git a/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json b/src/fhir/fsh-generated/resources/StructureDefinition-OrganizationDirectory.json
@@ -173,7 +173,7 @@
         "mustSupport": true,
         "binding": {
           "strength": "required",
-          "valueSet": "https://gematik.de/fhir/directory/ValueSet/OrganizationProviderTypeVS"
+          "valueSet": "https://gematik.de/fhir/directory/ValueSet/OrganizationTypeVS"
         }
       },
       {

diff --git a/.../ValueSet-OrganizationProviderTypeVS.json → ...esources/ValueSet-OrganizationTypeVS.json b/.../ValueSet-OrganizationProviderTypeVS.json → ...esources/ValueSet-OrganizationTypeVS.json
@@ -1,10 +1,10 @@
 {
   "resourceType": "ValueSet",
   "status": "active",
-  "name": "OrganizationProviderTypeVS",
-  "id": "OrganizationProviderTypeVS",
+  "name": "OrganizationTypeVS",
+  "id": "OrganizationTypeVS",
   "description": "ValueSet for `Organization.type`",
-  "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationProviderTypeVS",
+  "url": "https://gematik.de/fhir/directory/ValueSet/OrganizationTypeVS",
   "publisher": "gematik GmbH",
   "version": "0.11.0",
   "compose": {

diff --git a/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh b/src/fhir/input/fsh/profiles/OrganizationDirectory.fsh
@@ -32,7 +32,7 @@ organisations specific for german Healthcare and Telematics Infrastructure.
   * ^slicing.discriminator.path = "$this"
   * ^slicing.rules = #open
 * type contains providerType 0..*  MS and profession 0..* MS
-* type[providerType] from OrganizationProviderTypeVS
+* type[providerType] from OrganizationTypeVS
 * type[profession] from OrganizationProfessionOIDTypeVS
 * name 1..1 MS
 * alias MS

diff --git a/.../valuesets/OrganizationProviderTypeVS.fsh → ...nput/fsh/valuesets/OrganizationTypeVS.fsh b/.../valuesets/OrganizationProviderTypeVS.fsh → ...nput/fsh/valuesets/OrganizationTypeVS.fsh
@@ -1,4 +1,4 @@
-ValueSet: OrganizationProviderTypeVS
+ValueSet: OrganizationTypeVS
 Description: "ValueSet for `Organization.type`"
 * insert Meta
 * include codes from system OrganizationProviderType