From 7a864230683e0eada80aa98a985d254941cb352b Mon Sep 17 00:00:00 2001
From: "13621160019@163.com" <13621160019@163.com>
Date: Tue, 23 Mar 2021 16:01:44 +0800
Subject: [PATCH] fixed NoneType error in CombinedEquipmentLoad report in API

---
 myems-api/reports/combinedequipmentload.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/myems-api/reports/combinedequipmentload.py b/myems-api/reports/combinedequipmentload.py
index 0751dc6e..58be6f08 100644
--- a/myems-api/reports/combinedequipmentload.py
+++ b/myems-api/reports/combinedequipmentload.py
@@ -507,19 +507,22 @@ class Reporting:
                 result['reporting_period']['averages'].append(reporting[energy_category_id]['average'])
                 result['reporting_period']['averages_increment_rate'].append(
                     (reporting[energy_category_id]['average'] - base[energy_category_id]['average']) /
-                    base[energy_category_id]['average'] if (base[energy_category_id]['average'] is not None and
+                    base[energy_category_id]['average'] if (reporting[energy_category_id]['average'] is not None and
+                                                            base[energy_category_id]['average'] is not None and
                                                             base[energy_category_id]['average'] > Decimal(0.0))
                     else None)
                 result['reporting_period']['maximums'].append(reporting[energy_category_id]['maximum'])
                 result['reporting_period']['maximums_increment_rate'].append(
                     (reporting[energy_category_id]['maximum'] - base[energy_category_id]['maximum']) /
-                    base[energy_category_id]['maximum'] if (base[energy_category_id]['maximum'] is not None and
+                    base[energy_category_id]['maximum'] if (reporting[energy_category_id]['maximum'] is not None and
+                                                            base[energy_category_id]['maximum'] is not None and
                                                             base[energy_category_id]['maximum'] > Decimal(0.0))
                     else None)
                 result['reporting_period']['factors'].append(reporting[energy_category_id]['factor'])
                 result['reporting_period']['factors_increment_rate'].append(
                     (reporting[energy_category_id]['factor'] - base[energy_category_id]['factor']) /
-                    base[energy_category_id]['factor'] if (base[energy_category_id]['factor'] is not None and
+                    base[energy_category_id]['factor'] if (reporting[energy_category_id]['factor'] is not None and
+                                                           base[energy_category_id]['factor'] is not None and
                                                            base[energy_category_id]['factor'] > Decimal(0.0))
                     else None)