fix ehr data validation queries (#670)

Author: ankurjuneja

ehr/resources/queries/study/animalIdsAsDamAndSire.sql

@@ -1,14 +1,6 @@
 
-SELECT DISTINCT dam AS Id,
-                gender,
-                species
+SELECT Id.parents.dam AS parent,
+       gender,
+       species
 FROM demographics
-WHERE dam IN (SELECT sire FROM demographics)
-
-UNION
-
-SELECT DISTINCT sire AS Id,
-                gender,
-                species
-FROM demographics
-WHERE sire IN (SELECT dam FROM demographics);
+WHERE Id.parents.dam IN (SELECT Id.parents.sire FROM demographics)

ehr/resources/queries/study/parentsDifferentSpecies.sql

@@ -14,7 +14,7 @@ SELECT
         ELSE FALSE
     END as parentSpeciesMismatch
 FROM demographics d1
-LEFT JOIN demographics d2 ON d1.dam = d2.Id
-LEFT JOIN demographics d3 ON d1.sire = d3.Id
+LEFT JOIN demographics d2 ON d1.Id.parents.dam = d2.Id
+LEFT JOIN demographics d3 ON d1.Id.parents.sire = d3.Id
 ) d4
 WHERE d4.parentSpeciesMismatch = TRUE

ehr/resources/queries/study/parentsIncorrectGender.sql

@@ -14,7 +14,7 @@ SELECT
         ELSE FALSE
     END as parentSpeciesMismatch
 FROM demographics d1
-LEFT JOIN demographics d2 ON d1.dam = d2.Id
-LEFT JOIN demographics d3 ON d1.sire = d3.Id
+LEFT JOIN demographics d2 ON d1.Id.parents.dam = d2.Id
+LEFT JOIN demographics d3 ON d1.Id.parents.sire = d3.Id
      ) d4
 WHERE d4.parentSpeciesMismatch = TRUE

ehr/resources/queries/study/parentsYoungerThanOffspring.sql

@@ -5,12 +5,12 @@ FROM (
           dem.gender,
           dem.species,
           dem.birth,
-          dem.dam,
+          dem.Id.parents.dam,
           damDem.birth as damBirth,
-          dem.sire,
+          dem.Id.parents.sire,
           sireDem.birth as sireBirth
       FROM demographics dem
-      LEFT JOIN demographics damDem ON dem.dam = damDem.Id
-      LEFT JOIN demographics sireDem ON dem.sire = sireDem.Id
+      LEFT JOIN demographics damDem ON dem.Id.parents.dam = damDem.Id
+      LEFT JOIN demographics sireDem ON dem.Id.parents.sire = sireDem.Id
   ) t
 WHERE (t.birth <= t.damBirth OR t.birth <= t.sireBirth)