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..9575a81f6 --- /dev/null +++ b/onprc_ehr/resources/schemas/dbscripts/sqlserver/onprc_ehr-25.004-25.005.sql @@ -0,0 +1,121 @@ + +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 + +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 + + + +/* +** +** 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, + @OrgRemovalDate smalldatetime, + @ActualRemovalDate smalldatetime + + +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 Id, JBGRemovalDate, JBGActualRemovalDate + from onprc_ehr.JmacRemovalDate + + Order by searchid + + Select top 1 @SearchKey = searchID from onprc_ehr.Rpt_TempJmacDate + Order by searchid + + + While @Tempsearchkey < @SearchKey + Begin + + + + select @animalid = animalid, @OrgRemovalDate = JBGRemovalDate, @ActualRemovalDate = JBGActualRemovalDate + from onprc_ehr.Rpt_TempJmacDate Where searchid = @Searchkey + + -------Begin updating records + + + Update JB + Set JB.enddate = @ActualRemovalDate + From StudyDataset.c6d346_animal_group_members 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_TempJmacDate + Where @Searchkey > @Tempsearchkey + Order by searchid + + + + + End ------(While @tempsearchkey < @Searchkey) + + + Return 0 + + Err_Proc: Return 1 + + + + +END + + + + diff --git a/onprc_ehr/resources/schemas/onprc_ehr.xml b/onprc_ehr/resources/schemas/onprc_ehr.xml index 298c65edc..e5dbb66dc 100644 --- a/onprc_ehr/resources/schemas/onprc_ehr.xml +++ b/onprc_ehr/resources/schemas/onprc_ehr.xml @@ -1480,4 +1480,25 @@ + + + + + + + +
+ + + + + + + + + + +
+ + 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