diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
index 005e0d0c..9e8af5f4 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/NCRStatisc.aspx.cs
@@ -107,7 +107,8 @@ namespace FineUIPro.Web.CQMS.ManageReport
                     NCRStatisc.CheckNum = managementList.Count();
                     //NCRStatisc.OKNum = managementList.Count(x => x.Status == "3");
                     //NCRStatisc.NotOKNum = managementList.Count(x => x.Status != "3");
-                    int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                    //int okNum = managementList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                    int okNum = managementList.Where(x => x.ImplementationFrontState == "已闭合").Count();
                     NCRStatisc.OKNum = okNum;
                     NCRStatisc.NotOKNum = managementList.Count() - okNum;
                     NCRStatisc.Remark = "";
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
index 58c8016d..9fe61a81 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReport/WeekReportEdit.aspx.cs
@@ -97,7 +97,7 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 {
 
                     //this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["startdate"];
-                   // this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
+                    // this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", Convert.ToDateTime(this.txtStartDate.Text).AddMonths(1).AddDays(-1)) : Request.Params["enddate"];
                     this.txtStartDate.Text = string.IsNullOrEmpty(Request.Params["startdate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now.AddDays(-6)) : Request.Params["startdate"];
                     this.txtEndDate.Text = string.IsNullOrEmpty(Request.Params["enddate"]) ? string.Format("{0:yyyy-MM-dd}", DateTime.Now) : Request.Params["enddate"];
                     //this.txtStartDate.Text = string.Format("{0:yyyy-MM-dd}", "2022-11-02 01:01:00");
@@ -929,8 +929,10 @@ namespace FineUIPro.Web.CQMS.ManageReport
                 NCRStatisc.WorkName = item.UnitName;
                 //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
                 //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
-                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
-                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
+                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
                 NCRStatisc.CheckNum = AllList.Count();
                 if (NCRStatisc.CheckNum != 0)//被除数不能为零
                 {
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
index d09f5e16..3c2105bc 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/MonthReportNewEdit.aspx.cs
@@ -133,7 +133,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     constructionProblemsLists = (from x in Funs.DB.Report_ConstructionProblems
                                                  where x.ReportId == this.ReportId
                                                  select x).ToList();
-                    if (constructionProblemsLists.Count>0)
+                    if (constructionProblemsLists.Count > 0)
                     {
                         gvConstructionProblems.Hidden = false;
                         gvConstructionProblems.DataSource = constructionProblemsLists;
@@ -146,7 +146,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                     nextQualityControlLists = (from x in Funs.DB.Report_NextQualityControl
                                                where x.ReportId == this.ReportId
                                                select x).ToList();
-                    if (nextQualityControlLists.Count>0)
+                    if (nextQualityControlLists.Count > 0)
                     {
                         gvNextQualityControl.Hidden = false;
                         gvNextQualityControl.DataSource = nextQualityControlLists;
@@ -890,12 +890,12 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                                 c.PressurePipeNumber
                             };
                 var AllList = query.ToList();
-                 var monethCount = query
-                    .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate)));
+                var monethCount = query
+                   .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate)));
 
                 Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                 model.Id = Guid.NewGuid().ToString();
-                model.ContentName = item.UnitName;                
+                model.ContentName = item.UnitName;
                 model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.PressurePipeNumber));
                 model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.PressurePipeNumber));
                 model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.ActualNumber));//总数
@@ -1045,15 +1045,15 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                                 c.SunNumber,
                                 c.MonitoringReportNumber
                             };
-                var AllList = query.ToList();             
+                var AllList = query.ToList();
                 var monethCount = query
                 .Where(x => (x.ReportTime >= Convert.ToDateTime(startDate) && x.ReportTime <= Convert.ToDateTime(endDate)));
 
                 Model.Report_CQMS_MonthReportItem model = new Model.Report_CQMS_MonthReportItem();
                 model.Id = Guid.NewGuid().ToString();
                 model.ContentName = item.UnitName;
-                model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o=>o.SunNumber));
-                model.MonthsCount = Convert.ToInt32(monethCount.Sum(o=>o.MonitoringReportNumber));
+                model.TotalNoBackCount = Convert.ToInt32(monethCount.Sum(o => o.SunNumber));
+                model.MonthsCount = Convert.ToInt32(monethCount.Sum(o => o.MonitoringReportNumber));
                 model.ProjectCount = Convert.ToInt32(AllList.Sum(o => o.MonitoringReportNumber));
                 model.ReportId = ReportId;
                 //如果是修改，查询表中数据
@@ -1141,8 +1141,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 NCRStatisc.WorkName = item.UnitName;
                 //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
                 //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
-                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
-                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
+                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
 
                 NCRStatisc.CheckNum = AllList.Count();
 
@@ -1283,7 +1285,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                             select new
                             {
                                 c.CheckDate,
-                                c.ProjectId, 
+                                c.ProjectId,
                                 c.CheckType
                             };
                 var AllList = query.ToList();
@@ -1570,7 +1572,8 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
         #region 保存方法 
 
         #region 9.计量器具报验管理情况
-        void saveMeasuringInspection() {
+        void saveMeasuringInspection()
+        {
 
             List<Model.Report_CQMS_MonthReportItem> detailLists = new List<Model.Report_CQMS_MonthReportItem>();
             JArray teamGroupData = gvMeasuringInspection.GetMergedData();
@@ -1959,7 +1962,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 {
                     ReportId = ReportId,
                     ReType = "13",
-                    TotalNoBackCount= values.Value<int>("TotalNoBackCount"),
+                    TotalNoBackCount = values.Value<int>("TotalNoBackCount"),
                     ContentName = values.Value<string>("ContentName"),
                     MonthsCount = values.Value<int>("MonthsCount"),
                     ProjectCount = values.Value<int>("ProjectCount"),
@@ -2012,7 +2015,7 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 Funs.DB.SubmitChanges();
             }
         }
-#endregion
+        #endregion
 
 
 
diff --git a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
index 34fbb1be..a3a63c91 100644
--- a/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/CQMS/ManageReportNew/WeekReportEdit.aspx.cs
@@ -2188,8 +2188,10 @@ namespace FineUIPro.Web.CQMS.ManageReportNew
                 NCRStatisc.WorkName = item.UnitName;
                 //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Count(x => x.Status == "3");
                 //NCRStatisc.OKNum = AllList.Count(x => x.Status == "3");
-                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
-                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                //NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState.Trim().Equals("已闭合")).Count();
+                NCRStatisc.CurrentPeriodOkNum = unitNCRStatic.Where(x => x.ImplementationFrontState == "已闭合").Count();
+                NCRStatisc.OKNum = AllList.Where(x => x.ImplementationFrontState == "已闭合").Count();
 
                 NCRStatisc.CheckNum = AllList.Count();