From b5c5eb130ca0848124f9d136af4be142ad5aac07 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 14:42:02 +0800
Subject: [PATCH] backup0626

---
 force-app/main/default/classes/LexConsumableAccountController.cls |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/force-app/main/default/classes/LexConsumableAccountController.cls b/force-app/main/default/classes/LexConsumableAccountController.cls
index b8dde25..21d519d 100644
--- a/force-app/main/default/classes/LexConsumableAccountController.cls
+++ b/force-app/main/default/classes/LexConsumableAccountController.cls
@@ -168,9 +168,9 @@
             List<String> accountList = new List<String>();
             for (AggregateResult ar : arList) {
                 System.debug('thisAmount = ' + String.valueOf(ar.get('thisAmount')));
-                if (String.valueOf(ar.get('thisAmount')) != '0.0') {
+                if(String.valueOf(ar.get('thisAmount')) != '0.0'){
                     accountList.add(String.valueOf(ar.get('hospitalName')));
-                    topInfo.deList.add(Decimal.valueOf(String.valueOf(ar.get('thisAmount'))));
+                    topInfo.deList.add(Decimal.valueOf(String.valueOf(ar.get('thisAmount'))));  
                 }
             }
 
@@ -249,21 +249,21 @@
 
             if (fiscalYear == 'thisYear') {
                 AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(thisDatetime, nextDatetime);
-                if (saleAmountList[0].get('saleAmount') != null) {
+                if(saleAmountList[0].get('saleAmount') != null){
                     topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
                     System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
                 }
                 arList = LexConsumableAccountSOQL.getAccountBySales(thisDatetime, nextDatetime);
             } else if (fiscalYear == 'lastYear') {
                 AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(lastDatetime, thisDatetime2);
-                if (saleAmountList[0].get('saleAmount') != null) {
+                if(saleAmountList[0].get('saleAmount') != null){
                     topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
                     System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
                 }
                 arList = LexConsumableAccountSOQL.getAccountBySales(lastDatetime, thisDatetime2);
             } else {
                 AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(lastDatetime, nextDatetime);
-                if (saleAmountList[0].get('saleAmount') != null) {
+                if(saleAmountList[0].get('saleAmount') != null){
                     topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
                     System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
                 }
@@ -273,10 +273,11 @@
             List<String> accountList = new List<String>();
             for (AggregateResult ar : arList) {
                 System.debug('thisAmount = ' + String.valueOf(ar.get('thisAmount')));
-                if (String.valueOf(ar.get('thisAmount')) != '0.0') {
+                if(String.valueOf(ar.get('thisAmount')) != '0.0'){
                     accountList.add(String.valueOf(ar.get('hospitalName')));
                     topInfo.deList.add(Decimal.valueOf(String.valueOf(ar.get('thisAmount'))));
                 }
+                
             }
             System.debug('accountList = ' + accountList);
             System.debug('topInfo = ' + topInfo);

--
Gitblit v1.9.1