diff --git a/custom_components/JackeryHome/sensor.py b/custom_components/JackeryHome/sensor.py
index 09b991a..8d27c7e 100644
--- a/custom_components/JackeryHome/sensor.py
+++ b/custom_components/JackeryHome/sensor.py
@@ -471,9 +471,9 @@ class JackeryHomeSensor(SensorEntity):
             return meter_value if meter_value > 0 else 0
         # # 电池功率：同一个 meter_sn，同步更新 battery_charge_power / battery_discharge_power
         elif self._sensor_id == "battery_charge_power":
-            return abs(meter_value) if meter_value < 0 else 0
+            return (meter_value) if meter_value > 0 else 0
         elif self._sensor_id == "battery_discharge_power":
-            return meter_value if meter_value > 0 else 0
+            return abs(meter_value) if meter_value < 0 else 0
         if self._sensor_id == "battery_soc":
             # Battery SOC 需要乘以 0.1 转换为百分比
             meter_value = meter_value * 0.1
diff --git a/energy_flow_card_config.yaml b/energy_flow_card_config.yaml
index 672c4c1..d6b5e84 100644
--- a/energy_flow_card_config.yaml
+++ b/energy_flow_card_config.yaml
@@ -3,18 +3,21 @@ entities:
   grid:
     entity:
       consumption: sensor.grid_import
-      production: sensor.grid_import
-    display_state: one_way
+      production: sensor.grid_export
+    display_state: two_way
     color_circle: true
   solar:
     entity: sensor.solar_power
   battery:
     entity:
-      consumption: sensor.battery_charge
-      production: sensor.battery_discharge
+      consumption: sensor.battery_discharge
+      production: sensor.battery_charge
     state_of_charge: sensor.battery_state_of_charge
-    display_state: one_way
+    display_state: two_way
     color_circle: true
+   
   home:
     color_icon: true
-watt_threshold: 10000
\ No newline at end of file
+  
+
+watt_threshold: 10000