Update pt-reports.yml

configs/reports/configs/pt-reports.yml

@@ -1120,7 +1120,7 @@ ReportDefinitions:
     label: reports.pt.count
     type: string
     source: pt
-    total: true    
+    total: true
   searchParams:
   - name: fromDate
     label: reports.pt.fromDate
@@ -1143,11 +1143,18 @@ ReportDefinitions:
     isMandatory: false
     searchClause: AND p.tenantId = $ulb
   query: |
-    select initcap(split_part(p.tenantId, '.', 2)) as tenantId, p.paymentmode ,sum(p.totalamountpaid), count(p.id)
-    FROM egcl_payment p, egcl_paymentdetail pd 
-    WHERE p.id=pd.paymentid  and pd.businessservice ='PT'
-  groupby: GROUP BY p.tenantid, p.paymentmode
-  orderby: ORDER BY p.tenantId asc
+    select initcap(split_part(p.tenantid, '.', 2)) as tenantID, p.paymentmode, sum(p.totalamountpaid), count(p.id)
+      FROM egcl_payment p, egcl_paymentdetail pd
+      WHERE p.id=pd.paymentid  and p.createdby in (select un.id::text from eg_user un where un.username in ('BBPS_ADMIN'))  
+            and pd.businessservice='PT' and p.tenantid != 'uk.testing'
+      groupby: GROUP BY p.tenantid, p.paymentmode
+    UNION ALL
+    select initcap(split_part(p.tenantid, '.', 2)) as tenantId, p.paymentmode, sum(p.totalamountpaid), count(p.id)
+      FROM egcl_payment p, egcl_paymentdetail pd
+      WHERE p.id=pd.paymentid and p.createdby in (select un.id::text from eg_user un where un.username not in ('BBPS_ADMIN'))
+            and pd.businessservice='PT' and p.tenantid != 'uk.testing'
+    groupby: GROUP BY p.tenantid, p.paymentmode
+
 
 - reportName: PTAdoptionReport
   summary: Number of applications