1. fixed issue where the milliseconds differ in the modified time causing pivoted rows to be displayed on mulitiple lines. (#887)

2. updated query source to match database view used on the production server.

Author: spamhurts

snprc_ehr/resources/queries/snprc_ehr/MhcDataPivot.sql

@@ -1,25 +1,26 @@
 SELECT
     b.Id,
+    b.modified,
     b.Haplotype,
     b.Ocid,
     b.DataFileSource,
-    b.modified,
     group_concat(b.MhcValue) as MhcValue
 
+
 FROM (
          SELECT
              b.Id,
              b.Haplotype,
              b.Ocid,
              b.MhcValue,
              b.DataFileSource,
-             b.Modified
+             cast(b.modified as varchar) as modified
          FROM snprc_ehr.MhcData as b
-         ) as b
+     ) as b
 
 GROUP BY b.id, b.ocid, b.DataFileSource, b.haplotype, b.modified
 
-PIVOT MhcValue BY Haplotype IN
-(select distinct Haplotype from snprc_ehr.MhcData order by Haplotype
-
-)
+    PIVOT MhcValue BY Haplotype IN
+(
+    select distinct Haplotype from snprc_ehr.MhcData order by Haplotype
+)

snprc_ehr/resources/source_queries/create_v_MchStatus.sql

@@ -44,7 +44,7 @@ SELECT  m.[Animal ID] AS id ,
 
 FROM    dbo.MhcStatus AS m -- select primates only from the TxBiomed colony
 INNER JOIN labkey_etl.V_DEMOGRAPHICS AS d ON d.id = RIGHT(SPACE(6) + m.[Animal ID], 6)
-WHERE [A001 Status] IS NOT NULL AND [B008 Status] IS NOT NULL AND [B017 Status] IS NOT NULL AND [B003 Status] IS NOT NULL
+WHERE [A001 Status] IS NOT NULL OR [B008 Status] IS NOT NULL OR [B017 Status] IS NOT NULL OR [B003 Status] IS NOT NULL
 
 GO