diff --git a/SUBQHSE/FineUIPro.Web/common/main.aspx.cs b/SUBQHSE/FineUIPro.Web/common/main.aspx.cs
index 6fb897d..1af08fc 100644
--- a/SUBQHSE/FineUIPro.Web/common/main.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/common/main.aspx.cs
@@ -345,8 +345,10 @@ namespace FineUIPro.Web.common
                         },
                         measuringInstrumentsData = new
                         {//计量器具数据
-                            useNum = cqmsData.UseNum ?? 0,//计量器具
-                            okNum = cqmsData.OKNum ?? 0,//校准合格
+                            // useNum = cqmsData.UseNum ?? 0,//计量器具
+                            // okNum = cqmsData.OKNum ?? 0,//校准合格
+                            useNum = inspectionMachineList.Where(x => x.InspectionType == "计量").Sum(x => x.UnitsCount ?? 0),
+                            okNum = inspectionMachineList.Where(x => x.InspectionType == "计量" && x.IsCheckOK.HasValue && x.IsCheckOK == true).Sum(x => x.UnitsCount ?? 0),
                         },
                     }
                 };
diff --git a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
index c3a958d..4495207 100644
--- a/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/common/mainProject.aspx.cs
@@ -380,8 +380,10 @@ namespace FineUIPro.Web.common
                         },
                         measuringInstrumentsData = new
                         {//计量器具数据
-                            useNum = cqmsProjectData.UseNum ?? 0,//计量器具
-                            okNum = cqmsProjectData.OKNum ?? 0,//校准合格
+                            // useNum = cqmsProjectData.UseNum ?? 0,//计量器具
+                            // okNum = cqmsProjectData.OKNum ?? 0,//校准合格
+                            useNum = inspectionMachineList.Where(x => x.InspectionType == "计量").Sum(x => x.UnitsCount ?? 0),
+                            okNum = inspectionMachineList.Where(x => x.InspectionType == "计量" && x.IsCheckOK.HasValue && x.IsCheckOK == true).Sum(x => x.UnitsCount ?? 0),
                         },
                     }
                 };