Merge pull request #104 from project-husky/dvr_ch_emed_epr_1_0_0

Update for CH EMED EPR 1.0.0
project-husky · Feb 1, 2024 · 3dfc790 · 3dfc790
2 parents 6ff5923 + 1ae9b5f
commit 3dfc790
Show file tree

Hide file tree

Showing 58 changed files with 4,457 additions and 2,202 deletions.
diff --git a/.../main/java/org/projecthusky/fhir/emed/ch/common/enums/ActivePharmaceuticalIngredient.java b/.../main/java/org/projecthusky/fhir/emed/ch/common/enums/ActivePharmaceuticalIngredient.java
@@ -6,7 +6,6 @@
  * This project has been developed further and modified by the joined working group Husky
  * on the basis of the eHealth Connector opensource project from June 28, 2021,
  * whereas medshare GmbH is the initial and main contributor/author of the eHealth Connector.
- *
  */
 package org.projecthusky.fhir.emed.ch.common.enums;
 
@@ -28,11 +27,11 @@
  * IT: No designation found.<br>
  * <p>
  * Identifier: 2.16.756.5.30.1.1.11.82<br>
- * Effective date: 2022-03-02 15:25<br>
+ * Effective date: 2023-10-27 13:24<br>
  * Version: 2022<br>
- * Status: FINAL
+ * Status: DRAFT
  */
