From 70707cac4ef0265f2a6a4b99fdfa9f4b0d0758db Mon Sep 17 00:00:00 2001
From: fei550 <1420031550@qq.com>
Date: Thu, 13 Mar 2025 15:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SGGL/BLL/API/HSSE/APIPageDataService.cs    |   4 +-
 SGGL/BLL/BLL.csproj                        |   2 +-
 SGGL/FineUIPro.Web/FineUIPro.Web.csproj    |   2 +-
 SGGL/FineUIPro.Web/common/main_new.aspx.cs | 711 +++++++++++++--------
 SGGL/FineUIPro.Web/packages.config         |   2 +-
 SGGL/SgManager.AI/SgManager.AI.csproj      |   4 +-
 SGGL/SgManager.AI/app.config               |   8 +-
 SGGL/SgManager.AI/packages.config          |   2 +-
 SGGL/WebAPI/Web.config                     | 130 ++--
 SGGL/WebAPI/WebAPI.csproj                  |   4 +-
 SGGL/WebAPI/WebAPI.csproj.user             |   2 +-
 SGGL/WebAPI/packages.config                |   2 +-
 12 files changed, 524 insertions(+), 349 deletions(-)

diff --git a/SGGL/BLL/API/HSSE/APIPageDataService.cs b/SGGL/BLL/API/HSSE/APIPageDataService.cs
index 43746f29..0652f686 100644
--- a/SGGL/BLL/API/HSSE/APIPageDataService.cs
+++ b/SGGL/BLL/API/HSSE/APIPageDataService.cs
@@ -20,7 +20,9 @@ namespace BLL
                 var getDayAll = from x in db.SitePerson_PersonInOutNow
                                 join y in db.SitePerson_Person on x.PersonId equals y.PersonId
                                 join z in db.Base_WorkPost on y.WorkPostId equals z.WorkPostId
-                                where x.ProjectId == projectId && x.ChangeTime.Value.Year == dateValue.Year && x.ChangeTime.Value.Month == dateValue.Month
+                                where x.ProjectId == projectId 
+                                && x.ChangeTime.Value.Year == dateValue.Year 
+                                && x.ChangeTime.Value.Month == dateValue.Month
                                 && x.ChangeTime.Value.Day == dateValue.Day
                                 select new { x.PersonId, x.ChangeTime, x.IsIn, z.PostType };
                 if (getDayAll.Count() > 0)
diff --git a/SGGL/BLL/BLL.csproj b/SGGL/BLL/BLL.csproj
index a86bf87c..cd98f432 100644
--- a/SGGL/BLL/BLL.csproj
+++ b/SGGL/BLL/BLL.csproj
@@ -1078,7 +1078,7 @@
       <Version>2.1.1</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.1</Version>
+      <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="NPOI">
       <Version>2.5.5</Version>
diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index df2e466b..db5c7488 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19655,7 +19655,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v17.0\WebApplications\Microsoft.WebApplication.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/SGGL/FineUIPro.Web/common/main_new.aspx.cs b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
index 2d1557e8..47b1c2dc 100644
--- a/SGGL/FineUIPro.Web/common/main_new.aspx.cs
+++ b/SGGL/FineUIPro.Web/common/main_new.aspx.cs
@@ -1,6 +1,8 @@
 using BLL;
+using Model;
 using Newtonsoft.Json;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
