diff --git a/onprc_billing/resources/etls/PublicInvoices.xml b/onprc_billing/resources/etls/PublicInvoices.xml
deleted file mode 100644
index 2a41bbbb3..000000000
--- a/onprc_billing/resources/etls/PublicInvoices.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
- publicInvoicedItems
- Copies Invoiced Items to Public Folder, access controlled by dataAccess
-
-
- Truncate and Populate InvoicedItems
-
-
-
-
-
-
-
-
diff --git a/onprc_ehr/resources/etls/UpdateEhrProtocols.xml b/onprc_ehr/resources/etls/UpdateEhrProtocols.xml
deleted file mode 100644
index 9ddf6dec9..000000000
--- a/onprc_ehr/resources/etls/UpdateEhrProtocols.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-
-
-
-
- Update Protocols in EHR
-
- Runs stored procedures to update the protocol table in schema ehr.
-
-
-
-
- Determines and populates BaseProtocol and RevisionNumber data for the protocol table in schema onprc_ehr.
-
-
-
-
-
- Adds enddate data to the protocol table in ehr.
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/onprc_ehr/resources/etls/mfshtoRandalData_2024.xml b/onprc_ehr/resources/etls/mfshtoRandalData_2024.xml
deleted file mode 100644
index 5bc8a444e..000000000
--- a/onprc_ehr/resources/etls/mfshtoRandalData_2024.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-
- mfshToRandalData_2024
- imports the data from mfsh animal details on ONPRC
-
-
- Define Hansen Study Animals 2022
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share Project
-
-
-
-
- Export Query to File Share Protocols
-
-
-
-
- Export Query to File Share
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/onprc_ehr/resources/etls/mfshtoRandalData_2024_01.xml b/onprc_ehr/resources/etls/mfshtoRandalData_2024_01.xml
deleted file mode 100644
index 27c3886ac..000000000
--- a/onprc_ehr/resources/etls/mfshtoRandalData_2024_01.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
- mfshToRandalData_2024
- imports the data from mfsh animal details on ONPRC
-
-
- Define Hansen Study Animals 2022
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share
-
-
-
-
- Export Query to File Share Project
-
-
-
-
- Export Query to File Share Protocols
-
-
-
-
- Export Query to File Share
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/onprc_ehr/resources/etls/ogaAliasCleanup2020.xml b/onprc_ehr/resources/etls/ogaAliasCleanup2020.xml
deleted file mode 100644
index efccb1e45..000000000
--- a/onprc_ehr/resources/etls/ogaAliasCleanup2020.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
- ogaAliasCleanUp2020
-
- Code to enddate or remove Aliases not Assocatied with ONPRC
-
-
-
-
- Code to enddate or remove Aliases not Assocatied with ONPRC.
-
-
-
-
-
-
-
-
-
-
-
diff --git a/onprc_ehr/resources/queries/onprc_ehr/BillingDiscrepancyforR_L.sql b/onprc_ehr/resources/queries/onprc_ehr/BillingDiscrepancyforR_L.sql
new file mode 100644
index 000000000..dcdc8413e
--- /dev/null
+++ b/onprc_ehr/resources/queries/onprc_ehr/BillingDiscrepancyforR_L.sql
@@ -0,0 +1,115 @@
+/*
+=====================================================================
+ Query Name : GJ_BillingDiscrepanciesRL
+ Schema : onprc_ehr
+ Purpose : Identify procedure charges where the billed project
+ does not match the animal’s current project and
+ highlight animals with dual active assignments.
+ Issue / Ticket : EHR Issue 11870
+ Author : jonesga
+ Last Modified : 2026-07-15
+update" Deploying to Test F for review
+=====================================================================
+*/
+
+WITH ProcedureFees AS (
+ SELECT
+ pfr.id,
+ pfr.date,
+ pfr.project.displayName AS ProjectBilledTo,
+ pfr.project AS billedProjectObj,
+ pfr.chargeType,
+ pfr.procedureId,
+ pfr.chargeId,
+ pfr.unitCost,
+ pfr.matchesProject,
+ pfr.taskId
+ FROM onprc_billing.procedureFeeRates pfr
+)
+,
+/*-------------------------------------------------------------------
+ Active assignment context
+-------------------------------------------------------------------*/
+ ActiveAssignments AS (
+ SELECT
+ a.Id,
+ a.project,
+ a.project.displayName AS ProjectName
+ FROM study.assignment a
+ WHERE
+ (a.enddate IS NULL OR a.enddate >= CURDATE())
+ AND a.date = (
+ SELECT MAX(a2.date)
+ FROM study.assignment a2
+ WHERE a2.Id = a.Id
+ AND (a2.enddate IS NULL OR a2.enddate >= CURDATE())
+ )
+ ),
+
+ AssignmentCounts AS (
+ SELECT
+ Id,
+ COUNT(DISTINCT project) AS AssignmentCount
+ FROM ActiveAssignments
+ GROUP BY Id
+ ),
+
+ AnimalAssignmentStatus AS (
+ SELECT
+ aa.Id,
+ aa.ProjectName AS CurrentProject,
+ ac.AssignmentCount,
+ CASE
+ WHEN ac.AssignmentCount > 1 THEN true
+ ELSE false
+ END AS IsDualAssigned
+ FROM ActiveAssignments aa
+ LEFT JOIN AssignmentCounts ac
+ ON aa.Id = ac.Id
+ )
+
+/*-------------------------------------------------------------------
+ Final result
+-------------------------------------------------------------------*/
+SELECT
+ pf.id,
+ pf.date,
+
+ pf.ProjectBilledTo,
+ aas.CurrentProject,
+
+
+
+ CASE
+ WHEN pf.ProjectBilledTo = aas.CurrentProject
+ OR aas.CurrentProject IS NULL
+ THEN 'Billing is Correct'
+ ELSE 'Billing Needs Review'
+ END AS ChargeReview,
+
+ /* CASE
+ WHEN aas.IsDualAssigned = true
+ THEN 'Dual Assigned'
+ ELSE 'Single Assignment'
+ END AS AssignmentStatus,*/
+
+
+ pf.chargeType,
+ pf.procedureId,
+ pf.chargeId,
+ pf.unitCost,
+ pf.matchesProject,
+ pf.taskId
+
+FROM ProcedureFees pf
+ LEFT JOIN AnimalAssignmentStatus aas
+ ON pf.id = aas.Id
+
+WHERE
+ pf.ProjectBilledTo NOT LIKE '0492'
+ --or
+ --AND aas.IsDualAssigned = true)
+
+ORDER BY
+ pf.date DESC,
+ pf.id;
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/BillingDiscrepancyforR_L.xml b/onprc_ehr/resources/queries/onprc_ehr/BillingDiscrepancyforR_L.xml
new file mode 100644
index 000000000..b44051b69
--- /dev/null
+++ b/onprc_ehr/resources/queries/onprc_ehr/BillingDiscrepancyforR_L.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+ DaysBack
+
+ int
+ true
+ 1
+
+ Number of prior days to include in the review window.
+ Valid values are 1 through 30.
+
+
+
+
+
+
+
+
+
+
+ ProjectBilledTo
+
+
+ The project to which the procedure charge was billed.
+
+
+
+
+ CurrentProject
+
+
+ The animal’s current active project at the time of review.
+
+
+
+
+
+ ChargeReview
+
+
+
+
+
+
+ equals
+ Billing is Correct
+ #2E7D32
+ #FFD700
+
+
+
+
+ equals
+ Billing Needs Review
+ #C62828
+ #FFFFFF
+ bold
+
+
+
+
+
+
+
+
+
+ unitCost
+
+ $#,##0.00
+
+
+
+
+
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_AnimalGroups.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_AnimalGroups.sql
deleted file mode 100644
index 2cb31df62..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_AnimalGroups.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-SELECT d.Id,
- d.date,
- d.enddate,
- d.groupId,
- d.releaseType,
- d.qcstate,
- d.remark,
- d.performedby,
- d.taskid,
- d.requestid,
- d.description,
- d.Container,
- d.isActive,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.animal_group_members d
-
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Arrival.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Arrival.sql
deleted file mode 100644
index 976abd186..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Arrival.sql
+++ /dev/null
@@ -1,31 +0,0 @@
-SELECT d.Id,
- d.date,
- d.source,
- d.acquisitionType,
- d.rearingType,
- d.gender,
- d.species,
- d.geographic_origin,
- d.dam,
- d.sire,
- d.birth,
- d.estimated,
- d.originalId,
- d.arrivalId,
- d.cites,
- d.customsDate,
- d.remark,
- d.description,
- d.taskid,
- d.project,
- d.performedby,
- d.requestid,
- d.Container,
- d.isNumericId,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.arrival d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Assignment.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Assignment.sql
deleted file mode 100644
index 52e718045..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Assignment.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-SELECT d.Id,
- d.project,
- d.date,
- d.projectedRelease,
- d.enddate,
- d.assignmentType,
- d.assignCondition,
- d.projectedReleaseCondition,
- d.releaseCondition,
- d.releaseType,
- d.remark,
- d.description,
- d.taskid,
- d.requestid,
- d.Container,
- d.isActive,
- d.history,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.assignment d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Birth.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Birth.sql
deleted file mode 100644
index 08f553fb1..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Birth.sql
+++ /dev/null
@@ -1,32 +0,0 @@
-SELECT d.Id,
- d.date,
- d.date_type,
- d.birth_condition,
- d.room,
- d.cage,
- d.dam,
- d.gender,
- d.teeth,
- d.weight,
- d.wdate,
- d.type,
- d.species,
- d.geographic_origin,
- d.sire,
- d.conception,
- d.conceptualDay,
- d.remark,
- d.description,
- d.taskid,
- d.project,
- d.performedby,
- d.requestid,
- d.Container,
- d.isNumericId,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.birth d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Blood.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Blood.sql
deleted file mode 100644
index d07bef74c..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Blood.sql
+++ /dev/null
@@ -1,26 +0,0 @@
-SELECT d.Id,
- d.date,
- d.project,
- d.chargetype,
- d.reason,
- d.tube_type,
- d.tube_vol,
- d.num_tubes,
- d.quantity,
- d.additionalServices,
- d.instructions,
- d.sampletype,
- d.performedby,
- d.remark,
- d.description,
- d.requestid,
- d.taskid,
- d.Container,
- d.countsAgainstVolume,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.blood d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Cases.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Cases.sql
deleted file mode 100644
index f52664537..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Cases.sql
+++ /dev/null
@@ -1,38 +0,0 @@
-SELECT d.Id,
- d.date,
- d.reviewdate,
- d.category,
- d.remark,
- d.taskid,
- d.requestid,
- d.description,
- d.performedby,
- d.enddate,
- d.assignedvet,
- d.Container,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.latestHx,
- d.mostRecentP2,
- d.mostRecentRemark,
- d.mostRecentCeg_Plan,
- d.todaysP2,
- d.yesterdaysP2,
- d.todaysRemarks,
- d.assessmentOnOpenDate,
- d.proceduresPerformed,
- d.surgeryfollowupDays,
- d.caseHistory,
- d.problemCategories,
- d.allProblemCategories,
- d.isActive,
- d.isOpen,
- d.lastVetReview,
- d.daysSinceLastVetReview,
- d.lastRoundsObs,
- d.daysSinceLastRounds,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.cases d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Flags.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Flags.sql
deleted file mode 100644
index be4baa7d1..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Flags.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-SELECT d.Id,
- d.date,
- d.enddate,
- d.flag,
- d.performedby,
- d.remark,
- d.taskid,
- d.requestid,
- d.description,
- d.RequestedBy,
- d.ScheduleNecropsy,
- d.TargetEndDate,
- d.Container,
- d.isActive,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.flags d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Hematology.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Hematology.sql
deleted file mode 100644
index a445e49ba..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Hematology.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-SELECT d.Id,
- d.date,
- d.testid,
- d.result,
- d.resultOORIndicator,
- d.units,
- d.qualresult,
- d.method,
- d.runid,
- d.resultNumber,
- d.resultInRange,
- d.remark,
- d.description,
- d.taskid,
- d.performedby,
- d.requestid,
- d.Container,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.hematologyResults d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Housing.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Housing.sql
deleted file mode 100644
index 3adbbb750..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Housing.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-SELECT
-d.Id,
-d.date,
-d.enddate,
-d.room,
-d.cage,
-d.divider,
-d.reason,
-d.QCState,
-d.remark,
-d.description,
-d.taskid,
-d.performedby,
-d.requestid,
-d.Container,
-d.isActive,
-d.isExpired,
-d.history,
-d.isAssignedAtTime,
-d.isAssignedToProtocolAtTime,
-d.daysInRoom,
-d.daysInArea,
-d.enteredSinceVetReview
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.housing d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Notes.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Notes.sql
deleted file mode 100644
index fa59c9166..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Notes.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-SELECT d.Id,
- d.date,
- d.actiondate,
- d.enddate,
- d.category,
- d.value,
- d.performedby,
- d.description,
- d.taskid,
- d.remark,
- d.requestid,
- d.Container,
- d.isActive,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.notes d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_Weights.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_Weights.sql
deleted file mode 100644
index dd26c03eb..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_Weights.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-SELECT d.Id,
- d.date,
- d.weight,
- d.remark,
- d.description,
- d.taskid,
- d.project,
- d.performedby,
- d.requestid,
- d.Container,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.weight d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_clinremarks.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_clinremarks.sql
deleted file mode 100644
index cd4b8836f..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_clinremarks.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-SELECT d.Id,
- d.project,
- d.date,
- d.hx,
- d.s,
- d.o,
- d.a,
- d.p,
- d.p2,
- d.remark,
- d.performedby,
- d.description,
- d.taskid,
- d.requestid,
- d.CEG_Plan,
- d.assignedVet,
- d.Container,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.clinRemarks d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_deaths.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_deaths.sql
deleted file mode 100644
index 8231a104b..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_deaths.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-SELECT
-d.Id,
-d.date,
-d.cause,
-d.necropsy,
-d.remark,
-d.cageattime,
-d.dam,
-d.performedby,
-d.roomattime,
-d.notAtCenter,
-d.description,
-d.taskid,
-d.project,
-d.requestid,
-d.Container,
-d.history,
-d.isAssignedAtTime,
-d.isAssignedToProtocolAtTime,
-d.enteredSinceVetReview,
-d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.deaths d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_demographics.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_demographics.sql
deleted file mode 100644
index 95ccf63ae..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_demographics.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-SELECT --s.id,
---s.Rh,
-d.Id,
-d.gender,
-d.species,
-d.geographic_origin,
-d.birth,
-d.death,
-d.calculated_status,
-
-d.taskid,
-d.performedby,
-d.requestid,
-d.Container,
-d.lastDayAtCenter,
-d.history,
-d.lastVetReview,
-s.Cohort,
-s.PI,
-s.Cohort_id,
-s.subcohort,
-s.grp
-
-FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.demographics d
-where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_departure.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_departure.sql
deleted file mode 100644
index ef49817d9..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_departure.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-SELECT
-d.Id,
-d.date,
-d.authorize,
-d.destination,
-d.remark,
-d.description,
-d.taskid,
-d.project,
-d.performedby,
-d.requestid,
-d.Container,
-d.history,
-d.isAssignedAtTime,
-d.isAssignedToProtocolAtTime,
-d.enteredSinceVetReview,
-d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.departure d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandData_drug.sql b/onprc_ehr/resources/queries/onprc_ehr/RandData_drug.sql
deleted file mode 100644
index fd30c0955..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandData_drug.sql
+++ /dev/null
@@ -1,35 +0,0 @@
-SELECT d.Id,
- d.date,
- d.enddate,
- d.project,
- d.chargetype,
- d.code,
- d.Billable,
- d.qualifier,
- d.reason,
- d.route,
- d.concentration,
- d.conc_units,
- d.dosage,
- d.dosage_units,
- d.volume,
- d.vol_units,
- d.amount,
- d.amount_units,
- d.outcome,
- d.lot,
- d.remark,
- d.category,
- d.begindate,
- d.description,
- d.taskid,
- d.performedby,
- d.requestid,
- d.Container,
- d.history,
- d.isAssignedAtTime,
- d.isAssignedToProtocolAtTime,
- d.enteredSinceVetReview,
- d.QCState
- FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.study.drug d
- where (active = 'y' and s.rh = d.id)
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/RandalData_MHCData.sql b/onprc_ehr/resources/queries/onprc_ehr/RandalData_MHCData.sql
deleted file mode 100644
index b7ee4d78e..000000000
--- a/onprc_ehr/resources/queries/onprc_ehr/RandalData_MHCData.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-
-SELECT d.rowid,
- d.subjectId,
- d.datatype,
- d.marker,
- d.result,
- d.score,
- d.assaytype,
- d.container,
- d.totalTests
-
-FROM StudyDetails_RandalData s, Site.{substitutePath moduleProperty('EHR','EHRStudyContainer')}.MHC_Data.MHC_Data_Unified d
-where (active = 'y' and Cast(s.rh as varchar(25)) = Cast(d.id as varchar(25)))
\ No newline at end of file
diff --git a/onprc_ehr/resources/queries/onprc_ehr/gdj_BillingDiscrepancyforR_L.xml b/onprc_ehr/resources/queries/onprc_ehr/gdj_BillingDiscrepancyforR_L.xml
new file mode 100644
index 000000000..5ca9bae50
--- /dev/null
+++ b/onprc_ehr/resources/queries/onprc_ehr/gdj_BillingDiscrepancyforR_L.xml
@@ -0,0 +1,124 @@
+
+
+
+
+
+
+
+ DaysBack
+
+ int
+ true
+ 1
+
+ Number of prior days to include in the review window.
+ Valid values are 1 through 30.
+ Example: 7 = review the last 7 days.
+
+
+
+
+
+
+
+
+
+ ProjectBilledTo
+
+
+ The project to which the procedure charge will be billed.
+
+
+
+
+ CurrentProject
+
+
+ The animal’s current active project at the time of review.
+
+
+
+
+ ChargeReview
+
+
+ Indicates whether the billed project matches the animal’s
+ current project. Records marked with a red X require review.
+
+
+
+
+ DaysBackUsed
+
+
+ The actual number of days included in this run after
+ validation and bounds enforcement.
+
+
+
+
+ unitCost
+
+ $#,##0.00
+
+
+
+
+
+
+
+
+
+ ChargeReview
+ equals
+ ❌ Billing Needs Review
+ #F8D7DA
+ #721C24
+
+
+
+ ChargeReview
+ equals
+ ✅ Billing is Correct
+ #D4EDDA
+ #155724
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/onprc_ehr/resources/schemas/dbscripts/rl_financeData.template.xml b/onprc_ehr/resources/schemas/dbscripts/rl_financeData.template.xml
new file mode 100644
index 000000000..91af220bc
--- /dev/null
+++ b/onprc_ehr/resources/schemas/dbscripts/rl_financeData.template.xml
@@ -0,0 +1,17 @@
+
+
+
+ investigators
+ procedureFeeRates
+
+
+
+
+
+
+
+
+
\ No newline at end of file