From c4766ca850795803358d05d4a47873b09f082b35 Mon Sep 17 00:00:00 2001 From: blasar Date: Fri, 10 Apr 2026 12:21:00 -0700 Subject: [PATCH 1/6] Created a new program to update JMAc animal group's removal date. --- .../sqlserver/onprc_ehr-25.004-25.005.sql | 129 ++++++++++++++++++ .../org/labkey/onprc_ehr/ONPRC_EHRModule.java | 2 +- 2 files changed, 130 insertions(+), 1 deletion(-) create mode 100644 onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql new file mode 100644 index 000000000..27086725a --- /dev/null +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql @@ -0,0 +1,129 @@ + +CREATE TABLE onprc_ehr.Rpt_TempJmacDate( + searchid integer IDENTITY(100,1) NOT NULL, + animalid varchar(200) NULL, + JBGRemovalDate varchar(255) NULL, + JBGActualRemovalDate varchar(255) NULL + + ) ON [PRIMARY] + GO + + + +/* +** +** Created by Date Comment +** +** blasa 4/10/2026 Process to update jmac Removal date +** +** +** +**/ + +CREATE Procedure onprc_ehr.s_JmacRemovalDateProcess + + +AS + + +declare + + + @TempSearchKey Int, + @Searchkey Int, + @AnimalID Int + + + + + + + + + + + +Begin + + + + + + ----- Reset the last two months only + + Delete onprc_ehr.Rpt_TempJmacDate + + If @@Error <> 0 + GoTo Err_Proc + + + + Set @Tempsearchkey = 0 + Set @Searchkey = 0 + + --- Set initial processing + + Insert into onprc_ehr.Rpt_TempJmacDate + select * from JmacRemovalDate + Order by ID + + Select top 1 @SearchKey = searchID from onprc_ehr.Rpt_TempJmacDate + Order by searchid + + + While @Tempsearchkey < @SearchKey + Begin + + + + select @animalid = Id, @OrgRemovalDate = JBGRemovalDate, @ActualRemovalDate = JBGActualRemovalDate + from onprc_ehr.Rpt_TempJmacDate Where searchid = @Searchkey + + -------Begin updating records + + + Update JB + Set JB.enddate = @ActualRemovalDate + From Study.AnimalGroups JB + Where JB.Participantid = @Animalid + And cast(JB.enddate as Date) = cast(@OrgRemovalDate as Date) + + + If @@Error <> 0 + GoTo Err_Proc + + + + + Set @TempSearchkey = @Searchkey + + Select Top 1 @SearchKey = searchid From onprc_ehr.Rpt_TempJmacDatet + Where @Searchkey > @Tempsearchkey + Order by searchid + + + + + End ------(While @tempsearchkey < @Searchkey) + + + + + +End ----- (While) + + + + + Return 0 + + Err_Proc: Return 1 + + + + +END + + + + 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 d18c157d4..6e766bdc6 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java @@ -124,7 +124,7 @@ public String getName() @Override public @Nullable Double getSchemaVersion() { - return 25.004; + return 25.005; } @Override From 096db971c8e1291d2a2b801f16b5f7b5a2e6e44b Mon Sep 17 00:00:00 2001 From: blasar Date: Fri, 17 Apr 2026 09:29:04 -0700 Subject: [PATCH 2/6] Created a new temp table to be able to update JMac end dates. --- onprc_ehr/resources/schemas/onprc_ehr.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/onprc_ehr/resources/schemas/onprc_ehr.xml b/onprc_ehr/resources/schemas/onprc_ehr.xml index 298c65edc..49656ed81 100644 --- a/onprc_ehr/resources/schemas/onprc_ehr.xml +++ b/onprc_ehr/resources/schemas/onprc_ehr.xml @@ -1480,4 +1480,12 @@ + + + + + + +
+ From 8d422852fa2310641a39012d6815e6233f9a7d34 Mon Sep 17 00:00:00 2001 From: blasar Date: Fri, 17 Apr 2026 10:04:06 -0700 Subject: [PATCH 3/6] Created a new temp table to be able to update JMac end dates. --- .../sqlserver/onprc_ehr-25.004-25.005.sql | 22 +++++++++---------- onprc_ehr/resources/schemas/onprc_ehr.xml | 15 ++++++++++++- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql index 27086725a..f0b4f94d3 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql @@ -8,6 +8,16 @@ CREATE TABLE onprc_ehr.Rpt_TempJmacDate( ) ON [PRIMARY] GO +CREATE TABLE onprc_ehr.JmacRemovalDate( + searchid integer IDENTITY(100,1) NOT NULL, + Id varchar(100) NULL, + JBGRemovalDate smalldatetime NULL, + JBGActualRemovalDate smalldatetime NULL, + DaysDiff float NULL, + reason varchar(100) NULL +) ON [PRIMARY] +GO + /* @@ -34,21 +44,9 @@ declare @AnimalID Int - - - - - - - - - Begin - - - ----- Reset the last two months only Delete onprc_ehr.Rpt_TempJmacDate diff --git a/onprc_ehr/resources/schemas/onprc_ehr.xml b/onprc_ehr/resources/schemas/onprc_ehr.xml index 49656ed81..12c22096a 100644 --- a/onprc_ehr/resources/schemas/onprc_ehr.xml +++ b/onprc_ehr/resources/schemas/onprc_ehr.xml @@ -1483,9 +1483,22 @@ - + +
+ + + + + + + + + +
+ + From 385e25b100e627b855d3f84901310b8ee69235d0 Mon Sep 17 00:00:00 2001 From: blasar Date: Fri, 17 Apr 2026 10:26:04 -0700 Subject: [PATCH 4/6] Created a new temp table to be able to update JMac end dates. --- .../sqlserver/onprc_ehr-25.004-25.005.sql | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql index f0b4f94d3..6160e6a9a 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql @@ -41,7 +41,9 @@ declare @TempSearchKey Int, @Searchkey Int, - @AnimalID Int + @AnimalID Int, + @OrgRemovalDate smalldatetime, + @ActualRemovalDate smalldatetime Begin @@ -62,8 +64,10 @@ Begin --- Set initial processing Insert into onprc_ehr.Rpt_TempJmacDate - select * from JmacRemovalDate - Order by ID + select Id, JBGRemovalDate, JBGActualRemovalDate + from onprc_ehr.JmacRemovalDate + + Order by searchid Select top 1 @SearchKey = searchID from onprc_ehr.Rpt_TempJmacDate Order by searchid @@ -74,7 +78,7 @@ Begin - select @animalid = Id, @OrgRemovalDate = JBGRemovalDate, @ActualRemovalDate = JBGActualRemovalDate + select @animalid = animalid, @OrgRemovalDate = JBGRemovalDate, @ActualRemovalDate = JBGActualRemovalDate from onprc_ehr.Rpt_TempJmacDate Where searchid = @Searchkey -------Begin updating records @@ -91,11 +95,9 @@ Begin GoTo Err_Proc - - Set @TempSearchkey = @Searchkey - Select Top 1 @SearchKey = searchid From onprc_ehr.Rpt_TempJmacDatet + Select Top 1 @SearchKey = searchid From onprc_ehr.Rpt_TempJmacDate Where @Searchkey > @Tempsearchkey Order by searchid From a64ef40ad8b6833c7e0735f011e8aadc56bf4c67 Mon Sep 17 00:00:00 2001 From: blasar Date: Fri, 17 Apr 2026 13:44:53 -0700 Subject: [PATCH 5/6] Created a new temp table to be able to update JMac end dates. --- .../dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql | 8 -------- onprc_ehr/resources/schemas/onprc_ehr.xml | 2 +- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql index 6160e6a9a..4925a4fbf 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql @@ -107,14 +107,6 @@ Begin End ------(While @tempsearchkey < @Searchkey) - - - -End ----- (While) - - - - Return 0 Err_Proc: Return 1 diff --git a/onprc_ehr/resources/schemas/onprc_ehr.xml b/onprc_ehr/resources/schemas/onprc_ehr.xml index 12c22096a..e5dbb66dc 100644 --- a/onprc_ehr/resources/schemas/onprc_ehr.xml +++ b/onprc_ehr/resources/schemas/onprc_ehr.xml @@ -1492,7 +1492,7 @@ - + From 4682fea18c36e9fc96fee1bbd71aac59e2d2c00c Mon Sep 17 00:00:00 2001 From: blasar Date: Fri, 17 Apr 2026 14:42:32 -0700 Subject: [PATCH 6/6] Created a new temp table to be able to update JMac end dates. --- .../schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql index 4925a4fbf..9575a81f6 100644 --- a/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql @@ -86,7 +86,7 @@ Begin Update JB Set JB.enddate = @ActualRemovalDate - From Study.AnimalGroups JB + From StudyDataset.c6d346_animal_group_members JB Where JB.Participantid = @Animalid And cast(JB.enddate as Date) = cast(@OrgRemovalDate as Date)