fixed timestamp in example

gematik · Feb 23, 2024 · 9971d5b · 9971d5b
1 parent 40d36f4
commit 9971d5b
Show file tree

Hide file tree

Showing 22 changed files with 53 additions and 85 deletions.
diff --git a/Resources/fsh-generated/resources/Bundle-UC1-1-Prescription-Request-To-Prescriber.json b/Resources/fsh-generated/resources/Bundle-UC1-1-Prescription-Request-To-Prescriber.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2015-02-07T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC1-HealthCareService-to-Practitioner-MessageHeader",
@@ -458,8 +459,5 @@
         }
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2015-02-07T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC1-2-Fullfilled-Prescription-Request.json b/Resources/fsh-generated/resources/Bundle-UC1-2-Fullfilled-Prescription-Request.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2023-01-30T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC1-Practitioner-to-HealthCareService-MessageHeader",
@@ -581,8 +582,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-01-30T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC1-3-Dispense-Request-To-Pharmacy.json b/Resources/fsh-generated/resources/Bundle-UC1-3-Dispense-Request-To-Pharmacy.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
   },
+  "timestamp": "2023-02-01T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC1-HealthCareService-to-Pharmacy-MessageHeader",
@@ -180,8 +181,5 @@
         "authoredOn": "2023-02-01"
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-02-01T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC1-4-Fullfilled-DispenseRequest-To-Pharmacy.json b/Resources/fsh-generated/resources/Bundle-UC1-4-Fullfilled-DispenseRequest-To-Pharmacy.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
   },
+  "timestamp": "2023-02-01T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC1-Pharmacy-to-HealthCareService-MessageHeader",
@@ -363,8 +364,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-02-01T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/...s/fsh-generated/resources/Bundle-UC1-Storno-1-Cancellation-Of-Prescription-Requester.json b/...s/fsh-generated/resources/Bundle-UC1-Storno-1-Cancellation-Of-Prescription-Requester.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2015-02-07T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC1-HealthCareService-to-Practitioner-MessageHeader-Storno",
@@ -454,8 +455,5 @@
         }
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2015-02-07T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC1-Storno-2-Cancellation-Of-Prescriber.json b/Resources/fsh-generated/resources/Bundle-UC1-Storno-2-Cancellation-Of-Prescriber.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2023-01-30T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC1-Practitioner-to-HealthCareService-MessageHeader-Storno",
@@ -454,8 +455,5 @@
         }
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-01-30T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/...urces/fsh-generated/resources/Bundle-UC1-Storno-3-Cancellation-Of-Dispense-Requester.json b/...urces/fsh-generated/resources/Bundle-UC1-Storno-3-Cancellation-Of-Dispense-Requester.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
   },
+  "timestamp": "2023-02-01T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC1-HealthCareService-to-Pharmacy-MessageHeader-Storno",
@@ -176,8 +177,5 @@
         "authoredOn": "2023-02-01"
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-02-01T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC1-Storno-4-Cancellation-Of-Dispenser.json b/Resources/fsh-generated/resources/Bundle-UC1-Storno-4-Cancellation-Of-Dispenser.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
   },
+  "timestamp": "2023-02-01T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC1-Pharmacy-to-HealthCareService-MessageHeader-Storno",
@@ -362,8 +363,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-02-01T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/...urces/fsh-generated/resources/Bundle-UC2-1-Prescription-Request-To-HealthCareService.json b/...urces/fsh-generated/resources/Bundle-UC2-1-Prescription-Request-To-HealthCareService.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2015-02-07T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC2-1-Pharmacy-to-HealthCareService-MessageHeader",
@@ -378,8 +379,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2015-02-07T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC2-2-Prescription-Request-To-Prescriber.json b/Resources/fsh-generated/resources/Bundle-UC2-2-Prescription-Request-To-Prescriber.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2015-02-07T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC2-2-HealthCareService-to-Practitioner-MessageHeader",
@@ -378,8 +379,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2015-02-07T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC2-3-Fullfilled-Prescription-Request.json b/Resources/fsh-generated/resources/Bundle-UC2-3-Fullfilled-Prescription-Request.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2023-01-30T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC2-3-Practitioner-to-HealthCareService-MessageHeader",
@@ -572,8 +573,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-01-30T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC2-4-Fullfilled-Prescription-Request.json b/Resources/fsh-generated/resources/Bundle-UC2-4-Fullfilled-Prescription-Request.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2023-01-30T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC2-4-HealthCareService-to-Pharmacy-MessageHeader",
@@ -572,8 +573,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-01-30T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/...fsh-generated/resources/Bundle-UC2-5-Fullfilled-DispenseRequest-To-HealthCareService.json b/...fsh-generated/resources/Bundle-UC2-5-Fullfilled-DispenseRequest-To-HealthCareService.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
   },