@@ -17,218 +19,244 @@ namespace FineUIPro.Web.common
         public string[] pids { get; set; }
         protected void Page_Load(object sender, EventArgs e)
         {
+            /*            if (!IsPostBack)
+                        {
+                            Model.SGGLDB db = Funs.DB;
+                            if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId))
+                            {
+                                pids = CurrUser.CompanyProjectId.Split(',');
+                            }
+                            else
+                            {
+                                //加载所有在建项目的数据
+                                var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToArray();
+                                if (pidArray.Length > 0)
+                                {
+                                    pids = pidArray;
+                                }
+                            }
+
+
+                            //未遂事故 
+                            this.divWS.InnerHtml = GetNearMissNum().ToString();
+
+                            //安全人工时
+                            var countAqrgsSum = Convert.ToDecimal(0);
+                            if (pids == null)
+                            {
+                                countAqrgsSum = CountAqrgs();
+                            }
+                            else
+                            {
+                                countAqrgsSum = CountAqrgs(null, null, pids);
+                            }
+
+                            if (countAqrgsSum > 10000)
+                            {
+                                countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00);
+
+                                this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "万";
+                            }
+                            else
+                            {
+                                this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0];
+                            }
+
+
+
+                            //本月安全人工时
+                            //int wHoursMonth = 0;
+                            //DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString());
+                            //var dayReports = getMonthReportsByCompany(sDate);
+                            //if (dayReports.Count > 0)
+                            //{
+                            //    wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime);
+                            //}
+                            DateTime d1 = getStartMonth();
+                            DateTime d2 = getEndMonth();
+                            var countMonthAqrgs = Convert.ToDecimal(0);
+                            if (pids == null)
+                            {
+                                countMonthAqrgs = CountAqrgs(d1, d2);
+                            }
+                            else
+                            {
+                                countMonthAqrgs = CountAqrgs(d1, d2, pids);
+                            }
+                            if (countMonthAqrgs > 10000)
+                            {
+                                countMonthAqrgs = countMonthAqrgs / Convert.ToDecimal(10000.00);
+
+                                this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "万";
+                            }
+                            else
+                            {
+                                this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0];
+                            }
+
+
+
+                            //int wHoursMonth = db.SitePerson_PersonInOutNumber.Where(x => x.InOutDate > DateTime.Now.AddDays(-Convert.ToInt32(DateTime.Now.Date.Day)))
+                            //    .Max(x => x.WorkHours) ?? 0;
+                            //this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString();
+
+                            //安全培训累计人员
+                            var getTrainRecord = 0;
+                            var boShengCount = 0;
+                            if (pids == null)
+                            {
+                                getTrainRecord = db.EduTrain_TrainRecord.Sum(x => x.TrainPersonNum) ?? 0;
+                                //修改：增加博晟教育中的人数
+                                boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
+                                this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                            }
+                            else
+                            {
+                                getTrainRecord = db.EduTrain_TrainRecord.Where(x => pids.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum) ?? 0;
+                                //修改：增加博晟教育中的人数
+                                boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)
+                                && pids.Contains(x.ProjectId)).ToList().Count;
+
+                                this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
+                            }
+
+
+                            if (pids == null)
+                            {
+                                //安全管理人员
+                                var allSum = from x in Funs.DB.SitePerson_Person
+                                             where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
+                                             select x;
+
+                                var glAllPerson = from x in allSum
+                                                  join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                                  //where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
+                                                  where y.IsHsse == true
+                                                  select x;
+                                this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
+                            }
+                            else
+                            {
+                                //安全管理人员
+                                var allSum = from x in Funs.DB.SitePerson_Person
+                                             where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
+                                             && pids.Contains(x.ProjectId)
+                                             select x;
+
+                                var glAllPerson = from x in allSum
+                                                  join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                                  //where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
+                                                  where y.IsHsse == true
+                                                  select x;
+                                this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
+                            }
+
+                            #region 质量管理人员，质量培训人员 增加公司级 
+                            int CqmsManageNum = 0;
+                            int CqmsPxNum = 0;
+                            //质量培训人员
+                            DateTime date = DateTime.Now.AddDays(-1);
+                            if (pids == null)
+                            {
+                                CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson
+                                                 join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                                 where x.IsOnJob == true && y.IsCQMS == true
+                                                 select x).Count() +
+                                               (from x in Funs.DB.SitePerson_Person
+                                                join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                                where x.IsUsed == true && y.IsCQMS == true
+                                                select x).Count();
+                                this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
+
+                                CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
+                                             where x.IsTrain == true
+                                             select x).Count();
+                                divCqmsPxNum.InnerText = CqmsPxNum.ToString();
+                            }
+                            else
+                            {
+                                CqmsManageNum = (from x in Funs.DB.SitePerson_Person
+                                                 join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
+                                                 where x.IsUsed == true && y.IsCQMS == true && pids.Contains(x.ProjectId)
+                                                 select x).Count();
+                                this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
+
+                                CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
+                                             where x.IsTrain == true && pids.Contains(x.ProjectId)
+                                             select x).Count();
+                                divCqmsPxNum.InnerText = CqmsPxNum.ToString();
+                            }
+                            #endregion
+
+                            //在建项目
+                            if (pids == null)
+                            {
+                                allProjects = ProjectService.GetAllProjectDropDownList();
+                            }
+                            else
+                            {
+                                allProjects = ProjectService.GetAllProjectDropDownList(pids);
+                            }
+
+                            int acount = allProjects.Count();
+                            int pcount1 = 0;
+                            int pcount2 = 0;
+                            int pcount3 = 0;
+                            if (acount > 0)
+                            {
+                                pcount1 = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count();
+                                var pidzjsg = string.Join(",", allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Select(x => x.ProjectId)).Split(',');
+                                if (pids == null)
+                                {
+                                    pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pidzjsg.Contains(x.ProjectId) select x).Count();
+                                }
+                                else
+                                {
+                                    pidzjsg = pids;
+                                    pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pids.Contains(x.ProjectId) select x).Count();
+                                }
+                                pcount3 = Count3(pidzjsg);
+                            }
+                            div_zjxmCount.InnerHtml = pcount1.ToString() + "<div class=\"th\">个</div>";
+                            div_cjrsCount.InnerHtml = pcount2.ToString() + "<div class=\"th\">人</div>";
+                            div_wdgcCount.InnerHtml = pcount3.ToString() + "<div class=\"th\">个</div>";
+
+                            //质量问题
+                            getZlwt();
+
+                            //质量共检
+                            getZlgj();
+
+                            //焊接
+                            getHj();
+
+                            //关键事项
+                            getGjsx();
+
+                            //人员信息
+                            getSitePerson();
+
+                            //项目人员图表
+                            getProjectSitePerson();
+
+                            //进度
+                            getJd();
+
+                            //整改数据
+                            getZgsj();
+
+                            //材料到货表格
+                            getCldh();
+                        }
+            */
+
+
             if (!IsPostBack)
             {
-                Model.SGGLDB db = Funs.DB;
-                if (!string.IsNullOrEmpty(CurrUser.CompanyProjectId))
-                {
-                    pids = CurrUser.CompanyProjectId.Split(',');
-                }
-                else
-                {
-                    //加载所有在建项目的数据
-                    var pidArray = Funs.DB.Base_Project.Where(x => x.ProjectState == "1").Select(x => x.ProjectId).ToArray();
-                    if (pidArray.Length > 0)
-                    {
-                        pids = pidArray;
-                    }
-                }
-
-
-                //未遂事故
-                var wsAccidentList1 = from x in db.Accident_AccidentPersonRecord
-                                      join y in db.Base_AccidentType on x.AccidentTypeId equals y.AccidentTypeId
-                                      where y.AccidentTypeName.Contains("未遂")
-                                      select x;
-                var wsAccidentList2 = from x in db.Accident_AccidentReportOther
-                                      join y in db.Sys_Const on x.AccidentTypeId equals y.ConstValue
-                                      where y.ConstText.Contains("未遂")
-                                      select x;
-                this.divWS.InnerHtml = GetNearMissNum().ToString();
-
-                //安全人工时
-                int wHours = db.SitePerson_PersonInOutNumber.Max(x => x.WorkHours) ?? 0;
-                var countAqrgsSum = Convert.ToDecimal(0);
-                if (pids == null)
-                {
-                    countAqrgsSum = CountAqrgs();
-                }
-                else
-                {
-                    countAqrgsSum = CountAqrgs(null, null, pids);
-                }
-
-                if (countAqrgsSum > 10000)
-                {
-                    countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00);
-
-                    this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "万";
-                }
-                else
-                {
-                    this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0];
-                }
-
-
-
-                //本月安全人工时
-                //int wHoursMonth = 0;
-                //DateTime? sDate = Funs.GetNewDateTime(DateTime.Now.Year.ToString() + "-" + DateTime.Now.Month.ToString());
-                //var dayReports = getMonthReportsByCompany(sDate);
-                //if (dayReports.Count > 0)
-                //{
-                //    wHoursMonth = Convert.ToInt32(dayReports[0].DayWorkTime);
-                //}
-                DateTime d1 = getStartMonth();
-                DateTime d2 = getEndMonth();
-                var countMonthAqrgs = Convert.ToDecimal(0);
-                if (pids == null)
-                {
-                    countMonthAqrgs = CountAqrgs(d1, d2);
-                }
-                else
-                {
-                    countMonthAqrgs = CountAqrgs(d1, d2, pids);
-                }
-                if (countMonthAqrgs > 10000)
-                {
-                    countMonthAqrgs = countMonthAqrgs / Convert.ToDecimal(10000.00);
-
-                    this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "万";
-                }
-                else
-                {
-                    this.divSafeWorkTimeMonth.InnerHtml = CountAqrgs(d1, d2).ToString().Split('.')[0];
-                }
-
-
-
-                //int wHoursMonth = db.SitePerson_PersonInOutNumber.Where(x => x.InOutDate > DateTime.Now.AddDays(-Convert.ToInt32(DateTime.Now.Date.Day)))
-                //    .Max(x => x.WorkHours) ?? 0;
-                //this.divSafeWorkTimeMonth.InnerHtml = wHoursMonth.ToString();
-
-                //安全培训累计人员
-                var getTrainRecord = 0;
-                var boShengCount = 0;
-                if (pids == null)
-                {
-                    getTrainRecord = db.EduTrain_TrainRecord.Sum(x => x.TrainPersonNum) ?? 0;
-                    //修改：增加博晟教育中的人数
-                    boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)).ToList().Count;
-                    this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
-                }
-                else
-                {
-                    getTrainRecord = db.EduTrain_TrainRecord.Where(x => pids.Contains(x.ProjectId)).Sum(x => x.TrainPersonNum) ?? 0;
-                    //修改：增加博晟教育中的人数
-                    boShengCount = db.Bo_Sheng_TrainPerson.Where(x => (x.DeleteTag == "False" || x.DeleteTag == null)
-                    && pids.Contains(x.ProjectId)).ToList().Count;
-
-                    this.divSafePersonNum.InnerHtml = (getTrainRecord + boShengCount).ToString();
-                }
-
-
-                if (pids == null)
-                {
-                    //安全管理人员
-                    var allSum = from x in Funs.DB.SitePerson_Person
-                                 where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
-                                 select x;
-
-                    var glAllPerson = from x in allSum
-                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                      //where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
-                                      where y.IsHsse == true
-                                      select x;
-                    this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
-                }
-                else
-                {
-                    //安全管理人员
-                    var allSum = from x in Funs.DB.SitePerson_Person
-                                 where x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)
-                                 && pids.Contains(x.ProjectId)
-                                 select x;
-
-                    var glAllPerson = from x in allSum
-                                      join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                      //where (y.PostType == "1" || y.PostType == "4")    //一般管理岗位和特种管理人员
-                                      where y.IsHsse == true
-                                      select x;
-                    this.divSafeManagePersonNum.InnerText = glAllPerson.Count().ToString();
-                }
-
-                #region 质量管理人员，质量培训人员 增加公司级 
-                int CqmsManageNum = 0;
-                int CqmsPxNum = 0;
-                //质量培训人员
-                DateTime date = DateTime.Now.AddDays(-1);
-                if (pids == null)
-                {
-                    CqmsManageNum = (from x in Funs.DB.Person_CompanyBranchPerson
-                                     join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                     where x.IsOnJob == true && y.IsCQMS == true
-                                     select x).Count() +
-                                   (from x in Funs.DB.SitePerson_Person
-                                    join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                    where x.IsUsed == true && y.IsCQMS == true
-                                    select x).Count();
-                    this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
-
-                    CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
-                                 where x.IsTrain == true
-                                 select x).Count();
-                    divCqmsPxNum.InnerText = CqmsPxNum.ToString();
-                }
-                else
-                {
-                    CqmsManageNum = (from x in Funs.DB.SitePerson_Person
-                                     join y in Funs.DB.Base_WorkPost on x.WorkPostId equals y.WorkPostId
-                                     where x.IsUsed == true && y.IsCQMS == true && pids.Contains(x.ProjectId)
-                                     select x).Count();
-                    this.divCqmsManageNum.InnerText = CqmsManageNum.ToString();
-
-                    CqmsPxNum = (from x in Funs.DB.Comprehensive_InspectionPerson
-                                 where x.IsTrain == true && pids.Contains(x.ProjectId)
-                                 select x).Count();
-                    divCqmsPxNum.InnerText = CqmsPxNum.ToString();
-                }
-                #endregion
-
-                //在建项目
-                if (pids == null)
-                {
-                    allProjects = ProjectService.GetAllProjectDropDownList();
-                }
-                else
-                {
-                    allProjects = ProjectService.GetAllProjectDropDownList(pids);
-                }
-
-                int acount = allProjects.Count();
-                int pcount1 = 0;
-                int pcount2 = 0;
-                int pcount3 = 0;
-                if (acount > 0)
-                {
-                    pcount1 = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count();
-                    var pidzjsg = string.Join(",", allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Select(x => x.ProjectId)).Split(',');
-                    if (pids == null)
-                    {
-                        pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pidzjsg.Contains(x.ProjectId) select x).Count();
-                    }
-                    else
-                    {
-                        pidzjsg = pids;
-                        pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pids.Contains(x.ProjectId) select x).Count();
-                    }
-                    pcount3 = Count3(pidzjsg);
-                }
-                div_zjxmCount.InnerHtml = pcount1.ToString() + "<div class=\"th\">个</div>";
-                div_cjrsCount.InnerHtml = pcount2.ToString() + "<div class=\"th\">人</div>";
-                div_wdgcCount.InnerHtml = pcount3.ToString() + "<div class=\"th\">个</div>";
-
-                //质量问题
+                InitializeProjectIds();  // 项目ID初始化封装
+                BindSafetyStatistics();      // 安全统计模块
+                BindQualityStatistics();     // 质量统计模块
+                BindProjectStatistics();     // 项目统计模块
                 getZlwt();
 
                 //质量共检
