From a3839439933b0c97367b3dc34776bae8d0bf7e79 Mon Sep 17 00:00:00 2001
From: Anton Ivanov <antoha.ivanov@gmail.com>
Date: Sat, 25 Jan 2025 18:46:15 +0300
Subject: [PATCH] fix for NULL STDPLAC values

---
 .../Transformation/Truven/Definitions/FACILITY_HEADER.xml       | 2 +-
 .../Transformation/Truven/Definitions/INPATIENT_SERVICES.xml    | 2 +-
 .../Transformation/Truven/Definitions/OUTPATIENT_SERVICES.xml   | 2 +-
 .../org.ohdsi.cdm.framework/Common/Definitions/Concept.cs       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/FACILITY_HEADER.xml b/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/FACILITY_HEADER.xml
index 2b09ad7d..f0b6dcac 100644
--- a/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/FACILITY_HEADER.xml
+++ b/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/FACILITY_HEADER.xml
@@ -282,7 +282,7 @@
             </Mapper>
           </ConceptIdMappers>
           <Fields>
-            <Field key="STDPLAC" defaultConceptId="0" defaultTypeId="32846"/>
+            <Field isNullable="true" key="STDPLAC" defaultConceptId="0" defaultTypeId="32846"/>
           </Fields>
         </Concept>
         <Concept>
diff --git a/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/INPATIENT_SERVICES.xml b/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/INPATIENT_SERVICES.xml
index cd515406..2c68b50d 100644
--- a/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/INPATIENT_SERVICES.xml
+++ b/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/INPATIENT_SERVICES.xml
@@ -290,7 +290,7 @@
             </Mapper>
           </ConceptIdMappers>
           <Fields>
-            <Field key="STDPLAC" defaultConceptId="0" defaultTypeId="32854"/>
+            <Field isNullable="true" key="STDPLAC" defaultConceptId="0" defaultTypeId="32854"/>
           </Fields>
         </Concept>
         <Concept>
diff --git a/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/OUTPATIENT_SERVICES.xml b/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/OUTPATIENT_SERVICES.xml
index d423be5c..5f2ad968 100644
--- a/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/OUTPATIENT_SERVICES.xml
+++ b/sources/Framework/org.ohdsi.cdm.framework.etl/Transformation/Truven/Definitions/OUTPATIENT_SERVICES.xml
@@ -196,7 +196,7 @@
             </Mapper>
           </ConceptIdMappers>
           <Fields>
-            <Field key="STDPLAC" defaultConceptId="0" defaultTypeId="32860"/>
+            <Field isNullable="true" key="STDPLAC" defaultConceptId="0" defaultTypeId="32860"/>
           </Fields>
         </Concept>
       </Concepts>
diff --git a/sources/Framework/org.ohdsi.cdm.framework/Common/Definitions/Concept.cs b/sources/Framework/org.ohdsi.cdm.framework/Common/Definitions/Concept.cs
index b8dc7db6..4a517785 100644
--- a/sources/Framework/org.ohdsi.cdm.framework/Common/Definitions/Concept.cs
+++ b/sources/Framework/org.ohdsi.cdm.framework/Common/Definitions/Concept.cs
@@ -59,7 +59,7 @@ private static List<LookupValue> GetValues(IVocabulary vocabulary, Field field,
             var conceptKey = reader.GetString(field.Key);
 
             return conceptKey == null
-                ? []
+                ? [new LookupValue()]
                 : mapper.Map(vocabulary, field.Key, conceptKey, reader.GetDateTime(field.EventDate));
         }