Merge pull request #31 from gematik/feature/fsh-improvements

Implement FSH improvements
gematik · Dec 3, 2024 · e923588 · e923588
2 parents d6d50aa + 2faaea3
commit e923588
Show file tree

Hide file tree

Showing 18 changed files with 80 additions and 194 deletions.
diff --git a/Resources/fsh-generated/fsh-index.json b/Resources/fsh-generated/fsh-index.json
@@ -13,7 +13,7 @@
     "fshType": "Instance",
     "fshFile": "examples/Example_ChargeItem.fsh",
     "startLine": 22,
-    "endLine": 40
+    "endLine": 37
   },
   {
     "outputFile": "CodeSystem-GEM-ERPCHRG-CS-ConsentType.json",
@@ -25,43 +25,27 @@
   },
   {
     "outputFile": "Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json",
-    "fshName": "Communication_ChargChangeReply_Gkv",
+    "fshName": "Communication_ChargChangeReply",
     "fshType": "Instance",
     "fshFile": "examples/Example_Communication_ChargChangeReply.fsh",
     "startLine": 1,
-    "endLine": 14
-  },
-  {
-    "outputFile": "Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json",
-    "fshName": "Communication_ChargChangeReply_Pkv",
-    "fshType": "Instance",
-    "fshFile": "examples/Example_Communication_ChargChangeReply.fsh",
-    "startLine": 16,
-    "endLine": 29
+    "endLine": 12
   },
   {
     "outputFile": "Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json",
-    "fshName": "Communication_ChargChangeRequest_Gkv",
+    "fshName": "Communication_ChargChangeRequest",
     "fshType": "Instance",
     "fshFile": "examples/Example_Communication_ChargChangeRequest.fsh",
     "startLine": 1,
-    "endLine": 14
-  },
-  {
-    "outputFile": "Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json",
-    "fshName": "Communication_ChargChangeRequest_Pkv",
-    "fshType": "Instance",
-    "fshFile": "examples/Example_Communication_ChargChangeRequest.fsh",
-    "startLine": 17,
-    "endLine": 30
+    "endLine": 12
   },
   {
     "outputFile": "Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json",
-    "fshName": "ChargeItemConsent",
+    "fshName": "ChargeItemConsent-Response",
     "fshType": "Instance",
     "fshFile": "examples/Example_Consent.fsh",
-    "startLine": 1,
-    "endLine": 14
+    "startLine": 15,
+    "endLine": 27
   },
   {
     "outputFile": "StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json",
@@ -85,7 +69,7 @@
     "fshType": "Profile",
     "fshFile": "profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh",
     "startLine": 1,
-    "endLine": 24
+    "endLine": 23
   },
   {
     "outputFile": "StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json",

diff --git a/Resources/fsh-generated/fsh-index.txt b/Resources/fsh-generated/fsh-index.txt
@@ -1,15 +1,13 @@
 Output File                                                             Name                                           Type        FSH File                                                    Lines
 ChargeItem-ChargeItem-GET-Completed.json                                ChargeItem-GET-Completed                       Instance    examples/Example_ChargeItem.fsh                             1 - 20
-ChargeItem-ChargeItem-POST-Binary.json                                  ChargeItem-POST-Binary                         Instance    examples/Example_ChargeItem.fsh                             22 - 40
+ChargeItem-ChargeItem-POST-Binary.json                                  ChargeItem-POST-Binary                         Instance    examples/Example_ChargeItem.fsh                             22 - 37
 CodeSystem-GEM-ERPCHRG-CS-ConsentType.json                              GEM_ERPCHRG_CS_ConsentType                     CodeSystem  codesystem/GEM_ERPCHRG_CS_ConsentType.fsh                   1 - 7
-Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json                 Communication_ChargChangeReply_Gkv             Instance    examples/Example_Communication_ChargChangeReply.fsh         1 - 14
-Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json                 Communication_ChargChangeReply_Pkv             Instance    examples/Example_Communication_ChargChangeReply.fsh         16 - 29
-Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json                 Communication_ChargChangeRequest_Gkv           Instance    examples/Example_Communication_ChargChangeRequest.fsh       1 - 14
-Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json                 Communication_ChargChangeRequest_Pkv           Instance    examples/Example_Communication_ChargChangeRequest.fsh       17 - 30
-Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json                       ChargeItemConsent                              Instance    examples/Example_Consent.fsh                                1 - 14
+Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json                 Communication_ChargChangeReply                 Instance    examples/Example_Communication_ChargChangeReply.fsh         1 - 12
+Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json                 Communication_ChargChangeRequest               Instance    examples/Example_Communication_ChargChangeRequest.fsh       1 - 12
+Consent-0dcc5d4c-bf24-4c06-b02e-be5bc24587e2.json                       ChargeItemConsent-Response                     Instance    examples/Example_Consent.fsh                                15 - 27
 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 - 71
-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-ChargChangeReply.json  GEM_ERPCHRG_PR_Communication_ChargChangeReply  Profile     profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReply.fsh  1 - 23
 StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json    GEM_ERPCHRG_PR_Communication_ChargChangeReq    Profile     profiles/GEM_ERPCHRG_PR_Communication_ChargChangeReq.fsh    1 - 22
 StructureDefinition-GEM-ERPCHRG-PR-Consent.json                         GEM_ERPCHRG_PR_Consent                         Profile     profiles/GEM_ERPCHRG_PR_Consent.fsh                         1 - 24
 ValueSet-GEM-ERPCHRG-VS-ConsentType.json                                GEM_ERPCHRG_VS_ConsentType                     ValueSet    valuesets/GEM_ERPCHRG_VS_ConsentType.fsh                    1 - 6
diff --git a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-GET-Completed.json
@@ -20,7 +20,7 @@
   "subject": {
     "identifier": {
       "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X234567890"
+      "value": "P987654321"
     }
   },
   "extension": [
@@ -45,7 +45,7 @@
   "enterer": {
     "identifier": {
       "system": "https://gematik.de/fhir/sid/telematik-id",
-      "value": "3-15.2.1456789123.191"
+      "value": "3-2-APO-XanthippeVeilchenblau01"
     }
   },
   "supportingInformation": [
@@ -70,5 +70,5 @@
       }
     ]
   },