@@ -255,8 +283,150 @@ namespace FineUIPro.Web.common
                 //材料到货表格
                 getCldh();
             }
+           
+
         }
 
+
+
+        // 初始化项目ID集合
+        private void InitializeProjectIds()
+        {
+            var db = Funs.DB;
+            pids = !string.IsNullOrEmpty(CurrUser.CompanyProjectId)
+                ? CurrUser.CompanyProjectId.Split(',')
+                : db.Base_Project
+                    .Where(x => x.ProjectState == "1")
+                    .Select(x => x.ProjectId)
+                    .ToArray();
+        }
+        // 安全统计模块封装
+        private void BindSafetyStatistics()
+        {
+            var db = Funs.DB;
+            // 未遂事故
+            divWS.InnerHtml = GetNearMissNum().ToString();
+            // 安全人工时（合并重复逻辑）
+            var countAqrgsSum = pids?.Any() == true
+                ? CountAqrgs(d1: null, d2: null, pids)
+                : CountAqrgs();
+
+            if (countAqrgsSum > 10000)
+            {
+                countAqrgsSum = countAqrgsSum / Convert.ToDecimal(10000.00);
+
+                this.divSafeWorkTime.InnerHtml = Math.Round(countAqrgsSum, 2).ToString() + "万";
+            }
+            else
+            {
+                this.divSafeWorkTime.InnerHtml = countAqrgsSum.ToString().Split('.')[0];
+            }
+
+            // 当月安全人工时
+            var countMonthAqrgs = pids?.Any() == true
+                ? CountAqrgs(getStartMonth(), getEndMonth(), pids)
+                : CountAqrgs(getStartMonth(), getEndMonth());
+
+
+            if (countMonthAqrgs > 10000)
+            {
+                countMonthAqrgs = countMonthAqrgs / Convert.ToDecimal(10000.00);
+
+                this.divSafeWorkTimeMonth.InnerHtml = Math.Round(countMonthAqrgs, 2).ToString() + "万";
+            }
+            else
+            {
+                this.divSafeWorkTimeMonth.InnerHtml = countMonthAqrgs.ToString().Split('.')[0];
+            }     
+            // 安全培训人员（合并数据库查询）
+            var trainingQuery = db.EduTrain_TrainRecord
+                .Where(x => pids.Contains(x.ProjectId))
+                .GroupBy(x => 1)
+                .Select(g => new {
+                    TrainCount = g.Sum(x => x.TrainPersonNum) ?? 0,
+                    BoShengCount = db.Bo_Sheng_TrainPerson
+                        .Where(x => (x.DeleteTag == "False" || x.DeleteTag == null))
+                        .Where(x => pids.Contains(x.ProjectId))
+                        .Count()
+                }).FirstOrDefault();
+
+
+            divSafePersonNum.InnerHtml = trainingQuery != null
+                ? (trainingQuery.TrainCount + trainingQuery.BoShengCount).ToString()
+                : "0";
+
+
+
+            // 安全管理人员（优化关联查询）
+            var safetyStaffCount = db.SitePerson_Person
+                .Where(x=> x.IsUsed == true && x.InTime < DateTime.Now && (x.OutTime == null || x.OutTime > DateTime.Now)) 
+                .Where(x => pids.Contains(x.ProjectId))
+                .Join(db.Base_WorkPost.Where(x => x.IsHsse==true),
+                    person => person.WorkPostId,
+                    post => post.WorkPostId,
+                    (person, post) => person)
+                .Count();
+            divSafeManagePersonNum.InnerText = safetyStaffCount.ToString();
+        }
+        // 质量统计模块封装
+        private void BindQualityStatistics()
+        {
+            var db = Funs.DB;
+            // 质量管理人员（合并公司+项目级查询）
+            var qualityQuery = db.Base_WorkPost
+                .Where(x => x.IsCQMS == true)
+                .GroupJoin(db.SitePerson_Person.Where(x=> x.IsUsed == true),
+                    post => post.WorkPostId,
+                    person => person.WorkPostId,
+                    (post, persons) => new { post, persons })
+                .SelectMany(x => x.persons.DefaultIfEmpty(),
+                    (x, person) => new { x.post, person })
+                .Where(x => pids.Contains(x.person.ProjectId));
+            divCqmsManageNum.InnerText = qualityQuery.Count().ToString();
+            // 质量培训人员
+            divCqmsPxNum.InnerText = db.Comprehensive_InspectionPerson
+                .Where(x => pids.Contains(x.ProjectId))
+                .Count(x => x.IsTrain == true).ToString();
+        }
+        // 项目统计优化
+        private void BindProjectStatistics()
+        {
+            var db = Funs.DB;
+            //在建项目
+            if (pids == null)
+            {
+                allProjects = ProjectService.GetAllProjectDropDownList();
+            }
+            else
+            {
+                allProjects = ProjectService.GetAllProjectDropDownList(pids);
+            }
+
+            int acount = allProjects.Count();
+            int pcount1 = 0;
+            int pcount2 = 0;
+            int pcount3 = 0;
+            if (acount > 0)
+            {
+                pcount1 = allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Count();
+                var pidzjsg = string.Join(",", allProjects.Where(x => x.ProjectState == Const.ProjectState_1 || x.ProjectState == null).Select(x => x.ProjectId)).Split(',');
+                if (pids == null)
+                {
+                    pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pidzjsg.Contains(x.ProjectId) select x).Count();
+                }
+                else
+                {
+                    pidzjsg = pids;
+                    pcount2 = (from x in Funs.DB.SitePerson_Person where x.IsUsed == true && pids.Contains(x.ProjectId) select x).Count();
+                }
+                pcount3 = Count3(pidzjsg);
+            }
+            div_zjxmCount.InnerHtml = pcount1.ToString() + "<div class=\"th\">个</div>";
+            div_cjrsCount.InnerHtml = pcount2.ToString() + "<div class=\"th\">人</div>";
+            div_wdgcCount.InnerHtml = pcount3.ToString() + "<div class=\"th\">个</div>";
+        }
+
+
         #region 当月人工时
 
 
