Merge pull request #28 from gematik/release/1.0.3

Veröffentlichen von 1.0.3
gematik · May 3, 2024 · 825bc9e · 825bc9e
2 parents 9652990 + ed97ee1
commit 825bc9e
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 56 deletions.
diff --git a/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json b/Resources/fsh-generated/resources/CodeSystem-GEM-ERPCHRG-CS-ConsentType.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "CodeSystem",
-  "status": "draft",
+  "status": "active",
   "content": "complete",
   "name": "GEM_ERPCHRG_CS_ConsentType",
   "id": "GEM-ERPCHRG-CS-ConsentType",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-EX-MarkingFlag.json
@@ -4,7 +4,9 @@
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_EX_MarkingFlag",
   "version": "1.0",
   "name": "GEM_ERPCHRG_EX_MarkingFlag",
-  "status": "draft",
+  "status": "active",
+  "experimental": false,
+  "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",
   "mapping": [
     {

diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-ChargeItem.json
@@ -4,7 +4,7 @@
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_ChargeItem",
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_ChargeItem",
-  "status": "draft",
+  "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",

diff --git a/...enerated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json b/...enerated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReply.json
@@ -5,7 +5,7 @@
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Communication_ChargChangeReply",
   "title": "Reply on change Request on ChargeItem from pharmacy to Patient",
-  "status": "draft",
+  "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
   "description": "Ressource used for the communication to reply to a change request on a ChargeItem",

diff --git a/...-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json b/...-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Communication-ChargChangeReq.json
@@ -5,7 +5,7 @@
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Communication_ChargChangeReq",
   "title": "Request for Modification on ChargeItem",
-  "status": "draft",
+  "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
   "description": "Ressource used for the communication of Change Request on an existing ChargeItem between patient and pharmacy",

diff --git a/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json b/Resources/fsh-generated/resources/StructureDefinition-GEM-ERPCHRG-PR-Consent.json
@@ -4,7 +4,7 @@
   "url": "https://gematik.de/fhir/erpchrg/StructureDefinition/GEM_ERPCHRG_PR_Consent",
   "version": "1.0",
   "name": "GEM_ERPCHRG_PR_Consent",
-  "status": "draft",
+  "status": "active",
   "experimental": false,
   "publisher": "gematik GmbH",
   "fhirVersion": "4.0.1",

diff --git a/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json b/Resources/fsh-generated/resources/ValueSet-GEM-ERPCHRG-VS-ConsentType.json
@@ -1,6 +1,6 @@
 {
   "resourceType": "ValueSet",
-  "status": "draft",
+  "status": "active",
   "name": "GEM_ERPCHRG_VS_ConsentType",
   "id": "GEM-ERPCHRG-VS-ConsentType",
   "title": "ValueSet of Consent Codes",

diff --git a/Resources/input/fsh/codesystems/GEM_ERPCHRG_CS_ConsentType.fsh b/Resources/input/fsh/codesystems/GEM_ERPCHRG_CS_ConsentType.fsh
@@ -2,13 +2,6 @@ CodeSystem: GEM_ERPCHRG_CS_ConsentType
 Id: GEM-ERPCHRG-CS-ConsentType
 Title: "CodeSystem of types for a consent"
 Description: "Type of patient consent."
-* ^url = "https://gematik.de/fhir/erpchrg/CodeSystem/GEM_ERPCHRG_CS_ConsentType"
-* ^version = "1.0"
-* ^status = #draft
-* ^publisher = "gematik GmbH"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.gematik.de"
-* ^copyright = "gematik GmbH"
-* ^caseSensitive = true
+* insert CodeSystem (GEM_ERPCHRG_CS_ConsentType)
 * ^content = #complete
 * #CHARGCONS "Consent for saving electronic charge item"
diff --git a/Resources/input/fsh/extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh b/Resources/input/fsh/extensions/GEM_ERPCHRG_EX_MarkingFlag.fsh
@@ -1,8 +1,6 @@
 Extension: GEM_ERPCHRG_EX_MarkingFlag
 Id: GEM-ERPCHRG-EX-MarkingFlag
-* ^url = $GEM_ERPCHRG_EX_MarkingFlag_URL
-* ^version = "1.0"
-* ^status = #draft
+* insert Meta (GEM_ERPCHRG_EX_MarkingFlag)
 * ^context.type = #element
 * ^context.expression = "ChargeItem"
 * . ^short = "Options for submitted ChargeItem"

diff --git a/Resources/input/fsh/rulesets.fsh b/Resources/input/fsh/rulesets.fsh
@@ -1,6 +1,6 @@
 // General rule for to handle versions for all structure definitions
 RuleSet: Versioning
-* ^status = #draft
+* ^status = #active
 * ^version = "1.0"
 
 RuleSet: Meta (profileName)
@@ -20,4 +20,20 @@ RuleSet: MetaProfile (profileName)
 RuleSet: Meta-Inst
 * insert Versioning
 * experimental = false
-* publisher = "gematik GmbH"
+* publisher = "gematik GmbH"
+
+RuleSet: CodeSystem(name)
+* ^url = "https://gematik.de/fhir/erpchrg/CodeSystem/{name}"
+* insert Versioning
+* ^publisher = "gematik GmbH"
+* ^contact.telecom.system = #url
+* ^contact.telecom.value = "http://www.gematik.de"
+* ^copyright = "gematik GmbH"
+* ^caseSensitive = true
+
+RuleSet: ValueSet(name)
+* ^url = "https://gematik.de/fhir/erpchrg/ValueSet/{name}"
+* insert Versioning
+* ^publisher = "gematik GmbH"
+* ^contact.telecom.system = #url
+* ^contact.telecom.value = "http://www.gematik.de"
diff --git a/Resources/input/fsh/valuesets/GEM_ERPCHRG_VS_ConsentType.fsh b/Resources/input/fsh/valuesets/GEM_ERPCHRG_VS_ConsentType.fsh
@@ -2,10 +2,5 @@ ValueSet: GEM_ERPCHRG_VS_ConsentType
 Id: GEM-ERPCHRG-VS-ConsentType
 Title: "ValueSet of Consent Codes"
 Description: "Type of Consents for the ePrescription."
-* ^url = "https://gematik.de/fhir/erpchrg/ValueSet/GEM_ERPCHRG_VS_ConsentType"
-* ^version = "1.0"
-* ^status = #draft
-* ^publisher = "gematik GmbH"
-* ^contact.telecom.system = #url
-* ^contact.telecom.value = "http://www.gematik.de"
+* insert ValueSet (GEM_ERPCHRG_VS_ConsentType)
 * include codes from system GEM_ERPCHRG_CS_ConsentType
diff --git a/Resources/sushi-config.yaml b/Resources/sushi-config.yaml
@@ -1,23 +1,11 @@
-id: fhir-profiles-erpchrg
 canonical: https://gematik.de/fhir/erpchrg
-name: Abrechnungsinformationen des E-Rezeptes für den Patienten
-title: ePrescription patient receipt definition
-description: German fhir profiles on ePrescription patient receipt
 fhirVersion: 4.0.1
 FSHOnly: true
 applyExtensionMetadataToRoot: false
-status: draft
-version: "1.0.1"
-copyrightYear: 2022+
-releaseLabel: draft
-publisher:
-  name: Gematik GmbH
-  url: https://www.gematik.de/
-  email: [email protected]
+
+version: "1.0.3"
 dependencies:
-  de.basisprofil.r4: 1.3.2
   hl7.fhir.r4.core: 4.0.1
-  de.gematik.erezept-workflow.r4: 1.2.x
-  kbv.ita.for: 1.1.0
-  kbv.ita.erp: 1.1.x
-  de.abda.erezeptabgabedatenpkv: 1.2.0
+  de.basisprofil.r4: 1.3.2
+  de.gematik.erezept-workflow.r4: 1.3.x
+  kbv.ita.for: 1.1.0
diff --git a/fhirpkg.lock.json b/fhirpkg.lock.json
@@ -1,14 +1,12 @@
 {
-  "updated": "2023-12-20T14:47:59.704922+01:00",
+  "updated": "2024-05-03T09:58:23.475808+02:00",
   "dependencies": {
-    "de.basisprofil.r4": "1.3.2",
     "hl7.fhir.r4.core": "4.0.1",
-    "kbv.ita.for": "1.1.0",
-    "KBV.Basis": "1.3.0",
-    "de.gematik.erezept-workflow.r4": "1.2.3",
+    "de.basisprofil.r4": "1.3.2",
+    "de.gematik.erezept-workflow.r4": "1.3.0",
     "kbv.ita.erp": "1.1.2",
-    "de.abda.eRezeptAbgabedatenpkv": "1.2.0",
-    "de.abda.erezeptabgabedatenbasis": "1.3.1"
+    "KBV.Basis": "1.3.0",
+    "kbv.ita.for": "1.1.0"
   },
   "missing": {}
 }
diff --git a/package.json b/package.json
@@ -1,16 +1,14 @@
 {
   "name": "fhir-profiles-erpchrg",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "German fhir profiles on ePrescription patient receipt",
   "fhirVersions": [
     "4.0.1"
   ],
   "dependencies": {
-    "de.basisprofil.r4": "1.3.2",
     "hl7.fhir.r4.core": "4.0.1",
-    "kbv.ita.for": "1.1.0",
-    "de.gematik.erezept-workflow.r4": "1.2.3",
-    "de.abda.eRezeptAbgabedatenpkv": "1.2.0",
-    "KBV.Basis": "1.3.0"
+    "de.basisprofil.r4": "1.3.2",
+    "de.gematik.erezept-workflow.r4": "1.3.x",
+    "kbv.ita.for": "1.1.0"
   }
 }