0.7.9

README.md

@@ -18,17 +18,19 @@ docker run **ENVIRONMENTS** **VOLUMES** ghcr.io/num-codex/odm2fhir **ARGUMENTS**
 
 * `--odm.redcap.mapping` Print current mapping.
 
-* `--odm.incompleteforms.allowed=true` Allow processing of incomplete forms. 
+* `--odm.incompleteforms.allowed=(true|false)` Allow processing of incomplete forms (`false` b y default). 
+
+* `--odm.subjectkeys.hashed=(true|false)` Hash the original subject keys (`true` by default).
 
 * `--fhir.identifier.system.**TYPE**=**TYPE_IDENTIFIER_SYSTEM**` Add an identifier system with `**TYPE**` of `condition`, `consent`, `diagnosticreport`, `encounter`, `immunization`, `medicationstatement`, `observation`, `patient` or `procedure` (see [here](https://simplifier.net/guide/GermanCoronaConsensusDataSet-ImplementationGuide/TransactionBundle)).
 
 * `--fhir.identifier.assigner=**IDENTIFIER_ASSIGNER**` Add an identifier assigner.
 
-* `--fhir.encounters.enabled=true` Enable FHIR encounter resources for patient cases (enabled by default).
+* `--fhir.encounters.enabled=(true|false)` Enable FHIR `encounter` resources for patient cases (`true` by default).
 
-* `--fhir.updateascreate.enabled=true` Enable update-as-create (see [here](https://www.hl7.org/fhir/http.html#upsert), disabled by default).
+* `--fhir.updateascreate.enabled=(true|false)` Enable update-as-create (see [here](https://www.hl7.org/fhir/http.html#upsert), `false` by default).
 
-* `--fhir.validation.enabled=true` Enable FHIR resource validation (see [here](#validation), disabled by default).
+* `--fhir.validation.enabled=(true|false)` Enable FHIR resource validation (see [here](#validation), `false` by default).
 
 * `--cron="**CRON_PATTERN**"` Enable timed execution (see [here](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/scheduling/support/CronSequenceGenerator.html)).
 

docs/index.md

@@ -18,17 +18,19 @@ docker run **ENVIRONMENTS** **VOLUMES** ghcr.io/num-codex/odm2fhir **ARGUMENTS**
 
 * `--odm.redcap.mapping` Print current mapping.
 
-* `--odm.incompleteforms.allowed=true` Allow processing of incomplete forms. 
+* `--odm.incompleteforms.allowed=(true|false)` Allow processing of incomplete forms (`false` b y default). 
+
+* `--odm.subjectkeys.hashed=(true|false)` Hash the original subject keys (`true` by default).
 
 * `--fhir.identifier.system.**TYPE**=**TYPE_IDENTIFIER_SYSTEM**` Add an identifier system with `**TYPE**` of `condition`, `consent`, `diagnosticreport`, `encounter`, `immunization`, `medicationstatement`, `observation`, `patient` or `procedure` (see [here](https://simplifier.net/guide/GermanCoronaConsensusDataSet-ImplementationGuide/TransactionBundle)).
 
 * `--fhir.identifier.assigner=**IDENTIFIER_ASSIGNER**` Add an identifier assigner.
 
-* `--fhir.encounters.enabled=true` Enable FHIR encounter resources for patient cases (enabled by default).
+* `--fhir.encounters.enabled=(true|false)` Enable FHIR `encounter` resources for patient cases (`true` by default).
 
-* `--fhir.updateascreate.enabled=true` Enable update-as-create (see [here](https://www.hl7.org/fhir/http.html#upsert), disabled by default).
+* `--fhir.updateascreate.enabled=(true|false)` Enable update-as-create (see [here](https://www.hl7.org/fhir/http.html#upsert), `false` by default).
 
-* `--fhir.validation.enabled=true` Enable FHIR resource validation (see [here](#validation), disabled by default).
+* `--fhir.validation.enabled=(true|false)` Enable FHIR resource validation (see [here](#validation), `false` by default).
 
 * `--cron="**CRON_PATTERN**"` Enable timed execution (see [here](https://docs.spring.io/spring-framework/docs/current/javadoc-api/org/springframework/scheduling/support/CronSequenceGenerator.html)).
 

pom.xml

@@ -8,7 +8,7 @@
 
   <groupId>de.difuture.uds</groupId>
   <artifactId>odm2fhir</artifactId>
-  <version>0.7.8</version>
+  <version>0.7.9</version>
 
   <name>ODM2FHIR</name>
   <description>Mapper for GECCO based study/patient data in CDISC ODM to HL7 FHIR</description>
@@ -33,10 +33,10 @@
     <spring-retry.version>1.3.3</spring-retry.version>
     <woodstox.version>6.2.8</woodstox.version>
 
-    <maven-antrun-plugin.version>3.0.0</maven-antrun-plugin.version>
+    <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
     <maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
-    <maven-project-info-reports-plugin.version>3.2.2</maven-project-info-reports-plugin.version>
-    <maven-site-plugin.version>3.11.0</maven-site-plugin.version>
+    <maven-project-info-reports-plugin.version>3.3.0</maven-project-info-reports-plugin.version>
+    <maven-site-plugin.version>3.12.0</maven-site-plugin.version>
   </properties>
 
   <dependencies>

src/main/java/de/difuture/uds/odm2fhir/fhir/mapper/Subject.java

@@ -83,7 +83,8 @@ public Stream<DomainResource> map(SubjectData subjectData) {
 
     value = subjectData.getSubjectKey();
 
-    if (!ENVIRONMENT.containsProperty("debug")) {
+    if (!ENVIRONMENT.containsProperty("debug") &&
+        ENVIRONMENT.getProperty("odm.subjectkeys.hashed", Boolean.class, true)) {
       value = sha256Hex(value);
     }
 

src/main/java/de/difuture/uds/odm2fhir/fhir/util/IdentifierHelper.java

@@ -32,8 +32,8 @@
 @Slf4j
 public class IdentifierHelper {
 
-  private static String DEFAULT_ASSIGNER = "Mein Krankenhaus";
-  private static String DEFAULT_BASE_URL = "https://mein.krankenhaus.de/fhir/NamingSystem/";
+  private static String DEFAULT_ASSIGNER = "Ein Fiktives Krankenhaus";
+  private static String DEFAULT_BASE_URL = "https://ein.fiktives.krankenhaus/fhir/NamingSystem/";
 
   private static Map<String,String> mapping = new HashMap<>();
 

src/main/resources/application.yml

@@ -3,6 +3,7 @@
 odm:
   cache.folder.path: /workspace/cache
 #  incompleteforms.allowed: true
+#  subjectkeys.hashed: false
   file.path: /workspace/input/ODM.xml
 #  redcap.api:
 #    url: http://redcap/api/
@@ -55,14 +56,14 @@ fhir:
 #      file.path: /some/path/client_certificate.p12
 #      password: change-password
 #  identifier:
-#    assigner: Mein Krankenhaus
+#    assigner: Ein Fiktives Krankenhaus
 #    system:
-#      condition: https://mein.krankenhaus.de/fhir/NamingSystem/conditionId
-#      consent: https://mein.krankenhaus.de/fhir/NamingSystem/consentId
-#      diagnosticreport: https://mein.krankenhaus.de/fhir/NamingSystem/diagnosticreportId
-#      encounter: https://mein.krankenhaus.de/fhir/NamingSystem/encounterId
-#      immunization: https://mein.krankenhaus.de/fhir/NamingSystem/immunizationId
-#      medicationstatement: https://mein.krankenhaus.de/fhir/NamingSystem/medicationstatementId
-#      observation: https://mein.krankenhaus.de/fhir/NamingSystem/observationId
-#      patient: https://mein.krankenhaus.de/fhir/NamingSystem/patientId
-#      procedure: https://mein.krankenhaus.de/fhir/NamingSystem/procedureId
+#      condition: https://ein.fiktives.krankenhaus/fhir/NamingSystem/conditionId
+#      consent: https://ein.fiktives.krankenhaus/fhir/NamingSystem/consentId
+#      diagnosticreport: https://ein.fiktives.krankenhaus/fhir/NamingSystem/diagnosticreportId
+#      encounter: https://ein.fiktives.krankenhaus/fhir/NamingSystem/encounterId
+#      immunization: https://ein.kfiktives.rankenhaus/fhir/NamingSystem/immunizationId
+#      medicationstatement: https://ein.fiktives.krankenhaus/fhir/NamingSystem/medicationstatementId
+#      observation: https://ein.fiktives.krankenhaus/fhir/NamingSystem/observationId
+#      patient: https://ein.fiktives.krankenhaus/fhir/NamingSystem/patientId
+#      procedure: https://ein.fiktives.krankenhaus/fhir/NamingSystem/procedureId