diff --git a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs index 5284e0f..c811c43 100644 --- a/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs +++ b/SUBQHSE/FineUIPro.Web/HSSE/SitePerson/PersonList.aspx.cs @@ -115,9 +115,8 @@ namespace FineUIPro.Web.HSSE.SitePerson }; if (personLists.Count() > 0) { - var personIn = personLists.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsed == true - && x.InTime <= DateTime.Now && (!x.OutTime.HasValue || x.OutTime > DateTime.Now)).ToList(); - rootNode.ToolTip = "当前项目人员总数:" + personLists.Count() + ";在场人员数:" + personIn.Count() + ";离场人员数:" + (personLists.Count() - personIn.Count()); + var personOut = personLists.Where(x => x.ProjectId == this.CurrUser.LoginProjectId && x.IsUsedType == "0").ToList(); + rootNode.ToolTip = "当前项目人员总数:" + personLists.Count() + ";在场人员数:" + (personLists.Count() - personOut.Count()) + ";离场人员数:" + personOut.Count(); } else { @@ -171,9 +170,8 @@ namespace FineUIPro.Web.HSSE.SitePerson if (personUnitLists.Count() > 0) { - var personIn = personUnitLists.Where(x => x.InTime <= System.DateTime.Now && x.IsUsed == true - && (!x.OutTime.HasValue || x.OutTime >= System.DateTime.Now)); - newNode.ToolTip = q.UnitName + "人员总数:" + personUnitLists.Count() + ";在场人员数:" + personIn.Count() + ";离场人员数:" + (personUnitLists.Count() - personIn.Count()); + var personOut = personUnitLists.Where(x => x.IsUsedType == "0"); + newNode.ToolTip = q.UnitName + "人员总数:" + personUnitLists.Count() + ";在场人员数:" + (personUnitLists.Count() - personOut.Count()) + ";离场人员数:" + personOut.Count(); } else {