-  "enteredDate": "2022-12-16T06:13:00+05:00"
+  "enteredDate": "2025-10-01T15:29:00.434+00:00"
 }
diff --git a/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json b/Resources/fsh-generated/resources/ChargeItem-ChargeItem-POST-Binary.json
@@ -19,22 +19,14 @@
   ],
   "subject": {
     "identifier": {
-      "type": {
-        "coding": [
-          {
-            "system": "http://fhir.de/CodeSystem/identifier-type-de-basis",
-            "code": "PKV"
-          }
-        ]
-      },
       "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X234567890"
+      "value": "P987654321"
     }
   },
   "enterer": {
     "identifier": {
       "system": "https://gematik.de/fhir/sid/telematik-id",
-      "value": "3-15.2.1456789123.191"
+      "value": "3-2-APO-XanthippeVeilchenblau01"
     }
   },
   "supportingInformation": [
@@ -59,5 +51,5 @@
       }
     ]
   },
-  "enteredDate": "2022-12-16T07:13:00+05:00"
+  "enteredDate": "2025-10-01T15:29:00.434+00:00"
 }
diff --git a/Resources/fsh-generated/resources/Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json b/Resources/fsh-generated/resources/Communication-3bbc2209-9c23-4553-986e-a5c9f69a39fb.json
@@ -16,22 +16,22 @@
     {
       "identifier": {
         "system": "http://fhir.de/sid/gkv/kvid-10",
-        "value": "X234567890"
+        "value": "P987654321"
       }
     }
   ],
   "sender": {
     "identifier": {
       "system": "https://gematik.de/fhir/sid/telematik-id",
-      "value": "3-SMC-B-Testkarte-883110000123465"
+      "value": "3-2-APO-XanthippeVeilchenblau01"
     }
   },
   "basedOn": [
     {
       "reference": "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8"
     }
   ],
-  "sent": "2022-04-29T13:46:30.128+02:00",
+  "sent": "2025-10-01T15:29:00.434+00:00",
   "payload": [
     {
       "contentString": "Erledigt."

diff --git a/Resources/fsh-generated/resources/Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json b/Resources/fsh-generated/resources/Communication-7bbc2209-9c23-4553-986e-a5c9f69a39fp.json
diff --git a/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json b/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29f2.json
@@ -16,22 +16,22 @@
     {
       "identifier": {
         "system": "https://gematik.de/fhir/sid/telematik-id",
-        "value": "3-SMC-B-Testkarte-883110000123465"
+        "value": "3-2-APO-XanthippeVeilchenblau01"
       }
     }
   ],
   "sender": {
     "identifier": {
       "system": "http://fhir.de/sid/gkv/kvid-10",
-      "value": "X234567890"
+      "value": "P987654321"
     }
   },
   "basedOn": [
     {
       "reference": "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8?ac=777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
     }
   ],
-  "sent": "2020-04-29T13:43:30.128+02:00",
+  "sent": "2025-10-01T15:29:00.434+00:00",
   "payload": [
     {
       "contentString": "Bitte meinen Namen in Günther ändern, Waltraud ist falsch."

diff --git a/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json b/Resources/fsh-generated/resources/Communication-b4cf7f71-3ade-40ab-97a9-929f95af29fp.json
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
@@ -16,7 +16,7 @@
           "value": "168140950"
         }
       },
-      "value": "X234567890"
+      "value": "P987654321"
     }
   },
   "scope": {
@@ -39,7 +39,7 @@
       ]
     }
   ],