@@ -300,34 +470,28 @@ namespace FineUIPro.Web.common
                                         select x;
             if (pids != null)
             {
-                getAllPersonInOutList = from x in Funs.DB.SitePerson_PersonInOutNumber
-                                        where pids.Contains(x.ProjectId)
-                                        select x;
+                getAllPersonInOutList = getAllPersonInOutList.Where(x => pids.Contains(x.ProjectId));
             }
-            if (getAllPersonInOutList.Count() > 0)
+            if (datetime1.HasValue)
             {
-                if (datetime1.HasValue)
-                {
-                    getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate >= datetime1);
-                }
-                if (datetime2.HasValue)
-                {
-                    getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate <= datetime2);
-                }
-                if (getAllPersonInOutList.Count() > 0)
-                {
-                    //cout1 = getAllPersonInOutList.Sum(x => (long)x.WorkHours);
-                    foreach (var pid in pids)
-                    {
-                        var q1 = getAllPersonInOutList.Where(x => x.ProjectId == pid).OrderByDescending(x => x.InOutDate);
-                        var q2 = getAllPersonInOutList.Where(x => x.ProjectId == pid).OrderBy(x => x.InOutDate);
-                        if (q1.Count() > 0)
-                        {
-                            cout1 += (q1.First().WorkHours ?? 0) - (q2.First().WorkHours ?? 0);
-                        }
-                    }
-                }
+                getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate >= datetime1);
             }
