Merge pull request #29 from gematik/feature/update-workflow-1-4

Feature/update-workflow-1-4
gematik · Aug 20, 2024 · 22d726a · 22d726a
2 parents 825bc9e + 12817d4
commit 22d726a
Show file tree

Hide file tree

Showing 32 changed files with 310 additions and 2,689 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -52,11 +52,11 @@ jobs:
           JAVA_VALIDATION_ENABLED: true
           OUTPUT_FORMAT: RAW
           JAVA_VALIDATION_OPTIONS: -allow-example-urls true
-          JAVA_VALIDATOR_VERSION: 6.0.11
+          JAVA_VALIDATOR_VERSION: 6.3.18
           SIMPLIFIER_USERNAME: ${{ secrets.SIMPLIFIER_USERNAME }}
           SIMPLIFIER_PASSWORD: ${{ secrets.SIMPLIFIER_PASSWORD }}
           SUSHI_ENABLED: true
-          SUSHI_VERSION: 3.5.0
+          SUSHI_VERSION: 3.11.0
           SUSHI_OPTIONS: Resources/
           EXPECTED_FAILS: VALIDATION_CONFORMANCE_DOTNET VALIDATION_CONFORMANCE_JAVA VALIDATION_EXAMPLES_JAVA
 

diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
@@ -0,0 +1,114 @@
+[
+  {
+    "outputFile": "ChargeItem-ChargeItem-GET-Completed.json",
+    "fshName": "ChargeItem-GET-Completed",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_ChargeItem.fsh",
+    "startLine": 1,
+    "endLine": 29
+  },
+  {
+    "outputFile": "ChargeItem-ChargeItem-POST-Binary.json",
+    "fshName": "ChargeItem-POST-Binary",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_ChargeItem.fsh",
+    "startLine": 31,
+    "endLine": 50
+  },
+  {
+    "outputFile": "CodeSystem-GEM-ERPCHRG-CS-ConsentType.json",
+    "fshName": "GEM_ERPCHRG_CS_ConsentType",
+    "fshType": "CodeSystem",
+    "fshFile": "codesystems/GEM_ERPCHRG_CS_ConsentType.fsh",
+    "startLine": 1,
+    "endLine": 7
+  },
+  {
+    "outputFile": "Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json",
+    "fshName": "Communication_ChargChangeReply_Gkv",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_Communication_ChargChangeReply.fsh",
+    "startLine": 1,
+    "endLine": 15
+  },
+  {
+    "outputFile": "Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json",
+    "fshName": "Communication_ChargChangeReply_Pkv",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_Communication_ChargChangeReply.fsh",
+    "startLine": 17,
+    "endLine": 31
+  },
+  {
+    "outputFile": "Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json",
+    "fshName": "Communication_ChargChangeRequest_Gkv",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_Communication_ChargChangeRequest.fsh",
+    "startLine": 1,
+    "endLine": 15
+  },
+  {
+    "outputFile": "Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json",
+    "fshName": "Communication_ChargChangeRequest_Pkv",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_Communication_ChargChangeRequest.fsh",
+    "startLine": 18,
+    "endLine": 32
+  },
+  {
+    "outputFile": "Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json",
+    "fshName": "ChargeItemConsent",
+    "fshType": "Instance",
+    "fshFile": "examples/Example_Consent.fsh",
+    "startLine": 1,
+    "endLine": 16
+  },
+  {
+    "outputFile": "StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json",
+    "fshName": "GEM_ERPCHRG_EX_MarkingFlag",
+    "fshType": "Extension",
+    "fshFile": "extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh",
+    "startLine": 1,
+    "endLine": 37
+  },
+  {
+    "outputFile": "StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json",
+    "fshName": "GEM_ERPCHRG_PR_ChargeItem",
+    "fshType": "Profile",
+    "fshFile": "profiles/GEM_ERPCHRG_PR_ChargeItem.fsh",
+    "startLine": 1,
+    "endLine": 68
+  },
+  {
+    "outputFile": "StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json",
+    "fshName": "GEM_ERPCHRG_PR_Communication_ChargChangeReply",
+    "fshType": "Profile",
+    "fshFile": "profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh",
+    "startLine": 1,
+    "endLine": 24
+  },
+  {
+    "outputFile": "StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json",
+    "fshName": "GEM_ERPCHRG_PR_Communication_ChargChangeReq",
+    "fshType": "Profile",
+    "fshFile": "profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReq.fsh",
+    "startLine": 1,
+    "endLine": 26
+  },
+  {
+    "outputFile": "StructureDefinition-GEM-ERPCHRG-PR-Consent.json",
+    "fshName": "GEM_ERPCHRG_PR_Consent",
+    "fshType": "Profile",
+    "fshFile": "profiles/GEM_ERPCHRG_PR_Consent.fsh",
+    "startLine": 1,
+    "endLine": 18
+  },
+  {
+    "outputFile": "ValueSet-GEM-ERPCHRG-VS-ConsentType.json",
+    "fshName": "GEM_ERPCHRG_VS_ConsentType",
+    "fshType": "ValueSet",
+    "fshFile": "valuesets/GEM_ERPCHRG_VS_ConsentType.fsh",
+    "startLine": 1,
+    "endLine": 6
+  }
+]
diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt
@@ -0,0 +1,15 @@
+Output File                                                             Name                                           Type        FSH File                                                    Lines
+ChargeItem-ChargeItem-GET-Completed.json                                ChargeItem-GET-Completed                       Instance    examples/Example_ChargeItem.fsh                             1 - 29
+ChargeItem-ChargeItem-POST-Binary.json                                  ChargeItem-POST-Binary                         Instance    examples/Example_ChargeItem.fsh                             31 - 50
+CodeSystem-GEM-ERPCHRG-CS-ConsentType.json                              GEM_ERPCHRG_CS_ConsentType                     CodeSystem  codesystems/GEM_ERPCHRG_CS_ConsentType.fsh                  1 - 7
+Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json                 Communication_ChargChangeReply_Gkv             Instance    examples/Example_Communication_ChargChangeReply.fsh         1 - 15
+Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json                 Communication_ChargChangeReply_Pkv             Instance    examples/Example_Communication_ChargChangeReply.fsh         17 - 31
+Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json                 Communication_ChargChangeRequest_Gkv           Instance    examples/Example_Communication_ChargChangeRequest.fsh       1 - 15
+Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json                 Communication_ChargChangeRequest_Pkv           Instance    examples/Example_Communication_ChargChangeRequest.fsh       18 - 32
+Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json                       ChargeItemConsent                              Instance    examples/Example_Consent.fsh                                1 - 16
+StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json                     GEM_ERPCHRG_EX_MarkingFlag                     Extension   extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh                   1 - 37
+StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json                      GEM_ERPCHRG_PR_ChargeItem                      Profile     profiles/GEM_ERPCHRG_PR_ChargeItem.fsh                      1 - 68
+StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json  GEM_ERPCHRG_PR_Communication_ChargChangeReply  Profile     profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh  1 - 24
+StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json    GEM_ERPCHRG_PR_Communication_ChargChangeReq    Profile     profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReq.fsh    1 - 26
+StructureDefinition-GEM-ERPCHRG-PR-Consent.json                         GEM_ERPCHRG_PR_Consent                         Profile     profiles/GEM_ERPCHRG_PR_Consent.fsh                         1 - 18
+ValueSet-GEM-ERPCHRG-VS-ConsentType.json                                GEM_ERPCHRG_VS_ConsentType                     ValueSet    valuesets/GEM_ERPCHRG_VS_ConsentType.fsh                    1 - 6
diff --git a/...abc825bc-bc30-45f8-b109-1b343fff5c45.json → .../ChargeItem-ChargeItem-GET-Completed.json b/...abc825bc-bc30-45f8-b109-1b343fff5c45.json → .../ChargeItem-ChargeItem-GET-Completed.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "ChargeItem",
-  "id": "abc825bc-bc30-45f8-b109-1b343fff5c45",
+  "id": "ChargeItem-GET-Completed",
   "meta": {
     "profile": [
       "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_ChargeItem|1.0"

diff --git a/...s/ChargeItem-ChargeItemExampleBinary.json → ...es/ChargeItem-ChargeItem-POST-Binary.json b/...s/ChargeItem-ChargeItemExampleBinary.json → ...es/ChargeItem-ChargeItem-POST-Binary.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "ChargeItem",
-  "id": "ChargeItemExampleBinary",
+  "id": "ChargeItem-POST-Binary",
   "meta": {
     "profile": [
       "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_ChargeItem|1.0"
@@ -48,7 +48,15 @@
   "subject": {
     "identifier": {
       "system": "http://fhir.de/sid/pkv/kvid-10",
-      "value": "X234567890"
+      "value": "X234567890",
+      "type": {
+        "coding": [
+          {
+            "code": "PKV",
+            "system": "http://fhir.de/CodeSystem/identifier-type-de-basis"
+          }
+        ]
+      }
     }
   },
   "enteredDate": "2022-12-16T07:13:00+05:00"

diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json
@@ -6,14 +6,14 @@
   "id": "GEM-ERPCHRG-CS-ConsentType",
   "title": "CodeSystem of types for a consent",
   "description": "Type of patient consent.",
+  "version": "1.0",
   "url": "https://gematik.de/fhir/erpchrg/CodeSystem/GEM_ERPCHRG_CS_ConsentType",
   "concept": [
     {
       "code": "CHARGCONS",
       "display": "Consent for saving electronic charge item"
     }
   ],
-  "version": "1.0",
   "publisher": "gematik GmbH",
   "contact": [
     {

diff --git a/Resources/fsh-generated/resources/Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json b/Resources/fsh-generated/resources/Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json
@@ -32,8 +32,8 @@
       "type": {
         "coding": [
           {
-            "system": "http://fhir.de/CodeSystem/identifier-type-de-basis",
-            "code": "PKV"
+            "code": "PKV",
+            "system": "http://fhir.de/CodeSystem/identifier-type-de-basis"
           }
         ]
       },

diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json
@@ -8,13 +8,6 @@
   "experimental": false,
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    }
-  ],
   "kind": "complex-type",
   "abstract": false,
   "context": [
@@ -71,15 +64,6 @@
       {
         "id": "Extension.extension:insuranceProvider.value[x]",
         "path": "Extension.extension.value[x]",
-        "slicing": {
-          "discriminator": [
-            {
-              "type": "type",
-              "path": "$this"
-            }
-          ],
-          "rules": "closed"
-        },
         "short": "true = submitted to insurance provider",
         "type": [
           {
@@ -109,15 +93,6 @@
       {
         "id": "Extension.extension:subsidy.value[x]",
         "path": "Extension.extension.value[x]",
-        "slicing": {
-          "discriminator": [
-            {
-              "type": "type",
-              "path": "$this"
-            }
-          ],
-          "rules": "closed"
-        },
         "short": "true = submitted to aid organization",
         "type": [
           {
@@ -147,15 +122,6 @@
       {
         "id": "Extension.extension:taxOffice.value[x]",
         "path": "Extension.extension.value[x]",
-        "slicing": {
-          "discriminator": [
-            {
-              "type": "type",
-              "path": "$this"
-            }
-          ],
-          "rules": "closed"
-        },
         "short": "true = submitted to tax office",
         "type": [
           {

diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json
@@ -8,28 +8,6 @@
   "experimental": false,
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "workflow",
-      "uri": "http://hl7.org/fhir/workflow",
-      "name": "Workflow Pattern"
-    },
-    {
-      "identity": "v2",
-      "uri": "http://hl7.org/v2",
-      "name": "HL7 v2 Mapping"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": false,
   "type": "ChargeItem",

diff --git a/...enerated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json b/...enerated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json
@@ -10,23 +10,6 @@
   "publisher": "gematik GmbH",
   "description": "Ressource used for the communication to reply to a change request on a ChargeItem",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "workflow",
-      "uri": "http://hl7.org/fhir/workflow",
-      "name": "Workflow Pattern"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": true,
   "type": "Communication",
@@ -112,8 +95,8 @@
           {
             "code": "Identifier",
             "profile": [
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10",
-              "http://fhir.de/StructureDefinition/identifier-kvid-10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10",
+              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
             ]
           }
         ]

diff --git a/...-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json b/...-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json
@@ -10,23 +10,6 @@
   "publisher": "gematik GmbH",
   "description": "Ressource used for the communication of Change Request on an existing ChargeItem between patient and pharmacy",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "workflow",
-      "uri": "http://hl7.org/fhir/workflow",
-      "name": "Workflow Pattern"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": true,
   "type": "Communication",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json
@@ -8,28 +8,6 @@
   "experimental": false,
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
-  "mapping": [
-    {
-      "identity": "workflow",
-      "uri": "http://hl7.org/fhir/workflow",
-      "name": "Workflow Pattern"
-    },
-    {
-      "identity": "v2",
-      "uri": "http://hl7.org/v2",
-      "name": "HL7 v2 Mapping"
-    },
-    {
-      "identity": "rim",
-      "uri": "http://hl7.org/v3",
-      "name": "RIM Mapping"
-    },
-    {
-      "identity": "w5",
-      "uri": "http://hl7.org/fhir/fivews",
-      "name": "FiveWs Pattern Mapping"
-    }
-  ],
   "kind": "resource",
   "abstract": false,
   "type": "Consent",
@@ -106,8 +84,8 @@
           {
             "code": "Identifier",
             "profile": [
-              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10",
-              "http://fhir.de/StructureDefinition/identifier-kvid-10"
+              "http://fhir.de/StructureDefinition/identifier-kvid-10",
+              "https://fhir.kbv.de/StructureDefinition/KBV_PR_FOR_Identifier_PkvID_10"
             ]
           }
         ]