Modified Pathology Misc Charges query

LabKey · Oct 31, 2024 · fe3f8a2 · fe3f8a2
1 parent d63a925
commit fe3f8a2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/onprc_ehr/resources/queries/study/NecropsyToMiscCharges.sql b/onprc_ehr/resources/queries/study/NecropsyToMiscCharges.sql
@@ -24,7 +24,8 @@ FROM  study.encounters b
 Left join (
     Select a.Id, a.date, a.project, a.chargeId, a.quantity, a.unitCost, a.chargecategory, a.QCState, a.taskid
          from  onprc_billing.miscCharges a
-         Where a.chargeid.rowid in (4484,4485,4486,4487,4488,4489,5283, 4516,5296,5297,5298)
+         Where a.chargeid.rowid in (select  j.rowid from onprc_billing_public.chargeableItems j where j.category = 'Pathology'
+                                      And j.active = true)
    group by a.Id, a.date, a.project, a.chargeId, a.quantity, a.unitCost, a.chargecategory, a.QCState, a.taskid
 
 ) r1 on (r1.id = b.id )

diff --git a/onprc_ehr/resources/web/onprc_ehr/model/sources/BiopsyNotes.js b/onprc_ehr/resources/web/onprc_ehr/model/sources/BiopsyNotes.js
@@ -18,6 +18,14 @@ EHR.model.DataModelManager.registerMetadata('Biopsy_Notes', {
             project: {
                 xtype: 'onprc_ehr-projectentryfield'
             },
+             filename: {
+                 hidden: false,
+                 shownInGrid: true,
+                 label: 'Pdf File',
+                 columnConfig: {
+                         width: 200
+                     }
+                },
             remark: {
                 defaultValue: 'CLINICAL HISTORY: \n\n\nGROSS DESCRIPTION: \n\n\nHISTOLOGIC DIAGNOSIS: \n\n\nCOMMENTS: \n\n\n',
                 hidden: false