Merge pull request #22 from gematik/bugfix/examples

Add missing trailing zeros
gematik · Feb 28, 2023 · 171924e · 171924e
2 parents e96c0ae + 6920f72
commit 171924e
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 1,665 deletions.
diff --git a/Resources/fsh-generated/resources/Bundle-Response-Apotheker-GETChargeItemById.json b/Resources/fsh-generated/resources/Bundle-Response-Apotheker-GETChargeItemById.json
diff --git a/Resources/fsh-generated/resources/Bundle-Response-App-GETChargeItemById.json b/Resources/fsh-generated/resources/Bundle-Response-App-GETChargeItemById.json
diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERPCHRG-PR-ChargeItem",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Financial.General"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_ChargeItem",
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_ChargeItem",

diff --git a/...enerated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json b/...enerated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERPCHRG-PR-Communication-ChargChangeReply",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Clinical.Request &amp; Response"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_Communication_ChargChangeReply",
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Communication_ChargChangeReply",

diff --git a/...-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json b/...-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERPCHRG-PR-Communication-ChargChangeReq",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Clinical.Request &amp; Response"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_Communication_ChargChangeReq",
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Communication_ChargChangeReq",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json
@@ -1,16 +1,6 @@
 {
   "resourceType": "StructureDefinition",
   "id": "GEM-ERPCHRG-PR-Consent",
-  "extension": [
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-category",
-      "valueString": "Foundation.Security"
-    },
-    {
-      "url": "http://hl7.org/fhir/StructureDefinition/structuredefinition-security-category",
-      "valueCode": "patient"
-    }
-  ],
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_Consent",
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Consent",

diff --git a/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_ChargeItem.fsh b/Resources/input/fsh/profiles/GEM_ERPCHRG_PR_ChargeItem.fsh
@@ -125,6 +125,13 @@ Usage: #example
 * supportingInformation[dispenseItemBinary].display = "Binary"
 
 /*******************************************************/
+/*
+
+Dieser Block ist auskommentiert, da derzeit SUSHI noch einen Fehler enthält. Runde Dezimalwerte werden gerundet. Somit wird aus dem MwSteuersatz 19.00 -> 19
+Die korrigierten Beispiele liegen unter /corrected_decimal_values_bundles
+Falls Änderungen an den Beispielen geschehen sollen sind diese zu generieren -> korrigieren und dann in corrected_decimal_values_bundles zu kopieren.
+https://github.com/FHIR/sushi/issues/1215
+
 Instance: Response_App_GETChargeItemById
 InstanceOf: Bundle
 Usage: #example
@@ -141,6 +148,8 @@ Usage: #example
 * entry[+].fullUrl = "https://prescriptionserver.telematik/Bundle/dffbfd6a-5712-4798-bdc8-07201eb77ab8"
 * entry[=].resource = QuittungsBundleExample
 
+*/
+
 Instance: App-ChargeItem-abc825bc-bc30-45f8-b109-1b343fff5c45
 InstanceOf: ChargeItem
 Usage: #inline
@@ -166,6 +175,12 @@ Usage: #inline
 * supportingInformation[+] = Reference(Bundle/dffbfd6a-5712-4798-bdc8-07201eb77ab8) "https://gematik.de/fhir/erp/StructureDefinition/GEM_ERP_PR_Bundle"
 
 /*******************************************************/
+/*
+
+Dieser Block ist auskommentiert, da derzeit SUSHI noch einen Fehler enthält. Runde Dezimalwerte werden gerundet. Somit wird aus dem MwSteuersatz 19.00 -> 19
+Die korrigierten Beispiele liegen unter /corrected_decimal_values_bundles
+Falls Änderungen an den Beispielen geschehen sollen sind diese zu generieren -> korrigieren und dann in corrected_decimal_values_bundles zu kopieren.
+https://github.com/FHIR/sushi/issues/1215
 
 Instance: Response_Apotheker_GETChargeItemById
 InstanceOf: Bundle
@@ -200,7 +215,7 @@ Usage: #inline
 * enterer.identifier.value = "3-SMC-B-Testkarte-883110000095957"
 * enteredDate = "2021-06-01T07:13:00+05:00"
 * supportingInformation[0] = Reference(Bundle/f548dde3-a319-486b-8624-6176ff41ad90) "http://fhir.abda.de/eRezeptAbgabedaten/StructureDefinition/DAV-PKV-PR-ERP-AbgabedatenBundle"
-
+*/
 /*******************************************************/
 
 Instance: PrescriptionBundleExample

diff --git a/corrected_decimal_values_bundles/Bundle-Response-App-GETChargeItemById.json b/corrected_decimal_values_bundles/Bundle-Response-App-GETChargeItemById.json
@@ -341,18 +341,14 @@
                       }
                     ]
                   },
-                  "given": [
-                    "Sahra"
-                  ]
+                  "given": ["Sahra"]
                 }
               ],
               "birthDate": "1970-12-24",
               "address": [
                 {
                   "type": "both",
-                  "line": [
-                    "Berliner Straße 1"
-                  ],
+                  "line": ["Berliner Straße 1"],
                   "_line": [
                     {
                       "extension": [
@@ -410,9 +406,7 @@
                       }
                     ]
                   },
-                  "given": [
-                    "Ben"
-                  ]
+                  "given": ["Ben"]
                 }
               ],
               "qualification": [
@@ -478,10 +472,7 @@
               "address": [
                 {
                   "type": "both",
-                  "line": [
-                    "Herbert-Lewin-Platz 2",
-                    "Erdgeschoss"
-                  ],
+                  "line": ["Herbert-Lewin-Platz 2", "Erdgeschoss"],
                   "_line": [
                     {
                       "extension": [
@@ -678,9 +669,7 @@
               "address": [
                 {
                   "type": "physical",
-                  "line": [
-                    "Taunusstraße 89"
-                  ],
+                  "line": ["Taunusstraße 89"],
                   "_line": [
                     {
                       "extension": [
@@ -826,7 +815,7 @@
                       "extension": [
                         {
                           "url": "http://fhir.abda.de/eRezeptAbgabedaten/StructureDefinition/DAV-EX-ERP-MwStSatz",
-                          "valueDecimal": 19
+                          "valueDecimal": 19.00
                         },
                         {
                           "url": "http://fhir.abda.de/eRezeptAbgabedaten/StructureDefinition/DAV-EX-ERP-KostenVersicherter",
@@ -1129,4 +1118,4 @@
       }
     }
   ]
-}
+}