-@Generated(value = "org.projecthusky.codegenerator.ch.valuesets.UpdateValueSets", date = "2022-07-11")
+@Generated(value = "org.projecthusky.codegenerator.ch.valuesets.UpdateValueSets", date = "2024-01-29")
 public enum ActivePharmaceuticalIngredient implements ValueSetEnumInterface {
 
     /**
@@ -7263,6 +7262,19 @@ public enum ActivePharmaceuticalIngredient implements ValueSetEnumInterface {
                      "Immunglobulin M human (IgM)",
                      "immunoglobuline M humaine (IgM)",
                      "Immunoglobulina M umana (IgM)"),
+    /**
+     * EN: Immunologic substance.<br>
+     * DE: Immunologic substance.<br>
+     * FR: substance immunologique.<br>
+     * IT: Immunologic substance.<br>
+     */
+    IMMUNOLOGIC_SUBSTANCE("106181007",
+                          "2.16.840.1.113883.6.96",
+                          "Immunologic substance (substance)",
+                          "Immunologic substance",
+                          "Immunologic substance",
+                          "substance immunologique",
+                          "Immunologic substance"),
     /**
      * EN: Indacaterol.<br>
      * DE: Indacaterol.<br>
@@ -19044,6 +19056,14 @@ public enum ActivePharmaceuticalIngredient implements ValueSetEnumInterface {
      */
     public static final String IMMUNOGLOBULIN_M_CODE = "74889000";
 
+    /**
+     * EN: Code for Immunologic substance.<br>
+     * DE: Code für Immunologic substance.<br>
+     * FR: Code de substance immunologique.<br>
+     * IT: Code per Immunologic substance.<br>
+     */
+    public static final String IMMUNOLOGIC_SUBSTANCE_CODE = "106181007";
+
     /**
      * EN: Code for Indacaterol.<br>
      * DE: Code für Indacaterol.<br>

diff --git a/.../src/main/java/org/projecthusky/fhir/emed/ch/common/enums/PharmaceuticalDoseFormEdqm.java b/.../src/main/java/org/projecthusky/fhir/emed/ch/common/enums/PharmaceuticalDoseFormEdqm.java
diff --git a/...hir-emed-ch-common/src/main/java/org/projecthusky/fhir/emed/ch/common/enums/UnitCode.java b/...hir-emed-ch-common/src/main/java/org/projecthusky/fhir/emed/ch/common/enums/UnitCode.java
@@ -9,15 +9,15 @@
  */
 package org.projecthusky.fhir.emed.ch.common.enums;
 
+import java.util.Objects;
+import javax.annotation.processing.Generated;
+
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.checkerframework.checker.nullness.qual.Nullable;
 import org.projecthusky.common.enums.CodeSystems;
 import org.projecthusky.common.enums.LanguageCode;
 import org.projecthusky.common.enums.ValueSetEnumInterface;
 
-import javax.annotation.processing.Generated;
-import java.util.Objects;
-
 /**
  * Enumeration of UnitCode values
  * <p>
@@ -28,10 +28,10 @@
  * <p>
  * Identifier: 2.16.756.5.30.1.1.11.83<br>
  * Effective date: 2022-06-08 15:00<br>
- * Version: 2022<br>
+ * Version: 2023<br>
  * Status: DRAFT
  */
-@Generated(value = "org.projecthusky.codegenerator.ch.valuesets.UpdateValueSets", date = "2022-07-11")
+@Generated(value = "org.projecthusky.codegenerator.ch.valuesets.UpdateValueSets", date = "2024-01-29")
 public enum UnitCode implements ValueSetEnumInterface {
 
     /**
@@ -326,8 +326,8 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: dose.<br>
      * IT: dose.<br>
      */
-    DOSE("{Dose}",
-         "http://unitsofmeasure.org",
+    DOSE("408102007",
+         "http://snomed.info/sct",
          "Dose",
          "Dose",
          "Dos",
@@ -638,8 +638,8 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: MioU.<br>
      * IT: MioU.<br>
      */
-    MIOU("10*6.{Unit}",
-         "http://unitsofmeasure.org",
+    MIOU("396186001",
+         "http://snomed.info/sct",
          "(the number ten for arbitrary powers ^ 6) * Unit",
          "MioU",
          "MioU",
@@ -742,8 +742,8 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: emballage.<br>
      * IT: confezione.<br>
      */
-    PACKAGE("{Package}",
-            "http://unitsofmeasure.org",
+    PACKAGE("1681000175101",
+            "http://snomed.info/sct",
             "Package",
             "Package",
             "Packung",
@@ -1106,8 +1106,8 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: millier d'unités.<br>
      * IT: mille per unità *.<br>
      */
-    THOUSAND_PER_STAR_UNIT("10*3.{Unit}",
-                           "http://unitsofmeasure.org",
+    THOUSAND_PER_STAR_UNIT("2011000175108",
+                           "http://snomed.info/sct",
                            "Thousand Per * Unit",
                            "Thousand Per * Unit",
                            "Tausend Einheiten",
@@ -1184,8 +1184,8 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: unité(s).<br>
      * IT: unità.<br>
      */
-    UNIT("{Unit}",
-         "http://unitsofmeasure.org",
+    UNIT("767525000",
+         "http://snomed.info/sct",
          "Unit",
          "unit",
          "Einheit",
@@ -1400,7 +1400,7 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: Code de dose.<br>
      * IT: Code per dose.<br>
      */
-    public static final String DOSE_CODE = "{Dose}";
+    public static final String DOSE_CODE = "408102007";
 
     /**
      * EN: Code for Dressing.<br>
@@ -1592,7 +1592,7 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: Code de MioU.<br>
      * IT: Code per MioU.<br>
      */
-    public static final String MIOU_CODE = "10*6.{Unit}";
+    public static final String MIOU_CODE = "396186001";
 
     /**
      * EN: Code for ml.<br>
@@ -1656,7 +1656,7 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: Code de emballage.<br>
      * IT: Code per confezione.<br>
      */
-    public static final String PACKAGE_CODE = "{Package}";
+    public static final String PACKAGE_CODE = "1681000175101";
 
     /**
      * EN: Code for Pad.<br>
@@ -1880,7 +1880,7 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: Code de millier d'unités.<br>
      * IT: Code per mille per unità *.<br>
      */
-    public static final String THOUSAND_PER_STAR_UNIT_CODE = "10*3.{Unit}";
+    public static final String THOUSAND_PER_STAR_UNIT_CODE = "2011000175108";
 
     /**
      * EN: Code for Thread.<br>
@@ -1928,7 +1928,7 @@ public enum UnitCode implements ValueSetEnumInterface {
      * FR: Code de unité(s).<br>
      * IT: Code per unità.<br>
      */
-    public static final String UNIT_CODE = "{Unit}";
+    public static final String UNIT_CODE = "767525000";
 
     /**
      * EN: Code for Vessel.<br>

diff --git a/...ch/husky-fhir-emed-ch-epr-narrative/src/main/resources/narrative/templates/datatypes.html b/...ch/husky-fhir-emed-ch-epr-narrative/src/main/resources/narrative/templates/datatypes.html
@@ -44,7 +44,7 @@
 <th:block th:fragment="simple-dose(dose, lang)">
     <th:block th:if="${dose.isQuantity()}" th:insert="~{::amount-quantity(${dose.quantity()}, ${lang})}"/>
     <th:block th:if="${dose.isRange()}">
-        [[~{::amount-quantity(${dose.low()}, ${lang})}]] – [[~{::amount-quantity(${dose.high()}, ${lang})}]]
+        <span th:insert="~{::amount-quantity(${dose.low()}, ${lang})}"/> - <span th:insert="~{::amount-quantity(${dose.high()}, ${lang})}"/>
     </th:block>
 </th:block>
 

diff --git a/...med-ch-epr/src/main/java/org/projecthusky/fhir/emed/ch/epr/datatypes/ChEmedEprDosage.java b/...med-ch-epr/src/main/java/org/projecthusky/fhir/emed/ch/epr/datatypes/ChEmedEprDosage.java
@@ -100,8 +100,7 @@ public Dose resolveDose() throws InvalidEmedContentException {
         if (!this.hasDoseAndRate()) {
             return null;
         }
-        return Dose.fromQuantityAndRange(this.getDoseAndRateFirstRep().getDoseQuantity(),
-                                         this.getDoseAndRateFirstRep().getRateRange());
+        return Dose.fromDosageDoseAndRateComponent(this.getDoseAndRateFirstRep());
     }
 
     /**