+            if (datetime2.HasValue)
+            {
+                getAllPersonInOutList = getAllPersonInOutList.Where(x => x.InOutDate <= datetime2);
+            }
+            var projects = getAllPersonInOutList
+                                                                                            .GroupBy(x => x.ProjectId)
+                                                                                            .Select(g => new
+                                                                                            {
+                                                                                                Project = g.Key,
+                                                                                                Items = g.OrderBy(x => x.InOutDate).ToList()
+                                                                                            })
+                                                                                            .Where(g => g.Items.Any());
+            cout1 = projects.ToList().Sum(g =>
+                (g.Items.Last().WorkHours ?? 0) -
+                (g.Items.First().WorkHours ?? 0));
+
 
             var getD1 = from x in Funs.DB.Accident_AccidentHandle
                         join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
@@ -340,16 +504,9 @@ namespace FineUIPro.Web.common
 
             if (pids != null)
             {
-                getD1 = from x in Funs.DB.Accident_AccidentHandle
-                        join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                        where pids.Contains(x.ProjectId)
-                        select x;
-                getD2 = from x in Funs.DB.Accident_AccidentReport
-                        join y in Funs.DB.Base_Project on x.ProjectId equals y.ProjectId
-                        where pids.Contains(x.ProjectId)
-                        select x;
+                getD1 = getD1.Where(x => pids.Contains(x.ProjectId));
+                getD2 = getD2.Where(x => pids.Contains(x.ProjectId));
             }
