0.8.4

num-codex · Oct 20, 2022 · 29069e1 · 29069e1
1 parent f6f1e11
commit 29069e1
Show file tree

Hide file tree

Showing 8 changed files with 42 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -26,7 +26,9 @@ docker run **ENVIRONMENTS** **VOLUMES** ghcr.io/num-codex/odm2fhir **ARGUMENTS**
 
 * `--fhir.identifier.assigner=**IDENTIFIER_ASSIGNER**` Add an identifier assigner.
 
-* `--fhir.encounters.enabled=(true|false)` Enable FHIR `Encounter` resources for patient cases (`true` by default).
+* `--fhir.encounters.enabled=(true|false)` Enable FHIR `Encounter` resources for patient cases (`false` by default).
+
+* `--fhir.organization.enabled=(true|false)` Enable FHIR `Organization` resource for patient (`false` by default).
 
 * `--fhir.updateascreate.enabled=(true|false)` Enable update-as-create (see [here](https://www.hl7.org/fhir/http.html#upsert), `false` by default).
 

diff --git a/docs/index.md b/docs/index.md
@@ -26,7 +26,9 @@ docker run **ENVIRONMENTS** **VOLUMES** ghcr.io/num-codex/odm2fhir **ARGUMENTS**
 
 * `--fhir.identifier.assigner=**IDENTIFIER_ASSIGNER**` Add an identifier assigner.
 
-* `--fhir.encounters.enabled=(true|false)` Enable FHIR `Encounter` resources for patient cases (`true` by default).
+* `--fhir.encounters.enabled=(true|false)` Enable FHIR `Encounter` resources for patient cases (`false` by default).
+
+* `--fhir.organization.enabled=(true|false)` Enable FHIR `Organization` resource for patient (`false` by default).
 
 * `--fhir.updateascreate.enabled=(true|false)` Enable update-as-create (see [here](https://www.hl7.org/fhir/http.html#upsert), `false` by default).
 

diff --git a/pom.xml b/pom.xml
@@ -8,15 +8,15 @@
 
   <groupId>de.difuture.uds</groupId>
   <artifactId>odm2fhir</artifactId>
-  <version>0.8.3</version>
+  <version>0.8.4</version>
 
   <name>ODM2FHIR</name>
   <description>Mapper for GECCO based study/patient data in CDISC ODM to HL7 FHIR</description>
 
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>2.7.2</version>
+    <version>2.7.5</version>
   </parent>
 
   <properties>
@@ -25,18 +25,17 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 
-    <hapi-fhir.version>6.0.4</hapi-fhir.version>
-    <jackson.version>2.13.3</jackson.version>
+    <hapi-fhir.version>6.1.3</hapi-fhir.version>
+    <jackson.version>2.13.4</jackson.version>
     <kafka-fhir-serializer.version>1.0.2</kafka-fhir-serializer.version>
     <lombok.version>1.18.24</lombok.version>
-    <spring-boot.version>${project.parent.version}</spring-boot.version>
-    <spring-kafka.version>2.9.0</spring-kafka.version>
-    <spring-retry.version>1.3.3</spring-retry.version>
-    <woodstox.version>6.3.0</woodstox.version>
+    <spring-kafka.version>2.9.2</spring-kafka.version>
+    <spring-retry.version>1.3.4</spring-retry.version>
+    <woodstox.version>6.3.1</woodstox.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.4.0</maven-project-info-reports-plugin.version>
+    <maven-project-info-reports-plugin.version>3.4.1</maven-project-info-reports-plugin.version>
     <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
   </properties>
 
@@ -123,7 +122,6 @@
       <plugin>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-maven-plugin</artifactId>
-        <version>${spring-boot.version}</version>
         <configuration>
           <image>
             <name>${GITHUB_CONTAINER_REGISTRY_URL}/${project.artifactId}:${project.version}</name>

diff --git a/src/main/java/de/difuture/uds/odm2fhir/fhir/mapper/StudyEvent.java b/src/main/java/de/difuture/uds/odm2fhir/fhir/mapper/StudyEvent.java
@@ -90,7 +90,7 @@ public Stream<DomainResource> map(Subject subject, StudyEventData studyEventData
 
     var encounter = new Encounter();
 
-    if (ENVIRONMENT.getProperty("fhir.encounters.enabled", Boolean.class, true) &&
+    if (ENVIRONMENT.getProperty("fhir.encounters.enabled", Boolean.class, false) &&
         studyEventData.getStudyEventOID().matches("GECCOVISIT|Event.\\d_fall_arm_1")) {
       var value = format("%s-%s.%s",
                          studyEventData.getSubjectData().getSubjectKey(),

diff --git a/src/main/java/de/difuture/uds/odm2fhir/fhir/mapper/Subject.java b/src/main/java/de/difuture/uds/odm2fhir/fhir/mapper/Subject.java
@@ -70,16 +70,22 @@ public Stream<DomainResource> map(SubjectData subjectData) {
       value = sha256Hex(value);
     }
 
-    var organizationIdentifier = new Identifier()
-        .setSystem(getIdentifierSystem(ORGANIZATION))
-        .setValue(value);
+    var organization = new Organization();
 
-    var organization = (Organization) new Organization()
-        .setName(getIdentifierAssigner())
-        .addIdentifier(organizationIdentifier)
-        .setId(sha256Hex(organizationIdentifier.getSystem() + organizationIdentifier.getValue()));
+    if (ENVIRONMENT.getProperty("fhir.organization.enabled", Boolean.class, false)) {
+      var organizationIdentifier = new Identifier()
+          .setSystem(getIdentifierSystem(ORGANIZATION))
+          .setValue(value);
 
-    organizationReference = new Reference(format("%s/%s", ORGANIZATION.toCode(), organization.getId()));
+      organization = (Organization) new Organization()
+          .setName(getIdentifierAssigner())
+          .addIdentifier(organizationIdentifier)
+          .setId(sha256Hex(organizationIdentifier.getSystem() + organizationIdentifier.getValue()));
+
+    }
+
+    organizationReference = new Reference(format("%s/%s", ORGANIZATION.toCode(), organization.isEmpty() ?
+                                                                                 getIdentifierAssigner() : organization.getId()));
 
     value = subjectData.getSubjectKey();
 

diff --git a/src/main/java/de/difuture/uds/odm2fhir/fhir/util/IdentifierHelper.java b/src/main/java/de/difuture/uds/odm2fhir/fhir/util/IdentifierHelper.java
@@ -32,7 +32,7 @@
 @Slf4j
 public class IdentifierHelper {
 
-  private static String DEFAULT_ASSIGNER = "Ein Fiktives Krankenhaus";
+  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<>();

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -23,6 +23,7 @@ odm:
 
 fhir:
 #  encounters.enabled: true
+#  organization.enabled: true
 #  updateascreate.enabled: true
 #  validation:
 #    enabled: true
@@ -56,7 +57,7 @@ fhir:
 #      file.path: /some/path/client_certificate.p12
 #      password: change-password
 #  identifier:
-#    assigner: Ein Fiktives Krankenhaus
+#    assigner: Ein-Fiktives-Krankenhaus
 #    system:
 #      condition: https://ein.fiktives.krankenhaus/fhir/NamingSystem/conditionId
 #      consent: https://ein.fiktives.krankenhaus/fhir/NamingSystem/consentId
@@ -65,6 +66,7 @@ fhir:
 #      immunization: https://ein.kfiktives.rankenhaus/fhir/NamingSystem/immunizationId
 #      medicationstatement: https://ein.fiktives.krankenhaus/fhir/NamingSystem/medicationstatementId
 #      observation: https://ein.fiktives.krankenhaus/fhir/NamingSystem/observationId
+#      organization: https://ein.fiktives.krankenhaus/fhir/NamingSystem/organizationId
 #      patient: https://ein.fiktives.krankenhaus/fhir/NamingSystem/patientId
 #      procedure: https://ein.fiktives.krankenhaus/fhir/NamingSystem/procedureId
 

diff --git a/src/main/resources/odm/redcap/datadictionary-pre.csv b/src/main/resources/odm/redcap/datadictionary-pre.csv
@@ -362,39 +362,39 @@ fibrinogen_loinc_1,laborwerte,,dropdown,Fibrinogen LOINC-Code,"30902-1,30902-1 -
 fibrinogen_loinc_2,laborwerte,,dropdown,Fibrinogen LOINC-Code,"30902-1,30902-1 - Fibrinogen [Masse/Volumen] in plättchenarmem Plasma durch Hitzedenaturierung | 48664-7,48664-7 - Fibrinogen [Masse/Volumen] in plättchenarmem Plasma durch Gerinnung abgeleitet | 3255-7,3255-7 - Fibrinogen [Masse/Volumen] in plättchenarmem Plasma durch Gerinnungstest",,,,,,"[fibrinogen_unit] = ""2""",,,,,,
 sarsco_v2rtpcr_code,laborwerte,SARS-CoV-2-RT-PCR,text,2.16.840.1.113883.6.1_94500-6,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94500-6"""
 sarsco_v2rtpcr,laborwerte,SARS-CoV-2-RT-PCR,dropdown,SARS-CoV-2-RT-PCR,"2.16.840.1.113883.6.96_260373001,Nachgewiesen | 2.16.840.1.113883.6.96_260415000,Nicht nachgewiesen | 2.16.840.1.113883.6.96_419984006,Uneindeutig",,,,,,,,,,,,
-sarsco_v2rtpcr_loinc,laborwerte,,dropdown,SARS-CoV-2-RT-PCR LOINC-Code,"94500-6,94500-6 - SARS-CoV-2 (COVID-19) RNA [Anwesenheit] in Atemwegsprobe durch NAA mit Sondenerkennung",,,,,,,,,,,,"@DEFAULT=""94500-6_sars-cov-2-covid-19-rna-in-respiratory-specimen-by-naa-with-probe-detection""@READONLY"
+sarsco_v2rtpcr_loinc,laborwerte,,dropdown,SARS-CoV-2-RT-PCR LOINC-Code,"94500-6,94500-6 - SARS-CoV-2 (COVID-19) RNA [Anwesenheit] in Atemwegsprobe durch NAA mit Sondenerkennung",,,,,,,,,,,,"@DEFAULT=""94500-6""@READONLY"
 sarsco_v2_covid19_ig_g_ia_ql_code,laborwerte,SARS-CoV-2 (COVID-19) IgG IA Ql,text,2.16.840.1.113883.6.1_94563-4,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94563-4"""
 sarsco_v2_covid19_ig_g_ia_ql,laborwerte,SARS-CoV-2 (COVID-19) IgG IA Ql,dropdown,SARS-CoV-2 (COVID-19) IgG IA Ql (IA QI: Immunoassay-Qualität),"2.16.840.1.113883.6.96_260373001,Nachgewiesen | 2.16.840.1.113883.6.96_260415000,Nicht nachgewiesen | 2.16.840.1.113883.6.96_419984006,Uneindeutig",IA QI: Immunoassay-Qualität,,,,,,,,,,,
-sarsco_v2_covid19_ig_g_ia_ql_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgG IA Ql (IA QI: Immunoassay-Qualität) LOINC-Code,"94563-4,94563-4 - SARS-CoV-2 (COVID-19) IgG Ab [Anwesenheit] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94563-4_sars-cov-2-covid-19-igg-ab-in-serum-or-plasma-by-immunoassay""@READONLY"
+sarsco_v2_covid19_ig_g_ia_ql_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgG IA Ql (IA QI: Immunoassay-Qualität) LOINC-Code,"94563-4,94563-4 - SARS-CoV-2 (COVID-19) IgG Ab [Anwesenheit] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94563-4""@READONLY"
 sarsco_v2_covid19_ig_g_ia_qn_code,laborwerte,SARS-CoV-2 (COVID-19) IgG IA Qn,text,2.16.840.1.113883.6.1_94505-5,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94505-5"""
 sarsco_v2_covid19_ig_g_ia_qn,laborwerte,SARS-CoV-2 (COVID-19) IgG IA Qn,text,SARS-CoV-2 (COVID-19) IgG IA Qn (IA QI: Immunoassay-Quantität),,IA QI: Immunoassay-Quantität,number_comma_decimal,,,,,,,,,,
 sarsco_v2_covid19_ig_g_ia_qn_comparator,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgG IA Qn (IA QI: Immunoassay-Quantität) Vergleichsoperator,"1,< | 2,<= | 3,>= | 4,>",,,,,,,,,,,,
 sarsco_v2_covid19_ig_g_ia_qn_unit,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgG IA Qn (IA QI: Immunoassay-Quantität) Einheit,"1,[arb'U]/mL",,,,,,,,,,,,"@DEFAULT=""1""@READONLY"
-sarsco_v2_covid19_ig_g_ia_qn_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgG IA Qn (IA QI: Immunoassay-Quantität) LOINC-Code,"94505-5,94505-5 - SARS-CoV-2 (COVID-19) IgG Ab [Einheiten/Volumen] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94505-5_sars-cov-2-covid-19-igg-ab-in-serum-or-plasma-by-immunoassay""@READONLY"
+sarsco_v2_covid19_ig_g_ia_qn_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgG IA Qn (IA QI: Immunoassay-Quantität) LOINC-Code,"94505-5,94505-5 - SARS-CoV-2 (COVID-19) IgG Ab [Einheiten/Volumen] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94505-5""@READONLY"
 sarsco_v2_covid19_ig_m_ia_ql_code,laborwerte,SARS-CoV-2 (COVID-19) IgM IA Ql,text,2.16.840.1.113883.6.1_94564-2,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94564-2"""
 sarsco_v2_covid19_ig_m_ia_ql,laborwerte,SARS-CoV-2 (COVID-19) IgM IA Ql,dropdown,SARS-CoV-2 (COVID-19) IgM IA Ql (IA QI: Immunoassay-Qualität),"2.16.840.1.113883.6.96_260373001,Nachgewiesen | 2.16.840.1.113883.6.96_260415000,Nicht nachgewiesen | 2.16.840.1.113883.6.96_419984006,Uneindeutig",IA QI: Immunoassay-Qualität,,,,,,,,,,,
-sarsco_v2_covid19_ig_m_ia_ql_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgM IA Ql (IA QI: Immunoassay-Qualität) LOINC-Code,"94564-2,94564-2 - SARS-CoV-2 (COVID-19) IgM Ab [Anwesenheit] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94564-2_sars-cov-2-covid-19-igm-ab-in-serum-or-plasma-by-immunoassay""@READONLY"
+sarsco_v2_covid19_ig_m_ia_ql_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgM IA Ql (IA QI: Immunoassay-Qualität) LOINC-Code,"94564-2,94564-2 - SARS-CoV-2 (COVID-19) IgM Ab [Anwesenheit] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94564-2""@READONLY"
 sarsco_v2_covid19_ig_m_ia_qn_code,laborwerte,SARS-CoV-2 (COVID-19) IgM IA Qn,text,2.16.840.1.113883.6.1_94506-3,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94506-3"""
 sarsco_v2_covid19_ig_m_ia_qn,laborwerte,SARS-CoV-2 (COVID-19) IgM IA Qn,text,SARS-CoV-2 (COVID-19) IgM IA Qn (IA QI: Immunoassay-Quantität),,IA QI: Immunoassay-Quantität,number_comma_decimal,,,,,,,,,,
 sarsco_v2_covid19_ig_m_ia_qn_comparator,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgM IA Qn (IA QI: Immunoassay-Quantität) Vergleichsoperator,"1,< | 2,<= | 3,>= | 4,>",,,,,,,,,,,,
 sarsco_v2_covid19_ig_m_ia_qn_unit,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgM IA Qn (IA QI: Immunoassay-Quantität) Einheit,"1,[arb'U]/mL",,,,,,,,,,,,"@DEFAULT=""1""@READONLY"
-sarsco_v2_covid19_ig_m_ia_qn_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgM IA Qn (IA QI: Immunoassay-Quantität) LOINC-Code,"94506-3,94506-3 - SARS-CoV-2 (COVID-19) IgM Ab [Einheiten/Volumen] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94506-3_sars-cov-2-covid-19-igm-ab-in-serum-or-plasma-by-immunoassay""@READONLY"
+sarsco_v2_covid19_ig_m_ia_qn_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgM IA Qn (IA QI: Immunoassay-Quantität) LOINC-Code,"94506-3,94506-3 - SARS-CoV-2 (COVID-19) IgM Ab [Einheiten/Volumen] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94506-3""@READONLY"
 sarsco_v2_covid19_ig_a_ia_ql_code,laborwerte,SARS-CoV-2 (COVID-19) IgA IA Ql,text,2.16.840.1.113883.6.1_94562-6,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94562-6"""
 sarsco_v2_covid19_ig_a_ia_ql,laborwerte,SARS-CoV-2 (COVID-19) IgA IA Ql,dropdown,SARS-CoV-2 (COVID-19) IgA IA Ql (IA QI: Immunoassay-Qualität),"2.16.840.1.113883.6.96_260373001,Nachgewiesen | 2.16.840.1.113883.6.96_260415000,Nicht nachgewiesen | 2.16.840.1.113883.6.96_419984006,Uneindeutig",IA QI: Immunoassay-Qualität,,,,,,,,,,,
-sarsco_v2_covid19_ig_a_ia_ql_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgA IA Ql (IA QI: Immunoassay-Qualität) LOINC-Code,"94562-6,94562-6 - SARS-CoV-2 (COVID-19) IgA Ab [Anwesenheit] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94562-6_sars-cov-2-covid-19-iga-ab-in-serum-or-plasma-by-immunoassay""@READONLY"
+sarsco_v2_covid19_ig_a_ia_ql_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgA IA Ql (IA QI: Immunoassay-Qualität) LOINC-Code,"94562-6,94562-6 - SARS-CoV-2 (COVID-19) IgA Ab [Anwesenheit] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94562-6""@READONLY"
 sarsco_v2_covid19_ig_a_ia_qn_code,laborwerte,SARS-CoV-2 (COVID-19) IgA IA Qn,text,2.16.840.1.113883.6.1_94720-0,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94720-0"""
 sarsco_v2_covid19_ig_a_ia_qn,laborwerte,SARS-CoV-2 (COVID-19) IgA IA Qn,text,SARS-CoV-2 (COVID-19) IgA IA Qn (IA QI: Immunoassay-Quantität),,IA QI: Immunoassay-Quantität,number_comma_decimal,,,,,,,,,,
 sarsco_v2_covid19_ig_a_ia_qn_comparator,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgA IA Qn (IA QI: Immunoassay-Quantität) Vergleichsoperator,"1,< | 2,<= | 3,>= | 4,>",,,,,,,,,,,,
 sarsco_v2_covid19_ig_a_ia_qn_unit,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgA IA Qn (IA QI: Immunoassay-Quantität) Einheit,"1,[IU]/mL",,,,,,,,,,,,"@DEFAULT=""1""@READONLY"
-sarsco_v2_covid19_ig_a_ia_qn_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgA IA Qn (IA QI: Immunoassay-Quantität) LOINC-Code,"94720-0,94720-0 - SARS-CoV-2 (COVID-19) IgA Ab [Einheiten/Volumen] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94720-0_sars-cov-2-covid-19-iga-ab-in-serum-or-plasma-by-immunoassay""@READONLY"
+sarsco_v2_covid19_ig_a_ia_qn_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) IgA IA Qn (IA QI: Immunoassay-Quantität) LOINC-Code,"94720-0,94720-0 - SARS-CoV-2 (COVID-19) IgA Ab [Einheiten/Volumen] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94720-0""@READONLY"
 sarsco_v2_covid19_ab_ia_ql_code,laborwerte,SARS-CoV-2 (COVID-19) Ab IA Ql,text,2.16.840.1.113883.6.1_94762-2,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94762-2"""
 sarsco_v2_covid19_ab_ia_ql,laborwerte,SARS-CoV-2 (COVID-19) Ab IA Ql,dropdown,SARS-CoV-2 (COVID-19) Ab IA Ql (IA QI: Immunoassay-Qualität),"2.16.840.1.113883.6.96_260373001,Nachgewiesen | 2.16.840.1.113883.6.96_260415000,Nicht nachgewiesen | 2.16.840.1.113883.6.96_419984006,Uneindeutig",IA QI: Immunoassay-Qualität,,,,,,,,,,,
-sarsco_v2_covid19_ab_ia_ql_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) Ab IA Ql (IA QI: Immunoassay-Qualität) LOINC-Code,"94762-2,94762-2 - SARS-CoV-2 (COVID-19) Ab [Anwesenheit] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94762-2_sars-cov-2-covid-19-ab-in-serum-or-plasma-by-immunoassay""@READONLY"
+sarsco_v2_covid19_ab_ia_ql_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) Ab IA Ql (IA QI: Immunoassay-Qualität) LOINC-Code,"94762-2,94762-2 - SARS-CoV-2 (COVID-19) Ab [Anwesenheit] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94762-2""@READONLY"
 sarsco_v2_covid19_ab_ia_qn_code,laborwerte,SARS-CoV-2 (COVID-19) Ab IA Qn,text,2.16.840.1.113883.6.1_94769-7,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_94769-7"""
 sarsco_v2_covid19_ab_ia_qn,laborwerte,SARS-CoV-2 (COVID-19) Ab IA Qn,text,SARS-CoV-2 (COVID-19) Ab IA Qn (IA QI: Immunoassay-Quantität),,IA QI: Immunoassay-Quantität,number_comma_decimal,,,,,,,,,,
 sarsco_v2_covid19_ab_ia_qn_comparator,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) Ab IA Qn (IA QI: Immunoassay-Quantität) Vergleichsoperator,"1,< | 2,<= | 3,>= | 4,>",,,,,,,,,,,,
 sarsco_v2_covid19_ab_ia_qn_unit,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) Ab IA Qn (IA QI: Immunoassay-Quantität) Einheit,"1,[IU]/mL",,,,,,,,,,,,"@DEFAULT=""1""@READONLY"
-sarsco_v2_covid19_ab_ia_qn_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) Ab IA Qn (IA QI: Immunoassay-Quantität) LOINC-Code,"94769-7,94769-7 - SARS-CoV-2 (COVID-19) Ab [Einheiten/Volumen] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94769-7_sars-cov-2-covid-19-ab-in-serum-or-plasma-by-immunoassay""@READONLY"
+sarsco_v2_covid19_ab_ia_qn_loinc,laborwerte,,dropdown,SARS-CoV-2 (COVID-19) Ab IA Qn (IA QI: Immunoassay-Quantität) LOINC-Code,"94769-7,94769-7 - SARS-CoV-2 (COVID-19) Ab [Einheiten/Volumen] in Serum oder Plasma durch Immunoassay",,,,,,,,,,,,"@DEFAULT=""94769-7""@READONLY"
 symptome_code,symptome,Symptome,text,2.16.840.1.113883.6.1_75325-1,,,,,,,,,,,,,"@HIDDEN @DEFAULT=""2.16.840.1.113883.6.1_75325-1"""
 symptome,symptome,Symptome,dropdown,Symptome im Rahmen einer COVID-19-Erkrankung,"1,Ja | 2,Nein | 3,Unbekannt",,,,,,,,,,,,
 symptome_geruchs_bzw_geschmacksstoerungen,symptome,,dropdown,Geruchs- bzw. Geschmacksstörungen ,"2.16.840.1.113883.6.96_36955009__2.16.840.1.113883.6.96_44169009__2.16.840.1.113883.6.96_410605003,Ja | 2.16.840.1.113883.6.96_36955009__2.16.840.1.113883.6.96_44169009__2.16.840.1.113883.6.96_410594000,Nein | 2.16.840.1.113883.6.96_36955009__2.16.840.1.113883.6.96_44169009__2.16.840.1.113883.6.96_261665006,Unbekannt",,,,,,"[symptome] = ""1""",,,,,,