analyseBefundCode identifier now also removed from blood-gas-panel

Modified the "observation identifier remover" profile modifier to remove
the analyseBefundCode identifier not only from the profile
https://www.medizininformatik-initiative.de/fhir/core/modul-labor/StructureDefinition/ObservationLab
but also from
https://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/blood-gas-panel

Author: hhund

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/spring/config/ValidationConfig.java

@@ -201,7 +201,7 @@ public static enum TerminologyServerConnectionTestStatus
 	@ProcessDocumentation(description = "List of StructureDefinition modifier classes, modifiers are executed before atempting to generate a StructureDefinition snapshot", processNames = "wwwnetzwerk-universitaetsmedizinde_dataSend")
 	@Value("#{'${de.netzwerk.universitaetsmedizin.codex.gecco.validation.structuredefinition.modifierClasses:"
 			+ "de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.ClosedTypeSlicingRemover,"
-			+ "de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.MiiModuleLabObservationLab10IdentifierRemover,"
+			+ "de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.ObservationIdentifierRemover,"
 			+ "de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.SliceMinFixer"
 			+ "}'.trim().split('(,[ ]?)|(\\n)')}")
 	private List<String> structureDefinitionModifierClasses;

codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/validation/PluginSnapshotGeneratorWithModifiers.java

@@ -11,23 +11,22 @@
 import org.springframework.beans.factory.InitializingBean;
 
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.ClosedTypeSlicingRemover;
-import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.MiiModuleLabObservationLab10IdentifierRemover;
+import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.ObservationIdentifierRemover;
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.SliceMinFixer;
 import de.netzwerk_universitaetsmedizin.codex.processes.data_transfer.validation.structure_definition.StructureDefinitionModifier;
 
 public class PluginSnapshotGeneratorWithModifiers implements SnapshotGenerator, InitializingBean
 {
 	public static final StructureDefinitionModifier CLOSED_TYPE_SLICING_REMOVER = new ClosedTypeSlicingRemover();
-	public static final StructureDefinitionModifier MII_MODULE_LAB_OBSERVATION_LAB_1_0_IDENTIFIER_REMOVER = new MiiModuleLabObservationLab10IdentifierRemover();
+	public static final StructureDefinitionModifier OBSERVATION_IDENTIFIER_REMOVER = new ObservationIdentifierRemover();
 	public static final StructureDefinitionModifier SLICE_MIN_FIXER = new SliceMinFixer();
 
 	private final SnapshotGenerator delegate;
 	private final List<StructureDefinitionModifier> structureDefinitionModifiers = new ArrayList<>();
 
 	public PluginSnapshotGeneratorWithModifiers(SnapshotGenerator delegate)
 	{
-		this(delegate, Arrays.asList(CLOSED_TYPE_SLICING_REMOVER, MII_MODULE_LAB_OBSERVATION_LAB_1_0_IDENTIFIER_REMOVER,
-				SLICE_MIN_FIXER));
+		this(delegate, Arrays.asList(CLOSED_TYPE_SLICING_REMOVER, OBSERVATION_IDENTIFIER_REMOVER, SLICE_MIN_FIXER));
 	}
 
 	public PluginSnapshotGeneratorWithModifiers(SnapshotGenerator delegate,

…abObservationLab10IdentifierRemover.java …nition/ObservationIdentifierRemover.javacodex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/validation/structure_definition/MiiModuleLabObservationLab10IdentifierRemover.java renamed to codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/validation/structure_definition/ObservationIdentifierRemover.java codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/validation/structure_definition/MiiModuleLabObservationLab10IdentifierRemover.java renamed to codex-process-data-transfer/src/main/java/de/netzwerk_universitaetsmedizin/codex/processes/data_transfer/validation/structure_definition/ObservationIdentifierRemover.java

@@ -10,17 +10,20 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Mandatory identifier on ObservationLab not compatible with data protection rules with current pseudonymization.
+ * Mandatory identifier on Observation not compatible with data protection rules and current pseudonymization
+ * implementation.
  */
-public class MiiModuleLabObservationLab10IdentifierRemover implements StructureDefinitionModifier
+public class ObservationIdentifierRemover implements StructureDefinitionModifier
 {
-	private static final Logger logger = LoggerFactory.getLogger(MiiModuleLabObservationLab10IdentifierRemover.class);
+	private static final Logger logger = LoggerFactory.getLogger(ObservationIdentifierRemover.class);
 
 	@Override
 	public StructureDefinition modify(StructureDefinition sd)
 	{
 		if ("https://www.medizininformatik-initiative.de/fhir/core/modul-labor/StructureDefinition/ObservationLab"
-				.equals(sd.getUrl()) && "1.0".equals(sd.getVersion()))
+				.equals(sd.getUrl())
+				|| "https://www.netzwerk-universitaetsmedizin.de/fhir/StructureDefinition/blood-gas-panel"
+						.equals(sd.getUrl()))
 		{
 			Predicate<? super ElementDefinition> toRemove = e -> e.hasPath()
 					&& e.getPath().startsWith("Observation.identifier");