+  "timestamp": "2023-02-01T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC2-5-Pharmacy-to-HealthCareService-MessageHeader",
@@ -359,8 +360,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-02-01T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC3-1-Prescription-Request-To-Prescriber.json b/Resources/fsh-generated/resources/Bundle-UC3-1-Prescription-Request-To-Prescriber.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2015-02-07T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC3-HealthCareService-to-Practitioner-MessageHeader",
@@ -378,8 +379,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2015-02-07T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC3-2-Fullfilled-Prescription-Request.json b/Resources/fsh-generated/resources/Bundle-UC3-2-Fullfilled-Prescription-Request.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2023-01-30T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC3-Practitioner-to-HealthCareService-MessageHeader",
@@ -572,8 +573,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-01-30T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/...fsh-generated/resources/Bundle-UC4-1-Prescription-and-Dispense-Request-To-Prescriber.json b/...fsh-generated/resources/Bundle-UC4-1-Prescription-and-Dispense-Request-To-Prescriber.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
   },
+  "timestamp": "2015-02-07T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC4-1-Pharmacy-to-Practitioner-MessageHeader",
@@ -407,8 +408,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2015-02-07T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/fsh-generated/resources/Bundle-UC4-2-Prescription-Request-To-Pharmacy.json b/Resources/fsh-generated/resources/Bundle-UC4-2-Prescription-Request-To-Pharmacy.json
@@ -11,6 +11,7 @@
     "system": "urn:ietf:rfc:3986",
     "value": "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
   },
+  "timestamp": "2023-02-01T13:28:17.239+02:00",
   "entry": [
     {
       "fullUrl": "http://erp-servicerequest-test.de/MessageHeader/UC4-2-Practitioner-to-Pharmacy-MessageHeader",
@@ -588,8 +589,5 @@
         ]
       }
     }
-  ],
-  "_timestamp": {
-    "value": "2023-02-01T13:28:17.239+02:00"
-  }
+  ]
 }
diff --git a/Resources/input/fsh/examples/UC1/UC1_Bundles.fsh b/Resources/input/fsh/examples/UC1/UC1_Bundles.fsh
@@ -4,7 +4,7 @@ Usage: #example
 Title: "Medication Request To Prescriber"
 Description: "Request sent to Prescriber to get a Prescription"
 * identifier.value = "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
-* timestamp.value = "2015-02-07T13:28:17.239+02:00"
+* timestamp = "2015-02-07T13:28:17.239+02:00"
 * entry[0].fullUrl = "http://erp-servicerequest-test.de/MessageHeader/UC1-HealthCareService-to-Practitioner-MessageHeader"
 * entry[=].resource = UC1-HealthCareService-to-Practitioner-MessageHeader
 * entry[+].fullUrl = "http://erp-servicerequest-test.de/ServiceRequest/UC1-Initial-Prescription-Request"
@@ -28,7 +28,7 @@ Usage: #example
 Title: "Fullfilled Prescription Request"
 Description: "Response sent from Practitioner back to HealthCareService"
 * identifier.value = "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
-* timestamp.value = "2023-01-30T13:28:17.239+02:00"
+* timestamp = "2023-01-30T13:28:17.239+02:00"
 * entry[0].fullUrl = "http://erp-servicerequest-test.de/MessageHeader/UC1-Practitioner-to-HealthCareService-MessageHeader"
 * entry[=].resource = UC1-Practitioner-to-HealthCareService-MessageHeader
 * entry[+].fullUrl = "http://erp-servicerequest-test.de/ServiceRequest/UC1-Response-Prescription-Request"
@@ -52,7 +52,7 @@ Usage: #example
 Title: "DispenseRequestToPharmacy"
 Description: "Request sent to pharmacy to request a dispense of the medication"
 * identifier.value = "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
-* timestamp.value = "2023-02-01T13:28:17.239+02:00"
+* timestamp = "2023-02-01T13:28:17.239+02:00"
 * entry[0].fullUrl = "http://erp-servicerequest-test.de/MessageHeader/UC1-HealthCareService-to-Pharmacy-MessageHeader"
 * entry[=].resource = UC1-HealthCareService-to-Pharmacy-MessageHeader
 * entry[+].fullUrl = "http://erp-servicerequest-test.de/Patient/Example-Patient"
