diff --git a/SolarPower/Controllers/OperationController.cs b/SolarPower/Controllers/OperationController.cs
index 33bc534..04caffd 100644
--- a/SolarPower/Controllers/OperationController.cs
+++ b/SolarPower/Controllers/OperationController.cs
@@ -643,7 +643,7 @@ namespace SolarPower.Controllers
                             OperationRecordPersonnel operationRecordPersonnel = new OperationRecordPersonnel();
                             operationRecordPersonnel.OperationRecordId = id;
                             operationRecordPersonnel.UserId = op;
-
+                            operationRecordPersonnel.CreatedBy = myUser.Id;
                             insertOperationRecordPersonnels.Add(operationRecordPersonnel);
                         }
 
@@ -651,6 +651,7 @@ namespace SolarPower.Controllers
                             {
                                 "OperationRecordId",
                                 "UserId",
+                                "CreatedBy"
                             };
 
                         await operationRepository.AddOperationRecordPersonnelAsync(insertOperationRecordPersonnels, operationRecordPersonnelProperties);
diff --git a/SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs b/SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs
index 5573c76..8865c1b 100644
--- a/SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs
+++ b/SolarPower/Repository/Implement/ElectricitySoldRecordRepository.cs
@@ -122,7 +122,7 @@ namespace SolarPower.Repository.Implement
 
                     var sql = @$"SELECT aa.StartAt,aa.EndAt,aa.Kwh actualkwh,aa.Money actualMoney,SUM(pd.TODAYKWH) realKWH,SUM(pd.MONEY) realMoney,ps.Estimate_kwh CBAkwh,ps.EstimateEfficacy CBAeff ,ps.GeneratingCapacity capacity ,ps.PowerRate rate
                                 FROM power_station_history_day pd 
-                                LEFT JOIN ( SELECT er.* FROM electricity_sold_record er WHERE {sqlwhere} AND er.Deleted = 0 ) aa
+                                LEFT JOIN ( SELECT er.* FROM electricity_sold_record er WHERE {sqlwhere} AND er.Deleted = 0 AND er.PowerstationId = {info.PowerstationId}) aa
                                 ON aa.PowerstationId = pd.PowerStationId
                                 LEFT JOIN power_station ps ON ps.Id = pd.PowerStationId
                                 WHERE pd.TIMESTAMP BETWEEN aa.StartAt AND aa.EndAt AND ps.Id = {info.PowerstationId} GROUP BY aa.Id";
diff --git a/SolarPower/Views/PowerStation/_UploadImage.cshtml b/SolarPower/Views/PowerStation/_UploadImage.cshtml
index 7c6a288..dd89116 100644
--- a/SolarPower/Views/PowerStation/_UploadImage.cshtml
+++ b/SolarPower/Views/PowerStation/_UploadImage.cshtml
@@ -41,7 +41,7 @@
             <div class="card-title font-weight-bold">單線圖</div>
             <div class="text-right">
                 <a href="javascript:;" class="btn btn-sm btn-success ml-auto waves-effect waves-themed"  id="upload-station-single-line">
-                    <span class="fal fa-plus mr-1"></span> 上傳圖片
+                    <span class="fal fa-plus mr-1"></span> 上傳檔案
                 </a>
             </div>
         </div>
diff --git a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
index 3b96580..feba4a5 100644
--- a/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
+++ b/SolarPower/Views/StationOverview/StationOverviewInfo.cshtml
@@ -319,7 +319,7 @@
                         labels: chartToday.labels,
                         datasets: [{
                             type: 'bar',
-                            label: '輸出功率',
+                            label: '發電量',
                             yAxisID: 'A',
                             backgroundColor: 'rgb(103, 180, 172)',
                             order: 3,
@@ -411,7 +411,7 @@
                         labels: chart7day.labels,
                         datasets: [{
                             type: 'bar',
-                            label: '輸出功率',
+                            label: '發電量',
                             yAxisID: 'A',
                             backgroundColor: 'rgb(103, 180, 172)',
                             order: 3,
@@ -503,7 +503,7 @@
                         labels: chartMonth.labels,
                         datasets: [{
                             type: 'bar',
-                            label: '輸出功率',
+                            label: '發電量',
                             yAxisID: 'A',
                             backgroundColor: 'rgb(103, 180, 172)',
                             order: 3,
@@ -595,7 +595,7 @@
                         labels: chartYear.labels,
                         datasets: [{
                             type: 'bar',
-                            label: '輸出功率',
+                            label: '發電量',
                             yAxisID: 'A',
                             backgroundColor: 'rgb(103, 180, 172)',
                             order: 2,
@@ -2010,7 +2010,7 @@
                     },
 
                     title: {
-                        text: '逆變器單日kWhkWp'
+                        text: '各逆變器當日有效日照時數'
                     },
                     xAxis: {
                         categories: HeatMap.xAxis,
diff --git a/SolarPower/Views/StationOverview/_Exception.cshtml b/SolarPower/Views/StationOverview/_Exception.cshtml
index be88d72..6fb7943 100644
--- a/SolarPower/Views/StationOverview/_Exception.cshtml
+++ b/SolarPower/Views/StationOverview/_Exception.cshtml
@@ -131,7 +131,7 @@
                     <div class="row mb-3">
                         <div class="col-lg-12">
                             <div class="form-group">
-                                <label class="form-label" for="notice_textarea_modal_exc">巡檢注意事項</label>
+                                <label class="form-label" for="notice_textarea_modal_exc">項目內容</label>
                                 <textarea class="form-control" id="notice_textarea_modal_exc" rows="5"></textarea>
                             </div>
                         </div>