-
             if (datetime1.HasValue)
             {
                 getD1 = getD1.Where(x => x.AccidentDate >= datetime1);
@@ -359,20 +516,17 @@ namespace FineUIPro.Web.common
             {
                 getD1 = getD1.Where(x => x.AccidentDate <= datetime2);
                 getD2 = getD2.Where(x => x.CompileDate <= datetime2);
-            }
-
-
-            if (getD1.Count() > 0)
+            } 
+            if (getD1.Any())
             {
                 cout1 = cout1 - getD1.Sum(x => x.WorkHoursLoss ?? 0);
             }
-            if (getD2.Count() > 0)
+            if (getD2.Any())
             {
                 cout1 = cout1 - getD2.Sum(x => x.WorkingHoursLoss ?? 0);
             }
             return cout1;
         }
-
         /// <summary>
         ///  获取出入记录人工时-月报(项目级别)
         /// </summary>
@@ -823,27 +977,46 @@ namespace FineUIPro.Web.common
             var ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" select x;
             if (pids != null)
             {
-                ndtLists = from x in db.ProcessControl_NondestructiveTest_New where x.ProfessionalName == "工艺管道" && pids.Contains(x.ProjectId) select x;
+                ndtLists = ndtLists.Where(x=>pids.Contains(x.ProjectId));
             }
             decimal a = 0, b = 0;
