diff --git a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
index e8df7b8d..d42f28ba 100644
--- a/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
+++ b/SGGL/FineUIPro.Web/FineUIPro.Web.csproj
@@ -19056,7 +19056,7 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.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/HSSE/Check/HiddenTroubleManager.aspx b/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx
index 563b259f..3e146296 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx
@@ -14,7 +14,7 @@
             ShowHeader="false" Layout="VBox" BoxConfigAlign="Stretch">
             <Items>
                 <f:Grid ID="Grid1" ShowBorder="true" ShowHeader="false" Title="隐患排查与治理统计" EnableCollapse="true"
-                    runat="server" BoxFlex="1" DataKeyNames="DataId" DataIDField="DataId" AllowSorting="true"
+                    runat="server" BoxFlex="1" DataKeyNames="Id" DataIDField="Id" AllowSorting="true"
                     EnableColumnLines="true" AllowPaging="true" 
                     IsDatabasePaging="true" PageSize="15" OnPageIndexChange="Grid1_PageIndexChange" EnableTextSelection="True" AllowColumnLocking="true">
                     <Toolbars>
@@ -45,8 +45,66 @@
                             </ItemTemplate>
                         </f:TemplateField>
                         
+                          <f:RenderField Width="350px" ColumnID="Content" DataField="Content"
+                                FieldType="String" HeaderText="隐患内容" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                            </f:RenderField>
 
+                         <f:RenderField Width="120px" ColumnID="CheckDate" DataField="CheckDate"
+                          FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                            HeaderText="排查日期" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+
+                         <f:RenderField Width="150px" ColumnID="HiddendangersTypes" DataField="HiddendangersTypes"
+                                FieldType="String" HeaderText="隐患类型" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                         </f:RenderField>
+
+                          <f:RenderField Width="120px" ColumnID="HiddendangersLevel" DataField="HiddendangersLevel"
+                                FieldType="String" HeaderText="隐患级别" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                         </f:RenderField>
+
+                         <f:RenderField Width="150px" ColumnID="UnitName" DataField="UnitName"
+                                FieldType="String" HeaderText="责任单位" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                         </f:RenderField>
+
+                          <f:RenderField Width="120px" ColumnID="Person" DataField="Person"
+                                FieldType="String" HeaderText="责任人" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                         </f:RenderField>
+
+                       <f:RenderField Width="120px" ColumnID="Term" DataField="Term"
+                          FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                            HeaderText="整改期限" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
                    
+
+                          <f:RenderField Width="200px" ColumnID="Rectification" DataField="Rectification"
+                                FieldType="String" HeaderText="整改措施与要求" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                         </f:RenderField>
+
+                           <f:RenderField Width="120px" ColumnID="ReviewResults" DataField="ReviewResults"
+                                FieldType="String" HeaderText="复查结果" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                         </f:RenderField>
+
+                         <f:RenderField Width="120px" ColumnID="ReviewDate" DataField="ReviewDate"
+                          FieldType="Date" Renderer="Date" RendererArgument="yyyy-MM-dd"
+                            HeaderText="复查日期" HeaderTextAlign="Center" TextAlign="Center">
+                        </f:RenderField>
+
+                          <f:RenderField Width="120px" ColumnID="ReviewMan" DataField="ReviewMan"
+                                FieldType="String" HeaderText="复查人" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                         </f:RenderField>
+
+                          <f:RenderField Width="120px" ColumnID="StatesStr" DataField="StatesStr"
+                                FieldType="String" HeaderText="隐患状态" HeaderTextAlign="Center"
+                                TextAlign="Left">
+                         </f:RenderField>
                     </Columns>
                     <PageItems>
                         <f:ToolbarSeparator ID="ToolbarSeparator1" runat="server">
@@ -62,6 +120,21 @@
                 </f:Grid>
             </Items>
         </f:Panel>
+        <f:Menu ID="Menu1" runat="server">
+          
+        </f:Menu>
     </form>
 </body>
 </html>
+<script type="text/javascript">
+        var menuID = '<%= Menu1.ClientID %>';
+        // 返回false，来阻止浏览器右键菜单
+        function onRowContextMenu(event, rowId) {
+            F(menuID).show();  //showAt(event.pageX, event.pageY);
+            return false;
+        }
+
+        function reloadGrid() {
+            __doPostBack(null, 'reloadGrid');
+        }
+</script>
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.cs
index a2ba3bd4..991377f3 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.cs
@@ -1,17 +1,259 @@
-using System;
+using BLL;
+using System;
 using System.Collections.Generic;
