Updated clin path ETL source queries (#385)

Author: spamhurts

snprc_ehr/resources/source_queries/create_v_clinpathruns.sql

@@ -28,24 +28,23 @@ ALTER VIEW Labkey_etl.v_clinPathRuns AS
 -- ==========================================================================================
 -- Author:		Terry Hawkins
 -- Create date: 1/08/2015
--- Description:	Selects the ETL records for LabKey study.clinPathRuns dataset 
--- Note:  Currently only selecting the following data types:
---			Hematology, Biochemistry, Surveillance
+-- Description:	Selects the ETL records for LabKey study.clinPathRuns dataset
 -- Changes:
 -- 11/10/2016 added modified, modifiedby, created, and createdby columns + code cleanup tjh
 -- 6/16/2017  added serviceId and commented out serviceRequested and animalVisit. tjh
 -- 6/19/2017  casted dateFinalized to a datetime2 to round time up to seconds. tjh
--- 6/20/2017  dateFinalized is managed in ehr\triggers.js by LK.  Created new column (verifiedDate) to 
+-- 6/20/2017  dateFinalized is managed in ehr\triggers.js by LK.  Created new column (verifiedDate) to
 --			  store the verified date. tjh
 -- 7/25/2017  removed message_id - data moved to objectid column.
+-- 10/15/2021 service name lookup moved to dbo.CLINICAL_PATH_LABWORK_SERVICES table
 -- ==========================================================================================
 SELECT
   obr.animal_id                                                AS Id,
   obr.OBSERVATION_DATE_TM                                      AS Date,
   --obr.message_id                                               AS message_id,
   cast(cast(obr.verified_date_tm AS DATETIME2(0)) AS DATETIME) AS verifiedDate,
   obr.SPECIMEN_NUM                                             AS sampleId,
-  lu.PROCEDURE_NAME        									   AS serviceRequested,
+  lu.ServiceName        									   AS serviceRequested,
   obr.PROCEDURE_ID                                             AS serviceId,
   --  obr.PV1_VISIT_NUM										   AS animalVisit,
   obr.message_id                                                AS objectid,
@@ -58,7 +57,7 @@ FROM dbo.CLINICAL_PATH_OBR AS obr
 
   -- select primates only from the TxBiomed colony
   INNER JOIN Labkey_etl.V_DEMOGRAPHICS AS d ON d.id = obr.ANIMAL_ID
-  INNER JOIN dbo.clinical_path_proc_id_lookup AS lu on obr.procedure_id = lu.PROCEDURE_ID
+  INNER JOIN dbo.CLINICAL_PATH_LABWORK_SERVICES AS lu ON obr.procedure_id = lu.ServiceId
   LEFT OUTER JOIN dbo.TAC_COLUMNS AS tc ON tc.object_id = obr.object_id
 
 WHERE obr.RESULT_STATUS IN ('F', 'C', 'D')
@@ -67,6 +66,6 @@ WHERE obr.RESULT_STATUS IN ('F', 'C', 'D')
 GO
 
 GRANT SELECT ON Labkey_etl.v_clinPathRuns TO z_labkey
-GRANT SELECT ON dbo.CLINICAL_PATH_PROC_ID_LOOKUP TO z_labkey
+GRANT SELECT ON dbo.CLINICAL_PATH_LABWORK_SERVICES TO z_labkey
 
-GO
+GO

snprc_ehr/resources/source_queries/create_v_delete_labwork_services.sql

@@ -23,22 +23,22 @@ SET QUOTED_IDENTIFIER ON
 GO
 
 
-CREATE VIEW [labkey_etl].[V_DELETE_LABWORK_SERVICES] AS
+Alter VIEW [labkey_etl].[V_DELETE_LABWORK_SERVICES] AS
 -- ==========================================================================================
 -- Object: v_delete_labwork_services
 -- Author:		Terry Hawkins
 -- Create date: 5/6/2016
---
+-- 10/15/2021 changed query source. tjh
 -- ==========================================================================================
 SELECT
 	pil.object_id,
 	pil.audit_date_tm
 
-FROM audit.AUDIT_CLINICAL_PATH_PROC_ID_LOOKUP AS pil
+FROM audit.AUDIT_CLINICAL_PATH_LABWORK_SERVICES AS pil
 WHERE pil.AUDIT_ACTION = 'D' AND pil.OBJECT_ID IS NOT NULL
 
 GO
 
 GRANT SELECT ON labkey_etl.V_DELETE_LABWORK_SERVICES TO z_labkey
-GRANT SELECT ON AUDIT.AUDIT_CLINICAL_PATH_PROC_ID_LOOKUP TO z_labkey
-go
+GRANT SELECT ON AUDIT.AUDIT_CLINICAL_PATH_LABWORK_SERVICES TO z_labkey
+go