-  "dateTime": "2022-06-01T07:13:00+05:00",
+  "dateTime": "2025-10-01T15:29:00.434+00:00",
   "policyRule": {
     "coding": [
       {

diff --git a/...enerated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json b/...enerated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json
@@ -11,7 +11,7 @@
   "description": "Ressource used for the communication to reply to a change request on a ChargeItem",
   "fhirVersion": "4.0.1",
   "kind": "resource",
-  "abstract": true,
+  "abstract": false,
   "type": "Communication",
   "baseDefinition": "http://hl7.org/fhir/StructureDefinition/Communication",
   "derivation": "constraint",

diff --git a/Resources/input/fsh/aliases.fsh b/Resources/input/fsh/aliases.fsh
@@ -1,5 +1,6 @@
 Alias: $identifier-telematik-id = https://gematik.de/fhir/sid/telematik-id
 Alias: $identifier-kvid-10 = http://fhir.de/sid/gkv/kvid-10
+Alias: $identifier-iknr = http://fhir.de/sid/arge-ik/iknr
 
 Alias: $DAV-PKV-PR-ERP-AbgabedatenBundle = http://fhir.abda.de/eRezeptAbgabedaten/StructureDefinition/DAV-PKV-PR-ERP-AbgabedatenBundle
 

diff --git a/Resources/input/fsh/examples/Example_ChargeItem.fsh b/Resources/input/fsh/examples/Example_ChargeItem.fsh
@@ -9,9 +9,9 @@ Usage: #example
 * identifier[AccessCode].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
 * status = #billable
 * code = http://terminology.hl7.org/CodeSystem/data-absent-reason#not-applicable
-* subject.identifier.value = "X234567890"
-* enterer.identifier.value = "3-15.2.1456789123.191"
-* enteredDate = "2022-12-16T06:13:00+05:00"
+* insert PKV_Identifier(subject.identifier)
+* insert ApoTelematikID(enterer.identifier)
+* insert DateTimeStamp(enteredDate)
 * supportingInformation[dispenseItemBundle] = Reference(Bundle/72bd741c-7ad8-41d8-97c3-9aabbdd0f5b4)
 * supportingInformation[dispenseItemBundle].display = $DAV-PKV-PR-ERP-AbgabedatenBundle
 * supportingInformation[receiptBundle] = Reference(Bundle/200.000.000.000.000.01)
@@ -30,11 +30,8 @@ Usage: #example
 * identifier[AccessCode].value = "777bea0e13cc9c42ceec14aec3ddee2263325dc2c6c699db115f58fe423607ea"
 * status = #billable
 * code = http://terminology.hl7.org/CodeSystem/data-absent-reason#not-applicable
-* subject.identifier.system = $identifier-kvid-10
-* subject.identifier.value = "X234567890"
-* subject.identifier.type.coding = http://fhir.de/CodeSystem/identifier-type-de-basis#PKV
-* enterer.identifier.system = $identifier-telematik-id
-* enterer.identifier.value = "3-15.2.1456789123.191"
-* enteredDate = "2022-12-16T07:13:00+05:00"
+* insert PKV_Identifier(subject.identifier)
+* insert ApoTelematikID(enterer.identifier)
+* insert DateTimeStamp(enteredDate)
 * supportingInformation[dispenseItemBinary].reference = "#c8720f99-6641-432d-94be-d49eaa164755"
 * supportingInformation[dispenseItemBinary].display = "Binary"
diff --git a/Resources/input/fsh/examples/Example_Communication_ChargChangeReply.fsh b/Resources/input/fsh/examples/Example_Communication_ChargChangeReply.fsh
@@ -1,29 +1,12 @@
-Instance: Communication_ChargChangeReply_Gkv
+Instance: Communication_ChargChangeReply
 InstanceOf: GEM_ERPCHRG_PR_Communication_ChargChangeReply
 Title: "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message"
 Usage: #example
 * id = "3bbc2209-9c23-4553-986e-a5c9f69a39fb"
 * meta.tag.display = "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message"
 * basedOn.reference = "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90a8"
 * status = #unknown
-* sender.identifier.system = $identifier-telematik-id
-* sender.identifier.value = "3-SMC-B-Testkarte-883110000123465"
-* recipient[+].identifier.system = "http://fhir.de/sid/gkv/kvid-10"
-* recipient[=].identifier.value = "X234567890"
-* sent = "2022-04-29T13:46:30.128+02:00"
+* insert PKV_Identifier(recipient.identifier)
+* insert ApoTelematikID(sender.identifier)
+* insert DateTimeStamp(sent)
 * payload.contentString = "Erledigt."
-
-Instance: Communication_ChargChangeReply_Pkv
-InstanceOf: GEM_ERPCHRG_PR_Communication_ChargChangeReply
-Title: "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message"
-Usage: #example
-* id = "7bbc2209-9c23-4553-986e-a5c9f69a39fp"
-* meta.tag.display = "Communication message sent by pharmacy to patient in response to a previous ChargeItem-related message"
-* basedOn.reference = "ChargeItem/a51520ec-0899-404f-bb97-fe7d461f90ap"
-* status = #unknown
-* sender.identifier.system = $identifier-telematik-id
-* sender.identifier.value = "3-SMC-B-Testkarte-883110000123465"
-* recipient[+].identifier.system = $identifier-kvid-10
-* recipient[=].identifier.value = "X234567890"
-* sent = "2022-07-04T13:46:30.128+02:00"
-* payload.contentString = "Erledigt."