23.11 fb physical exam reports (#1014)

* Modified PE Exam with new set of requirements to report. * Modified PE Exam with new set of requirements to report. * Modified PE Exam with new sets of requirements to report. * Modified PE Exam with new sets of requirements to report. * Modified PE Exam with new sets of requirements to report. * Modified Environmental Assessment reporting program specifically designed for Kati's editing process * Modified PE Exam by categories with modified reporting changes requested by Mimi. * Modified PE Exam by categories with modified reporting changes requested by Mimi. * Modified PE Exam by categories with modified reporting changes requested by Mimi. * Modified the age computation for the next PE Exam review date.
LabKey · May 16, 2024 · fea076e · fea076e
1 parent 999cece
commit fea076e
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 1 deletion.
diff --git a/onprc_ehr/resources/queries/study/ExamVetPE.query.xml b/onprc_ehr/resources/queries/study/ExamVetPE.query.xml
@@ -28,6 +28,16 @@
                     <column columnName="p2">
                         <columnTitle>Most Recent P2</columnTitle>
                     </column>
+
+                    <column columnName="CBC">
+                        <columnTitle>CBC</columnTitle>
+                    </column>
+                    <column columnName="Chemistry">
+                        <columnTitle>Biochemistry Panel</columnTitle>
+                    </column>
+                    <column columnName="FOB">
+                        <columnTitle>FOB</columnTitle>
+                    </column>
                 </columns>
             </table>
         </tables>

diff --git a/onprc_ehr/resources/queries/study/ExamVetPE.sql b/onprc_ehr/resources/queries/study/ExamVetPE.sql
@@ -22,6 +22,34 @@ COALESCE(CASE
   WHEN d.id.age.AgeInYears >= 18.0 THEN (180 - TIMESTAMPDIFF('SQL_TSI_DAY', max(e.date), now()))
   ELSE (365 - TIMESTAMPDIFF('SQL_TSI_DAY', max(e.date), now()))
 END, 0) as daysUntilNextExam,
+
+        CASE
+             WHEN d.id.age.AgeInYears < 2.0 THEN 'No'
+             WHEN d.id.age.AgeInYears > 0.0 AND d.id.age.AgeInYears < 6.0 THEN 'No'
+             WHEN d.id.age.AgeInYears >= 6.0  AND d.id.age.AgeInYears < 7.0  THEN 'Yes'
+             WHEN d.id.age.AgeInYears > 6.0  AND d.id.age.AgeInYears < 12.0  THEN 'No'
+             WHEN d.id.age.AgeInYears > 11.0  AND d.id.age.AgeInYears < 18.0  THEN 'Yes'
+             ELSE
+                  'Yes'
+             END  as CBC,
+         CASE
+             WHEN d.id.age.AgeInYears < 2.0 THEN 'No'
+             WHEN d.id.age.AgeInYears > 0.0 AND d.id.age.AgeInYears < 6.0 THEN 'No'
+             WHEN d.id.age.AgeInYears = 6.0 THEN 'BASIC'
+             WHEN d.id.age.AgeInYears > 6.0  AND d.id.age.AgeInYears < 12.0  THEN 'BASIC'
+             WHEN d.id.age.AgeInYears > 11.0  AND d.id.age.AgeInYears < 18.0  THEN 'BASIC'
+             ELSE
+                  'COMP'
+          END  as Chemistry,
+                 CASE
+             WHEN d.id.age.AgeInYears < 2.0 THEN 'No'
+             WHEN d.id.age.AgeInYears > 0.0 AND d.id.age.AgeInYears < 6.0 THEN 'No'
+             WHEN d.id.age.AgeInYears = 6.0 THEN 'No'
+             WHEN d.id.age.AgeInYears > 6.0  AND d.id.age.AgeInYears < 12.0  THEN 'No'
+             WHEN d.id.age.AgeInYears > 11.0  AND d.id.age.AgeInYears < 18.0  THEN 'No'
+             ELSE
+                  'Yes'
+          END  as FOB,
 count(e.lsid) as totalExams,
 CASE
   WHEN count(f.Id) = 0 THEN null

diff --git a/onprc_ehr/resources/queries/study/ExamVetPE/.qview.xml b/onprc_ehr/resources/queries/study/ExamVetPE/.qview.xml
@@ -19,6 +19,7 @@
         <column name="Id/dataset/demographics/species"/>
         <column name="Id/dataset/demographics/gender"/>
         <column name="Id/utilization/use"/>
+        <column name="id/assignedVet/assignedVet"/>
         <column name="AgeInYears"/>
         <column name="Id/MostRecentWeight/MostRecentWeight">
             <properties>
@@ -33,11 +34,13 @@
         <column name="lastdate"/>
         <column name="daysUntilNextExam"/>
         <column name="Id/labworkHistory/lastHematologyDate"/>
+        <column name="CBC"/>
         <column name="Id/labworkHistory/lastBiochemistryDate"/>
+        <column name="Chemistry"/>
+        <column name="FOB"/>
         <column name="Id/currentCondition/condition"/>
         <column name="p2date"/>
         <column name="p2"/>
-        <column name="id/assignedVet/assignedVet"/>
         <column name="Id/activeFlags/Alert::valueField"/>
         <column name="Id/MostRecentTB/MonthsSinceLastTB"/>
         <column name="Id/activeNotes/Notes Pertaining to DAR::valueField"/>