Merge pull request #29 from gematik:bugfix/profile-fixes

Kleine Fehlerbehebungen für das Workflow Profil
gematik · Mar 19, 2024 · d487907 · d487907
2 parents 588e005 + 6e52522
commit d487907
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 63 deletions.
diff --git a/Resources/fsh-generated/resources/OperationDefinition-CloseOperation.json b/Resources/fsh-generated/resources/OperationDefinition-CloseOperation.json
@@ -29,7 +29,7 @@
     {
       "name": "MedicationDispense",
       "use": "in",
-      "min": 1,
+      "min": 0,
       "max": "1",
       "documentation": "Information on dispensed Medication(s)",
       "type": "canonical",

diff --git a/Resources/input/fsh/operationdefinitions/GEM_ERP_OP_Close.fsh b/Resources/input/fsh/operationdefinitions/GEM_ERP_OP_Close.fsh
@@ -16,7 +16,7 @@ Usage: #definition
 // in
 * parameter[+].name = #MedicationDispense
 * parameter[=].use = #in
-* parameter[=].min = 1
+* parameter[=].min = 0
 * parameter[=].max = "1"
 * parameter[=].documentation = "Information on dispensed Medication(s)"
 * parameter[=].type = #canonical

diff --git a/Resources/input/fsh/valuesets/GEM_ERP_VS_AvailabilityStatus.fsh b/Resources/input/fsh/valuesets/GEM_ERP_VS_AvailabilityStatus.fsh
@@ -3,25 +3,4 @@ Id: GEM-ERP-VS-AvailabilityStatus
 Title: "ValueSet of AvailabilityStatus Codes"
 Description: "Type of the availability status for medication availability request"
 * insert ValueSet(GEM_ERP_VS_AvailabilityStatus)
-//* ^expansion.identifier = "fe7e0ee0-f72e-4909-bf48-7c84ff97bac5"
-//* ^expansion.timestamp = "2020-05-07T07:48:29+00:00"
-//* ^expansion.total = 6
-//* ^expansion.contains[0].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus"
-//* ^expansion.contains[=].code = #10
-//* ^expansion.contains[=].display = "sofort verfügbar"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus"
-//* ^expansion.contains[=].code = #20
-//* ^expansion.contains[=].display = "noch heute verfügbar"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus"
-//* ^expansion.contains[=].code = #30
-//* ^expansion.contains[=].display = "am nächsten Werktag - vormittags"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus"
-//* ^expansion.contains[=].code = #40
-//* ^expansion.contains[=].display = "am nächsten Werktag- nachmittags"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus"
-//* ^expansion.contains[=].code = #50
-//* ^expansion.contains[=].display = "nicht verfügbar"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_AvailabilityStatus"
-//* ^expansion.contains[=].code = #90
-//* ^expansion.contains[=].display = "unbekannt"
 * include codes from system GEM_ERP_CS_AvailabilityStatus
diff --git a/Resources/input/fsh/valuesets/GEM_ERP_VS_DocumentType.fsh b/Resources/input/fsh/valuesets/GEM_ERP_VS_DocumentType.fsh
@@ -2,21 +2,10 @@ ValueSet: GEM_ERP_VS_DocumentType
 Id: GEM-ERP-VS-DocumentType
 Title: "ValueSet of Documenttype Codes"
 Description: "Type of document depending on the recipient."
-* ^url = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_VS_DocumentType"
 * insert Versioning
+// Hier nicht das RuleSet "ValueSet" einfügen, da die URL hier "CodeSystem" ist. Aus Kompatibilitätsgründen wird das so belassen (Stand März '24).
+* ^url = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_VS_DocumentType"
 * ^publisher = "gematik GmbH"
 * ^contact.telecom.system = #url
 * ^contact.telecom.value = "http://www.gematik.de"
-//* ^expansion.identifier = "fe7e0ee0-f72e-4909-bf48-7c84ff97bac5"
-//* ^expansion.timestamp = "2020-05-07T07:48:29+00:00"
-//* ^expansion.total = 3
-//* ^expansion.contains[0].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType"
-//* ^expansion.contains[=].code = #1
-//* ^expansion.contains[=].display = "Health Care Provider Prescription"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType"
-//* ^expansion.contains[=].code = #2
-//* ^expansion.contains[=].display = "Patient Confirmation"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/GEM_ERP_CS_DocumentType"
-//* ^expansion.contains[=].code = #3
-//* ^expansion.contains[=].display = "Receipt"
 * include codes from system GEM_ERP_CS_DocumentType
diff --git a/Resources/input/fsh/valuesets/GEM_ERP_VS_FlowType.fsh b/Resources/input/fsh/valuesets/GEM_ERP_VS_FlowType.fsh
@@ -3,24 +3,4 @@ Id: GEM-ERP-VS-FlowType
 Title: "ValueSet of Flowtype Codes"
 Description: "Shows the different types of the ePrescription according to the prescription forms."
 * insert ValueSet(GEM_ERP_VS_FlowType)
-//* ^expansion.identifier = "fe7e0ee0-f72e-4909-bf48-7c84ff97bac5"
-//* ^expansion.timestamp = "2022-02-07T07:48:29+00:00"
-//* ^expansion.total = 5
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/FlowType"
-//* ^expansion.contains[=].code = #160
-//* ^expansion.contains[=].display = "Muster 16 (Apothekenpflichtige Arzneimittel)"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/FlowType"
-//* ^expansion.contains[=].code = #165
-//* ^expansion.contains[=].display = "Muster 16 (Betäubungsmittel)"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/FlowType"
-//* ^expansion.contains[=].code = #166
-//* ^expansion.contains[=].display = "Muster 16 (T-Rezepte)"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/FlowType"
-//* ^expansion.contains[=].code = #169
-//* ^expansion.contains[=].display = "Muster 16 (Direkte Zuweisung)"
-//* ^expansion.contains[+].system = "https://gematik.de/fhir/erp/CodeSystem/FlowType"
-//* ^expansion.contains[=].code = #200
-//* ^expansion.contains[=].display = "PKV (Apothekenpflichtige Arzneimittel)"
-//* ^expansion.contains[=].code = #209
-//* ^expansion.contains[=].display = "PKV (Direkte Zuweisung)"
 * include codes from system GEM_ERP_CS_FlowType
diff --git a/Resources/input/fsh/valuesets/GEM_ERP_VS_OrganizationType.fsh b/Resources/input/fsh/valuesets/GEM_ERP_VS_OrganizationType.fsh
@@ -3,11 +3,4 @@ Id: GEM-ERP-VS-OrganizationType
 Title: "ValueSet of Organizationtype Codes"
 Description: "Type of Organiziation"
 * insert ValueSet(GEM_ERP_VS_OrganizationType)
-//* ^expansion.identifier = "fe7e0ee0-f72e-4909-bf48-7c84ff97bac5"
-//* ^expansion.timestamp = "2020-05-07T07:48:29+00:00"
-//* ^expansion.total = 1
-//* ^expansion.contains.system = "urn:ietf:rfc:3986"
-//* ^expansion.contains.code = #urn:oid:1.2.276.0.76.4.54
-//* ^expansion.contains.display = "Öffentliche Apotheke"
-//* urn:ietf:rfc:3986#urn:oid:1.2.276.0.76.4.54 "Öffentliche Apotheke"
 * include codes from system GEM_ERP_CS_OrganizationType