-            if (ndtLists.Count() > 0)
-            {
-                foreach (var project in allProjects)
-                {
-                    var ndt = (from x in ndtLists
-                               where x.ProjectId == project.ProjectId
-                               orderby x.CreateDate descending
-                               select x).FirstOrDefault();
-                    if (ndt != null)
-                    {
-                        if (ndt.TotalQuantity.HasValue)
-                        {
-                            a += Math.Floor(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
-                            b += ndt.TotalQuantity.Value;
-                        }
-                    }
-                }
-            }
+
+            
+            var sumResult =  ndtLists
+                .GroupBy(x => x.ProjectId)
+                .Select(g => new {
+                    TotalQ = g.OrderByDescending(x => x.CreateDate)
+                             .Select(x => x.TotalQuantity)
+                             .FirstOrDefault(),
+                    Rate = g.OrderByDescending(x => x.CreateDate)
+                           .Select(x => x.TotalRate)
+                           .FirstOrDefault()
+                })
+                .Where(x => x.TotalQ.HasValue).ToList()
+                .Select(x => new {
+                    A = Math.Floor(x.TotalQ.Value * (decimal.Parse(x.Rate)) / 100),
+                    B = x.TotalQ.Value
+                }); 
+            a = sumResult.Sum(x=>x.A);
+            b = sumResult.Sum(x => x.B);
+            /* if (ndtLists.Count() > 0)
+             {
+                 foreach (var project in allProjects)
+                 {
+                     var ndt = (from x in ndtLists
+                                where x.ProjectId == project.ProjectId
+                                orderby x.CreateDate descending
+                                select x).FirstOrDefault();
+                     if (ndt != null)
+                     {
+                         if (ndt.TotalQuantity.HasValue)
+                         {
+                             a += Math.Floor(ndt.TotalQuantity.Value * Funs.GetNewDecimalOrZero(ndt.TotalRate) / 100);
+                             b += ndt.TotalQuantity.Value;
+                         }
+                     }
+                 }
+             }*/
             if (b > 0)
             {
                 result = Convert.ToDouble(decimal.Round(decimal.Parse((a / b * 100).ToString()), 2));
diff --git a/SGGL/FineUIPro.Web/packages.config b/SGGL/FineUIPro.Web/packages.config
index c6950201..bd40cf98 100644
--- a/SGGL/FineUIPro.Web/packages.config
+++ b/SGGL/FineUIPro.Web/packages.config
@@ -8,4 +8,4 @@
   <package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net461" />
   <package id="RestSharp" version="106.15.0" targetFramework="net461" />
   <package id="SharpZipLib" version="1.3.2" targetFramework="net461" />
-</packages>
\ No newline at end of file
+</packages>               
\ No newline at end of file
diff --git a/SGGL/SgManager.AI/SgManager.AI.csproj b/SGGL/SgManager.AI/SgManager.AI.csproj
index 8d107452..857a9042 100644
--- a/SGGL/SgManager.AI/SgManager.AI.csproj
+++ b/SGGL/SgManager.AI/SgManager.AI.csproj
@@ -37,8 +37,8 @@
     <Reference Include="AOP.Common">
       <HintPath>..\FineUIPro\Reference BLL\AOP.Common.dll</HintPath>
     </Reference>
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />
diff --git a/SGGL/SgManager.AI/app.config b/SGGL/SgManager.AI/app.config
index 3e98c00e..f4b76c74 100644
--- a/SGGL/SgManager.AI/app.config
+++ b/SGGL/SgManager.AI/app.config
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup></configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup></configuration>
diff --git a/SGGL/SgManager.AI/packages.config b/SGGL/SgManager.AI/packages.config
index 29bfe4e6..3b26bced 100644
--- a/SGGL/SgManager.AI/packages.config
+++ b/SGGL/SgManager.AI/packages.config
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Baidu.AI" version="4.15.9" targetFramework="net45" />
-  <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
 </packages>
\ No newline at end of file
diff --git a/SGGL/WebAPI/Web.config b/SGGL/WebAPI/Web.config
index 2530c655..85d2a6d1 100644
--- a/SGGL/WebAPI/Web.config
+++ b/SGGL/WebAPI/Web.config
@@ -1,41 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!--
   有关如何配置 ASP.NET 应用程序的详细信息，请访问
   https://go.microsoft.com/fwlink/?LinkId=301879
   -->
 <configuration>
   <appSettings>
-    <add key="webpages:Version" value="3.0.0.0"/>
-    <add key="webpages:Enabled" value="false"/>
-    <add key="ClientValidationEnabled" value="true"/>
-    <add key="UnobtrusiveJavaScriptEnabled" value="true"/>
+    <add key="webpages:Version" value="3.0.0.0" />
+    <add key="webpages:Enabled" value="false" />
+    <add key="ClientValidationEnabled" value="true" />
+    <add key="UnobtrusiveJavaScriptEnabled" value="true" />
     <!--连接字符串-->
-    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200"/>
+    <add key="ConnectionString" value="Server=.;Database=SGGLDB_WH;Integrated Security=False;User ID=sa;Password=1111;MultipleActiveResultSets=true;Connect Timeout=1200" />
     <!--版本号-->
-    <add key="SystemVersion" value="WebApi_V2019-08-27-001"/>
+    <add key="SystemVersion" value="WebApi_V2019-08-27-001" />
     <!--附件上传物理路径-->
-    <add key="localRoot" value="D:\WuHuan\SGGL\SGGL\FineUIPro.Web\"/>
+    <add key="localRoot" value="D:\WuHuan\SGGL\SGGL\FineUIPro.Web\" />
     <!--每页数量-->
-    <add key="PageSize" value="15"/>
+    <add key="PageSize" value="15" />
     <!--BAIDU AI配置-->
-    <add key="APP_ID" value="23518716"/>
-    <add key="API_KEY" value="9UGmBxS0TOIDGM5adGrOcBnr"/>
-    <add key="SECRET_KEY" value="6yq7q5PTTGfocWDmSN7hjxuiixsfURe1"/>
+    <add key="APP_ID" value="23518716" />
+    <add key="API_KEY" value="9UGmBxS0TOIDGM5adGrOcBnr" />
+    <add key="SECRET_KEY" value="6yq7q5PTTGfocWDmSN7hjxuiixsfURe1" />
     <!--视频服务器-->
-    <add key="Video_URL" value="http://47.104.102.122:10000/"/>
+    <add key="Video_URL" value="http://47.104.102.122:10000/" />
     <!--人脸检测参数-->
     <!--人脸活体检测参数1最好，0最差 建议0.995 -->
-    <add key="BD_face_liveness" value="0.3"/>
+    <add key="BD_face_liveness" value="0.3" />
     <!--人脸高宽建议100-200-->
     <!--<add key="BD_width" value="200" />-->
     <!--<add key="BD_height" value="200" />-->
     <!--人脸角度-->
-    <add key="BD_roll" value="60"/>
+    <add key="BD_roll" value="60" />
     <!--人脸遮档度0最好，1最不好-->
-    <add key="BD_occlusion" value="1"/>
+    <add key="BD_occlusion" value="1" />
     <!--人脸模糊度0最好，1最不好-->
-    <add key="BD_blur" value="0.1"/>
-    <add key="CEMS_IMG_URL" value="https://zhgd.cwcec.com/"/>
+    <add key="BD_blur" value="0.1" />
+    <add key="CEMS_IMG_URL" value="https://zhgd.cwcec.com/" />
   </appSettings>
   <!--
     有关 web.config 更改的说明，请参见 http://go.microsoft.com/fwlink/?LinkId=235367。
@@ -46,90 +46,90 @@
       </system.Web>
   -->
   <system.web>
-    <compilation debug="false" targetFramework="4.6.1"/>
-    <httpRuntime/>
-    <pages controlRenderingCompatibilityVersion="4.0"/>
+    <compilation debug="true" targetFramework="4.6.1" />
+    <httpRuntime />
+    <pages controlRenderingCompatibilityVersion="4.0" />
   </system.web>
   <system.webServer>
     <handlers>
-      <remove name="ExtensionlessUrlHandler-Integrated-4.0"/>
-      <remove name="OPTIONSVerbHandler"/>
-      <remove name="TRACEVerbHandler"/>
-      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0"/>
+      <remove name="ExtensionlessUrlHandler-Integrated-4.0" />
+      <remove name="OPTIONSVerbHandler" />
+      <remove name="TRACEVerbHandler" />
+      <add name="ExtensionlessUrlHandler-Integrated-4.0" path="*." verb="*" type="System.Web.Handlers.TransferRequestHandler" preCondition="integratedMode,runtimeVersionv4.0" />
     </handlers>
     <!-- 跨域访问必须添加 -->
     <httpProtocol>
       <customHeaders>
-        <add name="Access-Control-Allow-Origin" value="*"/>
-        <add name="Access-Control-Allow-Headers" value="Content-Type"/>
-        <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS"/>
+        <add name="Access-Control-Allow-Origin" value="*" />
+        <add name="Access-Control-Allow-Headers" value="Content-Type" />
+        <add name="Access-Control-Allow-Methods" value="GET, POST, PUT, DELETE, OPTIONS" />
       </customHeaders>
     </httpProtocol>
   </system.webServer>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-			<dependentAssembly>
-				<assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0"/>
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0"/>
-			</dependentAssembly>
-			<dependentAssembly>
-				<assemblyIdentity name="Aspose.Words" publicKeyToken="716FCC553A201E56" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-24.12.0.0" newVersion="24.12.0.0"/>
-			</dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f"/>
-        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2"/>
+        <assemblyIdentity name="System.IO.Compression" publicKeyToken="B77A5C561934E089" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed"/>
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="CC7B13FFCD2DDD51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
+        <assemblyIdentity name="Aspose.Words" publicKeyToken="716FCC553A201E56" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-24.12.0.0" newVersion="24.12.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930"/>
+        <assemblyIdentity name="Antlr3.Runtime" publicKeyToken="eb42632606e9261f" />
+        <bindingRedirect oldVersion="0.0.0.0-3.5.0.2" newVersion="3.5.0.2" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="Newtonsoft.Json" culture="neutral" publicKeyToken="30ad4fe6b2a6aeed" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0"/>
+        <assemblyIdentity name="System.Web.Optimization" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-1.1.0.0" newVersion="1.1.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35"/>
-        <bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0"/>
+        <assemblyIdentity name="WebGrease" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="0.0.0.0-1.6.5135.21930" newVersion="1.6.5135.21930" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+        <assemblyIdentity name="System.Web.Helpers" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0"/>
+        <assemblyIdentity name="System.Web.WebPages" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1"/>
+        <assemblyIdentity name="System.Web.Mvc" publicKeyToken="31bf3856ad364e35" />
+        <bindingRedirect oldVersion="1.0.0.0-5.2.4.0" newVersion="5.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1"/>
+        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.2.7.0" newVersion="5.2.7.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Configuration.ConfigurationManager" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.0.1" newVersion="6.0.0.1" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
   <system.codedom>
     <compilers>
-      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701"/>
-      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+"/>
+      <compiler language="c#;cs;csharp" extension=".cs" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.CSharpCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:1659;1699;1701" />
+      <compiler language="vb;vbs;visualbasic;vbscript" extension=".vb" type="Microsoft.CodeDom.Providers.DotNetCompilerPlatform.VBCodeProvider, Microsoft.CodeDom.Providers.DotNetCompilerPlatform, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" warningLevel="4" compilerOptions="/langversion:default /nowarn:41008 /define:_MYTYPE=\&quot;Web\&quot; /optionInfer+" />
     </compilers>
   </system.codedom>
-</configuration>
+</configuration>
\ No newline at end of file
diff --git a/SGGL/WebAPI/WebAPI.csproj b/SGGL/WebAPI/WebAPI.csproj
index aea3bf36..df8e7a4e 100644
--- a/SGGL/WebAPI/WebAPI.csproj
+++ b/SGGL/WebAPI/WebAPI.csproj
@@ -54,8 +54,8 @@
       <HintPath>..\packages\Aspose.Words.24.12.0\lib\net461\Aspose.Words.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="Swashbuckle.Core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=cd1bb07a5ac7c7bc, processorArchitecture=MSIL">
       <HintPath>..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll</HintPath>
diff --git a/SGGL/WebAPI/WebAPI.csproj.user b/SGGL/WebAPI/WebAPI.csproj.user
index d989db4f..77603cb5 100644
--- a/SGGL/WebAPI/WebAPI.csproj.user
+++ b/SGGL/WebAPI/WebAPI.csproj.user
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
diff --git a/SGGL/WebAPI/packages.config b/SGGL/WebAPI/packages.config
index ba1098f4..5695dc9f 100644
--- a/SGGL/WebAPI/packages.config
+++ b/SGGL/WebAPI/packages.config
@@ -25,7 +25,7 @@
   <package id="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" version="2.0.0" targetFramework="net461" />
   <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net461" />
   <package id="Modernizr" version="2.8.3" targetFramework="net461" />
-  <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
+  <package id="Newtonsoft.Json" version="13.0.1" targetFramework="net461" />
   <package id="Swashbuckle" version="5.6.0" targetFramework="net461" />
   <package id="Swashbuckle.Core" version="5.6.0" targetFramework="net461" />
   <package id="System.Data.DataSetExtensions" version="4.5.0" targetFramework="net461" />