From 06c3c38b1dc43c6b75cbf5c852c0be3fb076fee4 Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Wed, 28 Feb 2024 14:13:06 -0800 Subject: [PATCH] Modified Environmental assessment form. --- .../sqlserver/onprc_ehr-23.007-23.008.sql | 113 +++++++++++++----- .../sqlserver/onprc_ehr-23.009-23.010.sql | 35 ++++++ .../org/labkey/onprc_ehr/ONPRC_EHRModule.java | 2 +- 3 files changed, 117 insertions(+), 33 deletions(-) create mode 100644 onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.009-23.010.sql diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.007-23.008.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.007-23.008.sql index 709ebfc7d..51cfae8b2 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.007-23.008.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.007-23.008.sql @@ -1,35 +1,84 @@ -CREATE TABLE onprc_ehr.Environmental_Assessment( - rowid int IDENTITY(100,1) NOT NULL, - date datetime NULL, - service_requested varchar(300) NULL, - charge_unit varchar(300) NULL, - testing_location varchar(300) NULL, - test_type varchar(300) NULL, - test_results varchar(100) NULL, - pass_fail varchar(100) NULL, - biological_Cycle varchar(300) NULL, - biological_BI varchar(300) NULL, - action varchar(300) NULL, - performedby varchar(300) NULL, - remarks varchar(300) NULL, - water_source varchar(300) NULL, - surface_tested varchar(300) NULL, - retest varchar(300) NULL, - colony_count varchar(300) NULL, - test_method varchar(300) NULL, - objectid ENTITYID Not Null, - createdby int NULL, - created datetime NULL, - modifiedby int NULL, - modified datetime NULL, - Container ENTITYID NOT NULL, - taskid entityid, - qcstate int NULL, - formsort int NULL - - - CONSTRAINT PK_assessment PRIMARY KEY (objectid) +-- ================================================================================================= +-- Add MPA Clinical remarks: By, Lakshmi Kolli +-- Created on: 1/25/2024 +/* Description: Created 1 temp table to store the clinical remarks records. + The stored proc manages the addition and deleting clinical remarks data from the temp table + at the time of execution via ETL process. + */ +-- ================================================================================================= + +--Drop table if exists +EXEC core.fn_dropifexists 'Temp_ClnRemarks','onprc_ehr','TABLE'; +--Drop Stored proc if exists +EXEC core.fn_dropifexists '[onprc_ehr].[MPA_ClnRemarkAddition]', 'onprc_ehr', 'PROCEDURE'; +GO + +-- Create the temp table +CREATE TABLE onprc_ehr.Temp_ClnRemarks +( + date datetime, + qcstate int, + participantid nvarchar(32), + project int, + remark nvarchar(250) , + p nvarchar(250) , + performedby nvarchar(250) , + category nvarchar(250) , + taskid nvarchar(4000), + createdby int, + modifiedby int ) +; + +GO + +-- Create the stored proc +/****** Object: StoredProcedure [onprc_ehr].[MPA_ClnRemarkAddition] Script Date: 1/25/2024 *****/ +-- ================================================================================= + -- Author: Lakshmi Kolli + -- Create date: 1/25/2024 + -- Description: This procedure identifies if an animal received an MPA injection + -- and inserts a clinical remark into animal's record. +-- ================================================================================= + +CREATE PROCEDURE [onprc_ehr].[MPA_ClnRemarkAddition] +AS + +DECLARE +@MPACount Int, + @taskId nvarchar(4000) + +BEGIN + --Delete all rows from the temp_Drug table + Delete From onprc_ehr.Temp_ClnRemarks + + --Check if the MPA injection E-85760 was administered today + Select @MPACount = COUNT(*) From studyDataset.c6d178_drug + Where code = 'E-85760' And CONVERT(DATE, date) = CONVERT(DATE, GETDATE()) And qcstate = 18 + + --Found entries, so, enter the clinical remarks now + If @MPACount > 0 + Begin + -- Create a Task entry in ehr.tasks table + Set @taskid = NEWID() -- creating taskid + Insert Into ehr.tasks + (taskid, category, title, formtype, qcstate, assignedto, duedate, createdby, created, + container, modifiedby, modified, description, datecompleted) + Values + (@taskid, 'Task', 'Bulk Clinical Entry', 'Bulk Clinical Entry', 18, 1003, GETDATE(), 1003, GETDATE(), + 'CD17027B-C55F-102F-9907-5107380A54BE', 1003, GETDATE(), 'Created by the ETL process', GETDATE()) + + --Insert the clinical remark into the temp clinical remarks table. + /* Get all the Animals who had MPA injection today from studyDataset.c6d178_drug + and INSERT the data into the studyDataset.c6d185_clinremarks table */ + Insert Into onprc_ehr.Temp_ClnRemarks ( + date, qcstate, participantid, project, remark, p, performedby, category, taskid, createdby, modifiedby + ) + Select GETDATE(), 18, participantid, project, 'Remark entered by the ETL process', 'MPA injection administered', 'onprcitsupport@ohsu.edu', 'Clinical', @taskId, 1003, 1003 + From studyDataset.c6d178_drug + Where code = 'E-85760' And CONVERT(DATE, date) = CONVERT(DATE, GETDATE()) And qcstate = 18 + End - GO +END +GO diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.009-23.010.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.009-23.010.sql new file mode 100644 index 000000000..709ebfc7d --- /dev/null +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-23.009-23.010.sql @@ -0,0 +1,35 @@ +CREATE TABLE onprc_ehr.Environmental_Assessment( + rowid int IDENTITY(100,1) NOT NULL, + date datetime NULL, + service_requested varchar(300) NULL, + charge_unit varchar(300) NULL, + testing_location varchar(300) NULL, + test_type varchar(300) NULL, + test_results varchar(100) NULL, + pass_fail varchar(100) NULL, + biological_Cycle varchar(300) NULL, + biological_BI varchar(300) NULL, + action varchar(300) NULL, + performedby varchar(300) NULL, + remarks varchar(300) NULL, + water_source varchar(300) NULL, + surface_tested varchar(300) NULL, + retest varchar(300) NULL, + colony_count varchar(300) NULL, + test_method varchar(300) NULL, + objectid ENTITYID Not Null, + createdby int NULL, + created datetime NULL, + modifiedby int NULL, + modified datetime NULL, + Container ENTITYID NOT NULL, + taskid entityid, + qcstate int NULL, + formsort int NULL + + + CONSTRAINT PK_assessment PRIMARY KEY (objectid) +) + + GO + diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java b/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java index 25a4629ef..13e0fabcc 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java @@ -126,7 +126,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 23.009; + return 23.010; } @Override