Restore assignment, improve validation

Author: labkey-jeckels

hdrl/src/org/labkey/hdrl/query/InboundSpecimenUpdateService.java

@@ -151,30 +151,34 @@ public static void validate(Map<String, Object> row) throws ValidationException
                 }
             }
         }
-        if (row.get("BirthDate") != null)
+        Object birthDateObj = row.get("BirthDate");
+        if (birthDateObj != null)
         {
-            Date birthDate;
-            if (row.get("BirthDate") instanceof Date)
-                row.get("BirthDate");
+            Date birthDate = null;
+            if (birthDateObj instanceof Date d)
+                birthDate = d;
             else
             {
                 try
                 {
                     birthDate = dateFormat.parse((String) row.get("BirthDate"));
-                    if (birthDate.after(today))
-                    {
-                        errors.add("Birth date cannot be in the future");
-                    }
-                    else if ((drawDate != null) && (drawDate.before(birthDate)))
-                    {
-                        errors.add("Draw date cannot be before birth date");
-                    }
                 }
                 catch (ParseException e)
                 {
                     errors.add("Invalid birth date format");
                 }
             }
+            if (birthDate != null)
+            {
+                if (birthDate.after(today))
+                {
+                    errors.add("Birth date cannot be in the future");
+                }
+                else if ((drawDate != null) && (drawDate.before(birthDate)))
+                {
+                    errors.add("Draw date cannot be before birth date");
+                }
+            }
         }
         if (row.get("SSN") == null || StringUtils.isEmpty(String.valueOf(row.get("SSN"))))
             missingFields.add("SSN");