diff --git a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs index 36d7859b..bed3d86f 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainMenu_HSSE.aspx.cs @@ -167,7 +167,10 @@ namespace FineUIPro.Web listCategories.Add(getunits.ShortUnitName ?? getunits.UnitCode); var unitHazardRegisters = getHazardRegisterLists.Where(x => x.ResponsibleUnit == getunits.UnitId); var noW = unitHazardRegisters.Where(x => x.States != "3"); - listdata.Add(unitHazardRegisters.Count() - noW.Count()); + //listdata.Add(unitHazardRegisters.Count() - noW.Count()); + //listdata2.Add(unitHazardRegisters.Count()); + + listdata.Add(unitHazardRegisters.Where(x=>x.States=="1").Count()); listdata2.Add(unitHazardRegisters.Count()); } } @@ -181,7 +184,9 @@ namespace FineUIPro.Web listCategories.Add(unit.ShortUnitName ?? unit.UnitCode); var unitHazardRegisters = getHazardRegisterLists.Where(x => x.ResponsibleUnit == unit.UnitId); var noW = unitHazardRegisters.Where(x => x.States != "3"); - listdata.Add(unitHazardRegisters.Count() - noW.Count()); + //listdata.Add(unitHazardRegisters.Count() - noW.Count()); + //listdata2.Add(unitHazardRegisters.Count()); + listdata.Add(unitHazardRegisters.Where(x => x.States == "1").Count()); listdata2.Add(unitHazardRegisters.Count()); } } diff --git a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs index aaa3f460..55e9eee9 100644 --- a/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs +++ b/SGGL/FineUIPro.Web/common/mainProject2.aspx.cs @@ -61,7 +61,10 @@ namespace FineUIPro.Web.common //安全培训累计人员 var getTrainRecord = db.EduTrain_TrainRecord.Where(x => x.ProjectId == ProjectId).Max(x => x.TrainPersonNum) ?? 0; - this.divSafePersonNum.InnerHtml = getTrainRecord.ToString(); + //修改:增加博晟教育中的人数 + var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => x.ProjectId == ProjectId && (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count; + + this.divSafePersonNum.InnerHtml = (getTrainRecord+ boShengCount).ToString(); //安全管理人员 var allSum = from x in Funs.DB.SitePerson_Person diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs index 22251a95..d1975f93 100644 --- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs +++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs @@ -52,7 +52,9 @@ namespace FineUIPro.Web.common //安全培训累计人员 var getTrainRecord = db.EduTrain_TrainRecord.Max(x=>x.TrainPersonNum)??0; - this.divSafePersonNum.InnerHtml = getTrainRecord.ToString(); + //修改:增加博晟教育中的人数 + var boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count; + this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString(); //安全管理人员 var allSum = from x in Funs.DB.SitePerson_Person