diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
index 937852d..67d7a0e 100644
--- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
+++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
@@ -2675,6 +2675,8 @@
 
                     //暫時先執行到這--->取kwhkwp
 
+                    var nowDisplayIrrDay = 0;
+
                     if (val.length != 0) {
                         if (groupType != 6) {
 
@@ -2686,13 +2688,19 @@
                                 kwhkwp = (ALLkwhkwp / times).toFixed(2);
                                 times++;
                             }
+                            if (groupType == 0) {
+                                nowDisplayIrrDay = val.irrDayHour.toFixed(2);
+                            }
+                            else {
+                                nowDisplayIrrDay = val.irradiance.toFixed(2);
+                            }
                            // console.log(val);
                             diffSOLARHOURALL = val.solarhour;
                             $('#HistoryDetailTable').append('<tr>' +
                                 '<td>' + val.timestamp + '</td>' +
                                 '<td>' + (toThousands(val.kwh.toFixed(2))) + '</td>' +
                                 '<td>' + (toThousands(val.kwhkwp.toFixed(2))) + '</td>' +
-                                '<td>' + (toThousands(val.irrDayHour.toFixed(2))) + '</td>' + //irrDay
+                                '<td>' + (toThousands(nowDisplayIrrDay)) + '</td>' + //irrDay
                                 //'<td>' + val.irradiance.toFixed(2) + '</td>' +
                                 '<td>' + (toThousands(val.pr.toFixed(2))) + '</td>' +
                                 '<td>' + (toThousands(val.temp.toFixed(2))) + '</td>' +
@@ -2701,7 +2709,8 @@
                             listkwh.push(parseFloat(val.kwh.toFixed(2)));
                             listcolor.push(color);
                             listcolor2.push(color2);
-                            listirradiance.push(parseFloat(val.irradiance.toFixed(2)));
+                            //listirradiance.push(parseFloat(val.irradiance.toFixed(2)));
+                            listirradiance.push(parseFloat(nowDisplayIrrDay));
                             listtemperature.push(parseFloat(val.temp.toFixed(2)));
                             listsolarhour.push(parseFloat(val.solarhour.toFixed(2)));
                             listpr.push(parseFloat(val.pr.toFixed(2)));
@@ -2731,7 +2740,8 @@
                             listkwh.push(parseFloat(val.kwh.toFixed(2)));
                             listcolor.push(color);
                             listcolor2.push(color2);
-                            listirradiance.push(parseFloat(val.irradiance.toFixed(2)));
+                            //listirradiance.push(parseFloat(val.irradiance.toFixed(2)));
+                            listirradiance.push(parseFloat(nowDisplayIrrDay));
                             listtemperature.push(parseFloat(val.temp.toFixed(2)));
                             listsolarhour.push(parseFloat(val.solarhour.toFixed(2)));
                             listpr.push(parseFloat(val.pr.toFixed(2)));