@@ -66,7 +66,7 @@ Usage: #example
 Title: "DispenseRequestToPharmacy"
 Description: "Response sent from pharmacy to requester"
 * identifier.value = "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
-* timestamp.value = "2023-02-01T13:28:17.239+02:00"
+* timestamp = "2023-02-01T13:28:17.239+02:00"
 * entry[0].fullUrl = "http://erp-servicerequest-test.de/MessageHeader/UC1-Pharmacy-to-HealthCareService-MessageHeader"
 * entry[=].resource = UC1-Pharmacy-to-HealthCareService-MessageHeader
 * entry[+].fullUrl = "http://erp-servicerequest-test.de/ServiceRequest/UC1-Response-Dispense-Request"

diff --git a/Resources/input/fsh/examples/UC1_Storno/UC1_Storno_Bundles.fsh b/Resources/input/fsh/examples/UC1_Storno/UC1_Storno_Bundles.fsh
@@ -4,7 +4,9 @@ Usage: #example
 Title: "Cancelled Medication Request To Prescriber"
 Description: "Cancellationrequest sent to Prescriber to get a Prescription"
 * identifier.value = "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
-* timestamp.value = "2015-02-07T13:28:17.239+02:00"
+* identifier[KIMAdresse].type = https://gematik.de/fhir/directory/CodeSystem/EndpointDirectoryConnectionType#kim-2.0
+* identifier[KIMAdresse] = Pflegeheim-Immergrün-Identifier
+* timestamp = "2015-02-07T13:28:17.239+02:00"
 * entry[0].fullUrl = "http://erp-servicerequest-test.de/MessageHeader/UC1-HealthCareService-to-Practitioner-MessageHeader-Storno"
 * entry[=].resource = UC1-HealthCareService-to-Practitioner-MessageHeader-Storno
 * entry[+].fullUrl = "http://erp-servicerequest-test.de/ServiceRequest/UC1-Cancelled-Prescription-Request"
@@ -28,7 +30,7 @@ Usage: #example
 Title: "Cancellationrequest sent from Prescriber"
 Description: "Response sent from Practitioner back to HealthCareService"
 * identifier.value = "urn:uuid:29888885-6639-481c-934e-4b7b51745084"
-* timestamp.value = "2023-01-30T13:28:17.239+02:00"
+* timestamp = "2023-01-30T13:28:17.239+02:00"
 * entry[0].fullUrl = "http://erp-servicerequest-test.de/MessageHeader/UC1-Practitioner-to-HealthCareService-MessageHeader-Storno"
 * entry[=].resource = UC1-Practitioner-to-HealthCareService-MessageHeader-Storno
 * entry[+].fullUrl = "http://erp-servicerequest-test.de/ServiceRequest/UC1-Cancelled-Prescription-Request"
@@ -52,7 +54,7 @@ Usage: #example
 Title: "DispenseRequestToPharmacy"
 Description: "Request sent to Pharmacy to request a dispense of the medication"
 * identifier.value = "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
-* timestamp.value = "2023-02-01T13:28:17.239+02:00"
+* timestamp = "2023-02-01T13:28:17.239+02:00"
 * entry[0].fullUrl = "http://erp-servicerequest-test.de/MessageHeader/UC1-HealthCareService-to-Pharmacy-MessageHeader-Storno"
 * entry[=].resource = UC1-HealthCareService-to-Pharmacy-MessageHeader-Storno
 * entry[+].fullUrl = "http://erp-servicerequest-test.de/Patient/Example-Patient"
@@ -66,7 +68,7 @@ Usage: #example
 Title: "DispenseRequestToPharmacy"
 Description: "Request sent to Pharmacy to request a dispense of the medication"
 * identifier.value = "urn:uuid:c80f6c55-92f8-4518-ba66-cb193da09336"
-* timestamp.value = "2023-02-01T13:28:17.239+02:00"
+* timestamp = "2023-02-01T13:28:17.239+02:00"
 * entry[0].fullUrl = "http://erp-servicerequest-test.de/MessageHeader/UC1-Pharmacy-to-HealthCareService-MessageHeader-Storno"
 * entry[=].resource = UC1-Pharmacy-to-HealthCareService-MessageHeader-Storno
 * entry[+].fullUrl = "http://erp-servicerequest-test.de/ServiceRequest/UC1-Cancelled-Dispense-Request"