diff --git a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs
index d8539f22..85b8475c 100644
--- a/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs	
+++ b/SGGL/BLL/PHTGL/ContractCompile/PhtglContracttrackService .cs	
@@ -1107,17 +1107,11 @@ namespace BLL
                                     }
                                     for (int i = 0; i < workPostIds.Count; i++)
                                     {
-                                        var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
+                                        var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
                                         if (workEfficiencyList.Count() > 0)
                                         {
                                             decimal d = 0;
-                                            foreach (var workEfficiency in workEfficiencyList)
-                                            {
-                                                if (workEfficiency.ConsumeHours != null)
-                                                {
-                                                    d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
-                                                }
-                                            }
+                                            d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
                                             if (d > 0)
                                             {
                                                 row[12 + i * 2] = decimal.Round(d, 2);
@@ -1130,17 +1124,11 @@ namespace BLL
                                     }
                                     for (int i = 0; i < machineIds.Count; i++)
                                     {
-                                        var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id);
+                                        var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
                                         if (workEfficiencyList.Count() > 0)
                                         {
                                             decimal d = 0;
-                                            foreach (var workEfficiency in workEfficiencyList)
-                                            {
-                                                if (workEfficiency.ConsumeHours != null)
-                                                {
-                                                    d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
-                                                }
-                                            }
+                                            d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
                                             if (d > 0)
                                             {
                                                 row[52 + i * 2] = decimal.Round(d, 2);
@@ -1192,17 +1180,11 @@ namespace BLL
                                         }
                                         for (int i = 0; i < workPostIds.Count; i++)
                                         {
-                                            var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id);
+                                            var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Person" && x.TypeId == workPostIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
                                             if (workEfficiencyList.Count() > 0)
                                             {
                                                 decimal d = 0;
-                                                foreach (var workEfficiency in workEfficiencyList)
-                                                {
-                                                    if (workEfficiency.ConsumeHours != null)
-                                                    {
-                                                        d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
-                                                    }
-                                                }
+                                                d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
                                                 if (d > 0)
                                                 {
                                                     row[12 + i * 2] = decimal.Round(d, 2);
@@ -1215,17 +1197,11 @@ namespace BLL
                                         }
                                         for (int i = 0; i < machineIds.Count; i++)
                                         {
-                                            var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id);
+                                            var workEfficiencyList = workEfficiencys.Where(x => x.Type == "Machine" && x.TypeId == machineIds[i] && x.ContractTrackId == item.Id && x.ConsumeHours != null);
                                             if (workEfficiencyList.Count() > 0)
                                             {
                                                 decimal d = 0;
-                                                foreach (var workEfficiency in workEfficiencyList)
-                                                {
-                                                    if (workEfficiency.ConsumeHours != null)
-                                                    {
-                                                        d += decimal.Round(Convert.ToDecimal(workEfficiency.ConsumeHours), 2);
-                                                    }
-                                                }
+                                                d = workEfficiencyList.Sum(x => x.ConsumeHours ?? 0);
                                                 if (d > 0)
                                                 {
                                                     row[52 + i * 2] = decimal.Round(d, 2);
diff --git a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
index 6845bf99..beee0f15 100644
--- a/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
+++ b/SGGL/FineUIPro.Web/PZHGL/InformationProject/ProjectConstructionLog.aspx.cs
@@ -303,25 +303,29 @@ namespace FineUIPro.Web.PZHGL.InformationProject
                 {
                     foreach (var personLog in personLogs)
                     {
-                        if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark))
+                        var projectUser = SitePerson_PersonService.GetSitePersonByProjectIdPersonId(this.CurrUser.LoginProjectId, personLog.CompileMan);
+                        if (projectUser != null && projectUser.WorkPostId != BLL.Const.WorkPost_ConstructionManager)
                         {
-                            Model.ConstructionLogHSE hse = new Model.ConstructionLogHSE();
-                            hse.ConstructionLogId = personLog.ConstructionLogId;
-                            hse.HSETodaySummary = personLog.HSETodaySummary;
-                            hse.HSETodaySummaryRemark = personLog.HSETodaySummaryRemark;
-                            hse.HSETomorrowPlan = personLog.HSETomorrowPlan;
-                            hse.HSETomorrowPlanRemark = personLog.HSETomorrowPlanRemark;
-                            hses.Add(hse);
-                        }
-                        if (!string.IsNullOrEmpty(personLog.CQMSTodaySummary) || !string.IsNullOrEmpty(personLog.CQMSTodaySummaryRemark) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlan) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlanRemark))
-                        {
-                            Model.ConstructionLogCQMS cqms = new Model.ConstructionLogCQMS();
-                            cqms.ConstructionLogId = personLog.ConstructionLogId;
-                            cqms.CQMSTodaySummary = personLog.CQMSTodaySummary;
-                            cqms.CQMSTodaySummaryRemark = personLog.CQMSTodaySummaryRemark;
-                            cqms.CQMSTomorrowPlan = personLog.CQMSTomorrowPlan;
-                            cqms.CQMSTomorrowPlanRemark = personLog.CQMSTomorrowPlanRemark;
-                            cqmss.Add(cqms);
+                            if (!string.IsNullOrEmpty(personLog.HSETodaySummary) || !string.IsNullOrEmpty(personLog.HSETodaySummaryRemark) || !string.IsNullOrEmpty(personLog.HSETomorrowPlan) || !string.IsNullOrEmpty(personLog.HSETomorrowPlanRemark))
+                            {
+                                Model.ConstructionLogHSE hse = new Model.ConstructionLogHSE();
+                                hse.ConstructionLogId = personLog.ConstructionLogId;
+                                hse.HSETodaySummary = personLog.HSETodaySummary;
+                                hse.HSETodaySummaryRemark = personLog.HSETodaySummaryRemark;
+                                hse.HSETomorrowPlan = personLog.HSETomorrowPlan;
+                                hse.HSETomorrowPlanRemark = personLog.HSETomorrowPlanRemark;
+                                hses.Add(hse);
+                            }
+                            if (!string.IsNullOrEmpty(personLog.CQMSTodaySummary) || !string.IsNullOrEmpty(personLog.CQMSTodaySummaryRemark) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlan) || !string.IsNullOrEmpty(personLog.CQMSTomorrowPlanRemark))
+                            {
+                                Model.ConstructionLogCQMS cqms = new Model.ConstructionLogCQMS();
+                                cqms.ConstructionLogId = personLog.ConstructionLogId;
+                                cqms.CQMSTodaySummary = personLog.CQMSTodaySummary;
+                                cqms.CQMSTodaySummaryRemark = personLog.CQMSTodaySummaryRemark;
+                                cqms.CQMSTomorrowPlan = personLog.CQMSTomorrowPlan;
+                                cqms.CQMSTomorrowPlanRemark = personLog.CQMSTomorrowPlanRemark;
+                                cqmss.Add(cqms);
+                            }
                         }
                     }
                     this.GridHSETodaySummary.DataSource = hses;