Bugfixes to SubjectScopedSelect

Author: bbimber

SivStudies/resources/etls/siv-studies.xml

@@ -34,8 +34,8 @@
                     <setting name="dataSourceSchema" value="geneticscore"/>
                     <setting name="dataSourceQuery" value="mhc_data"/>
                     <setting name="dataSourceSubjectColumn" value="subjectid"/>
-                    <setting name="dataSourceColumns" value="subjectid,date,assaytype,marker,result,score"/>
-                    <setting name="dataSourceColumnMapping" value="subjectId=Id"/>
+                    <setting name="dataSourceColumns" value="subjectid,created,assaytype,marker,result,score"/>
+                    <setting name="dataSourceColumnMapping" value="subjectId=Id,created=date"/>
                     <setting name="dataSourceColumnDefaults" value="category=MHC Typing"/>
 
                     <setting name="targetSchema" value="study"/>

SivStudies/src/org/labkey/sivstudies/etl/SubjectScopedSelect.java

@@ -388,6 +388,10 @@ private List<Map<String, Object>> doNameMapping(List<Map<String, Object>> rows,
                 {
                     row.put(colName, columnToDefaultMap.get(colName));
                 }
+                else if (row.get(colName) == null)
+                {
+                    row.put(colName, columnToDefaultMap.get(colName));
+                }
             }
 
             return row;