+using System.Data;
+using System.Data.SqlClient;
 using System.Linq;
-using System.Web;
-using System.Web.UI;
-using System.Web.UI.WebControls;
+using System.Text;
+using AspNet = System.Web.UI.WebControls;
 
 namespace FineUIPro.Web.HSSE.Check
 {
-    public partial class HiddenTroubleManager : System.Web.UI.Page
+    public partial class HiddenTroubleManager : PageBase
     {
+        #region 项目主键
+        /// <summary>
+        /// 项目主键
+        /// </summary>
+        public string ProjectId
+        {
+            get
+            {
+                return (string)ViewState["ProjectId"];
+            }
+            set
+            {
+                ViewState["ProjectId"] = value;
+            }
+        }
+        #endregion
+
         protected void Page_Load(object sender, EventArgs e)
         {
-
+            if (!IsPostBack) { 
+                
+            }
         }
+
+        private void BindGrid()
+        {
+            string strSql = @"select newid() as Id,Content,CheckDate,HiddendangersTypes,HiddendangersLevel,UnitName,Person,Term
+                        ,Rectification,ReviewResults,ReviewDate,ReviewMan,StatesStr,Projectid from(
+                        --安全巡检
+                        select RegisterDef as Content,CheckTime as CheckDate,HiddenType as HiddendangersTypes,
+                        Risk_Level as HiddendangersLevel,Unit.UnitName as UnitName, User4.UserName as Person,RectificationPeriod as Term
+                        ,(Rectification+';'+Requirements) as Rectification,
+                        (CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '待整改' 
+	                        WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN '合格' 
+	                        WHEN Registration.states='2' THEN '已整改-待复查验收' 
+	                        WHEN Registration.states='3' THEN '已闭环' 
+	                        ELSE '已作废' END ) as ReviewResults,
+                        RectificationTime as ReviewDate,User2.UserName as ReviewMan,
+                        (CASE WHEN Registration.states='1' and (Registration.SafeSupervisionIsOK is null OR Registration.SafeSupervisionIsOK=0) THEN '开放' 
+	                        WHEN Registration.states='1' and Registration.SafeSupervisionIsOK=1 THEN '关闭' 
+	                        WHEN Registration.states='2' THEN '开放' 
+	                        WHEN Registration.states='3' THEN '关闭' 
+	                        ELSE '已作废' END )as StatesStr,Registration.ProjectId
+
+                        from HSSE_Hazard_HazardRegister Registration
+                        LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = Registration.ResponsibleUnit
+                        LEFT JOIN dbo.Sys_User AS User4 ON User4.UserId = Registration.ResponsibleMan2
+                        LEFT JOIN dbo.Sys_User AS User2 ON User2.UserId = Registration.CheckManId
+
+                        union all
+                        --专项检查
+                        select CheckItemSetContent as Content,cc.CheckTime as CheckDate,f.HiddenType as HiddendangersTypes,
+                         (CASE WHEN f.HiddenHazardType = '3' THEN '重大' WHEN f.HiddenHazardType = '2' THEN '较大' WHEN f.HiddenHazardType
+                        = '1' THEN '一般' ELSE '' END) as HiddendangersLevel,
+                        unit1.UnitName as UnitName,cc.PartInPersonIds as Person,f.Rectification_Date as Term
+                        ,sc.ConstText as Rectification,
+                        (CASE WHEN cc.States='2' THEN '待确认' WHEN cc.States='3' THEN '已关闭' WHEN cc.States='1' THEN '待整改' ELSE '待提交' END)
+                        as ReviewResults,f.CompletedDate as ReviewDate,su.UserName as ReviewMan,
+                        (CASE WHEN cc.States='2' THEN '开放' WHEN cc.States='3' THEN '关闭' WHEN cc.States='1' THEN '开放' ELSE '开放' END) as StatesStr ,cc.ProjectId
+                        from Check_CheckSpecialDetail f
+                        left join Check_CheckSpecial cc on f.CheckSpecialId=cc.CheckSpecialId
+                        left join base_unit unit1 on cc.ResponsibleUnit=unit1.UnitId
+                        left join sys_const sc on f.HandleStep=sc.ConstValue
+                        left join sys_user su on cc.ResponsibleMan=su.UserId
+                        where CompleteStatus=0
+
+                        union all
+
+                        --综合检查
+                        select f.Unqualified as Content,ccc.CheckTime  as CheckDate, f.HiddenType as HiddendangersTypes,
+                        f.HiddenHazardType as HiddendangersLevel,unit1.UnitName as UnitName,''  as Person, f.LimitedDate as Term
+                        ,sc.ConstText  as Rectification,(CASE WHEN f.CompleteStatus =1 THEN '是' 
+			                        WHEN f.CompleteStatus =0 THEN '否' ELSE '' END)  as ReviewResults,
+                        f.CompletedDate as ReviewDate,su.UserName  as ReviewMan,(CASE WHEN f.CompleteStatus =1 THEN '关闭' 
+			                        WHEN f.CompleteStatus =0 THEN '开放' ELSE '' END)  as StatesStr,ccc.ProjectId
+                        from Check_CheckColligationDetail f
+                        left join Check_CheckColligation ccc on f.CheckColligationId=ccc.CheckColligationId
+                        left join base_unit unit1 on f.UnitId=unit1.UnitId
+                        left join sys_const sc on f.HandleStep=sc.ConstValue
+                        left join sys_user su on su.userid=ccc.CheckPerson
+
+                        union all
+
+                        --隐患整改单
+                        select f.WrongContent as Content,cr.CheckedDate as CheckDate,f.HiddenType as HiddendangersTypes,
+                        f.HiddenHazardType as HiddendangersLevel,bu.UnitName as UnitName,cr.DutyPerson as Person,LimitTime as Term
+                        ,Requirement as Rectification,
+                        (CASE WHEN States = 0 THEN '待提交'
+                        WHEN States = 1 THEN '待签发' 
+                        WHEN States = 2 THEN '待整改' 
+                        WHEN States = 3 THEN '待审核' 
+                        WHEN States = 4 THEN '待复查' 
+                        WHEN States = 5 THEN '已完成' ELSE '' END) as ReviewResults,
+                        cr.CompleteDate as ReviewDate,CheckPerson.UserName as ReviewMan,
+                        (CASE WHEN States = 0 THEN '开放'
+                        WHEN States = 1 THEN '开放' 
+                        WHEN States = 2 THEN '开放' 
+                        WHEN States = 3 THEN '开放' 
+                        WHEN States = 4 THEN '开放' 
+                        WHEN States = 5 THEN '关闭' ELSE '' END) as StatesStr,cr.ProjectId
+                        from Check_RectifyNoticesItem f
+                        left join Check_RectifyNotices cr on f.RectifyNoticesId=cr.RectifyNoticesId
+                        left join base_unit bu on cr.UnitId=bu.UnitId
+                        LEFT JOIN Sys_User AS CheckPerson ON CheckPerson.UserId = cr.CheckPerson
+                        )f where 1=1 ";
+            List<SqlParameter> listStr = new List<SqlParameter>();
+            strSql += " AND ProjectId = @ProjectId";
+            listStr.Add(new SqlParameter("@ProjectId", this.CurrUser.LoginProjectId));
+
+            if (!string.IsNullOrEmpty(this.txtStartTime.Text.Trim()))
+            {
+                strSql += " AND CheckDate >= @StartDate";
+                listStr.Add(new SqlParameter("@StartDate", this.txtStartTime.Text.Trim()));
+            }
+            if (!string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                strSql += " AND CheckDate <= @EndDate";
+                listStr.Add(new SqlParameter("@EndDate", this.txtEndTime.Text.Trim()));
+            }
+
+            strSql += " order by CheckDate desc ";
+
+            SqlParameter[] parameter = listStr.ToArray();
+            DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);
+
+            Grid1.RecordCount = tb.Rows.Count;
+
+            var table = this.GetPagedDataTable(Grid1, tb);
+            Grid1.DataSource = table;
+            Grid1.DataBind();
+        }
+
+        #region 分页 排序
+        /// <summary>
+        /// 改变索引事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_PageIndexChange(object sender, GridPageEventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 分页下拉选择事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            BindGrid();
+        }
+
+        /// <summary>
+        /// 排序
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_Sort(object sender, FineUIPro.GridSortEventArgs e)
+        {
+            this.BindGrid();
+        }
+        #endregion
+        #region 查询
+        /// <summary>
+        /// 查询
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void TextBox_TextChanged(object sender, EventArgs e)
+        {
+            if (!string.IsNullOrEmpty(this.txtStartTime.Text.Trim()) && !string.IsNullOrEmpty(this.txtEndTime.Text.Trim()))
+            {
+                if (Convert.ToDateTime(this.txtStartTime.Text.Trim()) > Convert.ToDateTime(this.txtEndTime.Text.Trim()))
+                {
+                    Alert.ShowInTop("开始时间不能大于结束时间", MessageBoxIcon.Warning);
+                    return;
+                }
+            }
+            this.BindGrid();
+        }
+        #endregion
+
+        #region 导出按钮
+        /// 导出按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnOut_Click(object sender, EventArgs e)
+        {
+            Response.ClearContent();
+            string filename = Funs.GetNewFileName();
+            Response.AddHeader("content-disposition", "attachment; filename=" + System.Web.HttpUtility.UrlEncode("隐患排查与治理统计" + filename, System.Text.Encoding.UTF8) + ".xls");
+            Response.ContentType = "application/excel";
+            Response.ContentEncoding = System.Text.Encoding.UTF8;
+            this.Grid1.PageSize = this.Grid1.RecordCount;
+            this.BindGrid();
+            Response.Write(GetGridTableHtml(Grid1));
+            Response.End();
+        }
+
+        /// <summary>
+        /// 导出方法
+        /// </summary>
+        /// <param name="grid"></param>
+        /// <returns></returns>
+        private string GetGridTableHtml(Grid grid)
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("<meta http-equiv=\"content-type\" content=\"application/excel; charset=UTF-8\"/>");
+            sb.Append("<table cellspacing=\"0\" rules=\"all\" border=\"1\" style=\"border-collapse:collapse;\">");
+            sb.Append("<tr>");
+            foreach (GridColumn column in grid.Columns)
+            {
+                if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
+                {
+                    sb.AppendFormat("<td>{0}</td>", column.HeaderText);
+                }
+            }
+            sb.Append("</tr>");
+            foreach (GridRow row in grid.Rows)
+            {
+                sb.Append("<tr>");
+                foreach (GridColumn column in grid.Columns)
+                {
+                    if (column.ColumnID != "ckbIsSelected" && column.ColumnID != "Punish" && column.ColumnID != "Del")
+                    {
+                        string html = row.Values[column.ColumnIndex].ToString();
+                        if (column.ColumnID == "tfPageIndex")
+                        {
+                            html = (row.FindControl("lblPageIndex") as AspNet.Label).Text;
+                        }
+
+                        sb.AppendFormat("<td>{0}</td>", html);
+                    }
+                }
+                sb.Append("</tr>");
+            }
+            sb.Append("</table>");
+
+            return sb.ToString();
+        }
+        #endregion
     }
 }
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.designer.cs
index 74872d8d..fd1b16d8 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/HiddenTroubleManager.aspx.designer.cs
@@ -139,5 +139,14 @@ namespace FineUIPro.Web.HSSE.Check
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.DropDownList ddlPageSize;
+
+        /// <summary>
+        /// Menu1 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.Menu Menu1;
     }
 }
diff --git a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
index 57608a50..ba9c7471 100644
--- a/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/SitePerson/PersonListEdit.aspx.cs
@@ -339,6 +339,13 @@ namespace FineUIPro.Web.HSSE.SitePerson
                         ShowNotify("身份证号码位数不对！", MessageBoxIcon.Warning);
                         return;
                     }
+                    //判断是否在黑名单中
+                    var model = Funs.DB.SitePerson_Person.FirstOrDefault(x => x.IdentityCard == IdCard && x.IsBlacklist == true);
+                    if (model!=null)
+                    {
+                        ShowNotify("该身份证号码在系统黑名单中（"+ ProjectService.GetProjectNameByProjectId(model.ProjectId) +"），请联系管理员！", MessageBoxIcon.Warning);
+                        return;
+                    }
                 }
                 //if (string.IsNullOrEmpty(this.txtIdcardStartDate.Text))
                 //{