diff --git a/DataBase/版本日志/SGGLDB_WH_2025-07-04.sql b/DataBase/版本日志/SGGLDB_WH_2025-07-04.sql
new file mode 100644
index 00000000..0bc09c72
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2025-07-04.sql
@@ -0,0 +1,3 @@
+
+
+ALTER TABLE License_EquipmentSafetyList DROP CONSTRAINT [FK_License_EquipmentSafetyList_ProjectData_WorkArea];
\ No newline at end of file
diff --git a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
index 4104abfb..e9dd1578 100644
--- a/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
+++ b/SGGL/BLL/ZHGL/DataSync/CQMSDataService.cs
@@ -688,7 +688,7 @@ namespace BLL
EquipmentInspectionNum = inspectionEquipmentList.Count(),
EquipmentInspectionQualifiedNum = inspectionEquipmentList.Where(x => x.SamplingResult == "1").Count(),
PersonInspectionNum = inspectionPersonList.Count(),
- PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.IsOnSite.HasValue && x.IsOnSite == true).Count(),
+ PersonInspectionQualifiedNum = inspectionPersonList.Where(x => x.ValidityDate == null || (x.ValidityDate.HasValue && x.ValidityDate >= DateTime.Now)).Count(),
MachineInspectionNum = inspectionMachineList.Count(),
MachineInspectionQualifiedNum = inspectionMachineList.Where(x => x.IsCheckOK.HasValue && x.IsCheckOK == true).Count(),
InspectionMachineNum = inspectionMachineEquipmentList.Count(),
@@ -1167,13 +1167,13 @@ namespace BLL
}
///
- /// 获取人员报验
+ /// 获取人员报验(总数取在场人员)
///
///
public static List GetComprehensive_InspectionPerson()
{
var result = (from x in Funs.DB.Comprehensive_InspectionPerson
- where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime
+ where BeUnderConstructionList.Contains(x.ProjectId) && x.IsOnSite.HasValue && x.IsOnSite == true && x.CompileDate > Const.DtmarkTime
select x).ToList();
return result;
}