diff --git a/DataBase/版本日志/SGGLDB_WH_2023-09-27.sql b/DataBase/版本日志/SGGLDB_WH_2023-09-27.sql
new file mode 100644
index 00000000..e3bfcf70
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_WH_2023-09-27.sql
@@ -0,0 +1,39 @@
+--ר�����ܼ쵥λ
+alter table Check_CheckSpecial add ResponsibleUnit nvarchar(50)  null;
+--�����
+alter table Check_CheckSpecial add WorkAreaId nvarchar(50)  null;
+--��������
+alter table Check_CheckSpecial add QuestionType nvarchar(50)  null;
+--�����
+alter table Check_CheckSpecial add ResponsibleMan nvarchar(50) null;
+--�ӱ����Ӵ�������ֶ�
+alter table Check_CheckSpecialDetail add CheckOpinions nvarchar(2000) null;
+
+----------------------------------------------------------�޸���Ա��״̬
+
+--1.������
+alter table SitePerson_Person disable trigger SitePerson_Person_Bak_TRIGGER;
+
+--�����α�
+DECLARE @projectid nvarchar(50)  --�������
+ 
+DECLARE mycursor CURSOR FOR select projectid from base_project where ProjectState='3' --�����α�
+ 
+OPEN mycursor  --���α�
+ 
+FETCH NEXT FROM mycursor INTO @projectid
+ 
+WHILE(@@FETCH_STATUS = 0)  --�������е����ݣ�@@FETCH_STATUS��������ֵΪ0��ʾFETCH���ִ�гɹ�
+BEGIN
+	update SitePerson_Person set IsUsed=0 where ProjectId=@projectid;--�޸�����
+	FETCH NEXT FROM mycursor INTO @projectid --ȡ��һ���α�����
+END
+ 
+CLOSE mycursor --�ر��α�
+ 
+DEALLOCATE mycursor --ɾ���α�
+GO
+
+--������
+alter table SitePerson_Person enable trigger SitePerson_Person_Bak_TRIGGER;
+
diff --git a/SGGL/BLL/API/APIPersonService.cs b/SGGL/BLL/API/APIPersonService.cs
index 7000b083..c89257b8 100644
--- a/SGGL/BLL/API/APIPersonService.cs
+++ b/SGGL/BLL/API/APIPersonService.cs
@@ -58,7 +58,7 @@ namespace BLL
             using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
             {
                 var getPerson = from x in db.View_SitePerson_Person
-                                where x.PersonId == personId || x.IdentityCard == personId
+                                where (x.PersonId == personId || x.IdentityCard == personId)
                                 select new Model.PersonItem
                                 {
                                     PersonId = x.PersonId,
@@ -1752,5 +1752,83 @@ namespace BLL
 
             return message;
         }
+
+        #region 二维码扫码获取人员
+        /// <summary>
+        /// 二维码扫码获取人员
+        /// </summary>
+        /// <param name="personId"></param>
+        /// <returns></returns>
+        public static Model.PersonItem getPersonByPersonIdQrcode(string personId)
+        {
+            using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
+            {
+                var getPerson = from x in db.View_SitePerson_Person
+                                where (x.PersonId == personId || x.IdentityCard == personId) && x.IsUsed == true
+                                select new Model.PersonItem
+                                {
+                                    PersonId = x.PersonId,
+                                    CardNo = x.CardNo,
+                                    PersonName = x.PersonName,
+                                    Sex = x.Sex,
+                                    SexName = x.SexName,
+                                    IdentityCard = x.IdentityCard,
+                                    Address = x.Address,
+                                    ProjectId = x.ProjectId,
+                                    ProjectCode = x.ProjectCode,
+                                    ProjectName = x.ProjectName,
+                                    UnitId = x.UnitId,
+                                    UnitCode = x.UnitCode,
+                                    UnitName = x.UnitName,
+                                    TeamGroupId = x.TeamGroupId,
+                                    TeamGroupName = x.TeamGroupName,
+                                    WorkPostId = x.WorkPostId,
+                                    WorkPostName = x.WorkPostName,
+                                    InTime = string.Format("{0:yyyy-MM-dd}", x.InTime),
+                                    OutTime = string.Format("{0:yyyy-MM-dd}", x.OutTime),
+                                    OutResult = x.OutResult,
+                                    Telephone = x.Telephone,
+                                    PhotoUrl = x.PhotoUrl,
+                                    DepartName = x.DepartName,
+                                    IsUsed = x.IsUsed,
+                                    IsUsedName = x.IsUsed == false ? "不启用" : "启用",
+                                    AuditorId = x.AuditorId,
+                                    AuditorName = db.Sys_User.First(z => z.UserId == x.AuditorId).UserName,
+                                    IsForeign = x.IsForeign.HasValue ? x.IsForeign : false,
+                                    IsOutside = x.IsOutside.HasValue ? x.IsOutside : false,
+                                    AuditorDate = string.Format("{0:yyyy-MM-dd}", x.AuditorDate),
+                                    AttachUrl1 = x.IDCardUrl == null ? APIUpLoadFileService.getFileUrl(personId + "#1", null) : x.IDCardUrl.Replace('\\', '/'),
+                                    AttachUrl2 = APIUpLoadFileService.getFileUrl(personId + "#2", null),
+                                    AttachUrl3 = APIUpLoadFileService.getFileUrl(personId + "#3", null),
+                                    AttachUrl4 = getAttachUrl4(x.PersonId),
+                                    AttachUrl5 = APIUpLoadFileService.getFileUrl(personId + "#5", null),
+                                    IdcardType = x.IdcardType,
+                                    IdcardTypeName = x.IdcardTypeName,
+                                    IdcardStartDate = string.Format("{0:yyyy-MM-dd}", x.IdcardStartDate),
+                                    IdcardEndDate = string.Format("{0:yyyy-MM-dd}", x.IdcardEndDate),
+                                    IdcardForever = x.IdcardForever,
+                                    IdcardForeverStr = x.IdcardForeverStr,
+                                    PoliticsStatus = x.PoliticsStatus,
+                                    PoliticsStatusName = x.PoliticsStatusName,
+                                    IdcardAddress = x.IdcardAddress,
+                                    Nation = x.Nation,
+                                    NationName = x.NationName,
+                                    EduLevel = x.EduLevel,
+                                    EduLevelName = x.EduLevelName,
+                                    MaritalStatus = x.MaritalStatus,
+                                    MaritalStatusName = x.MaritalStatusName,
+                                    CountryCode = x.CountryCode,
+                                    CountryName = x.CountryName,
+                                    ProvinceCode = x.ProvinceCode,
+                                    ProvinceName = x.ProvinceName,
+                                    MainCNProfessionalId = x.MainCNProfessionalId,
+                                    MainCNProfessionalName = x.MainCNProfessionalName,
+                                    ViceCNProfessionalId = x.ViceCNProfessionalId,
+                                    ViceCNProfessionalName = x.ViceCNProfessionalName
+                                };
+                return getPerson.FirstOrDefault();
+            }
+        }
+        #endregion
     }
 }
diff --git a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs
index 03c4a833..09c6c784 100644
--- a/SGGL/BLL/API/HSSE/APICheckSpecialService.cs
+++ b/SGGL/BLL/API/HSSE/APICheckSpecialService.cs
@@ -43,6 +43,18 @@ namespace BLL
                                   States = x.States,
                                   AttachUrl1 = APIUpLoadFileService.getFileUrl(x.CheckSpecialId, null),
                                   CheckSpecialDetailItems = getCheckSpecialDetailList(x.CheckSpecialId),
+
+                                  ResponsibleUnit=x.ResponsibleUnit,
+                                  ResponsibleUnitName=UnitService.GetUnitNameByUnitId(x.ResponsibleUnit),
+                                  WorkAreaId=x.WorkAreaId,
+                                  WorkAreaName= UnitWorkService.GetUnitWorkName(x.WorkAreaId),
+                                  QuestionType=x.QuestionType,
+                                  QuestionTypeName=UnitService.GetQuestionTypeId(x.QuestionType),
+
+                                  ResponsibleMan=x.ResponsibleMan,
+
+
+
                               };
                 return getInfo.FirstOrDefault();
             }
@@ -117,18 +129,38 @@ namespace BLL
                     PartInPersons = UserService.getUserNamesUserIds(newItem.PartInPersonIds),
                     PartInPersonNames = newItem.PartInPersonNames2,
                     CompileMan = newItem.CompileManId,
-                    States = Const.State_0,
+                    States = newItem.States,
+
+                    ResponsibleUnit=newItem.ResponsibleUnit,
+                    WorkAreaId=newItem.WorkAreaId,
+                    QuestionType=newItem.QuestionType,
+                    //审核人
+                    ResponsibleMan=newItem.ResponsibleMan
                 };
                 //if (newItem.States != Const.State_1)
                 //{
                 //    newCheckSpecial.States = Const.State_0;
                 //}
 
-                if (newItem.CheckSpecialDetailItems == null || newItem.CheckSpecialDetailItems.Count() == 0)
+                //if (newItem.CheckSpecialDetailItems == null || newItem.CheckSpecialDetailItems.Count() == 0)
+                //{
+                //    if (newItem.States == Const.State_1)
+                //    {
+                //        newCheckSpecial.States = Const.State_2;
+                //    }
+                //}
+
+                //如果审核状态不为空
+                if (!string.IsNullOrEmpty(newItem.AuditState))
                 {
-                    if (newItem.States == Const.State_1)
+                    //不同意的话
+                    if (newItem.AuditState=="0")
                     {
-                        newCheckSpecial.States = Const.State_2;
+                        newCheckSpecial.States = "0";
+                    }
+                    else if (newItem.AuditState=="1")
+                    {
+                        newCheckSpecial.States = "2";
                     }
                 }
 
@@ -167,31 +199,32 @@ namespace BLL
                         SaveCheckSpecialDetail(item);                      
                     }
                     //// 单据完成后 系统自动按照单位 整改要求生成隐患整改单
-                    if (newItem.States == Const.State_1)
-                    {
-                        var getC = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false);
-                        if (getC == null)
-                        {
-                            newCheckSpecial.States = Const.State_2;
-                            Check_CheckSpecialService.UpdateCheckSpecial(newCheckSpecial);
-                        }
-                        else
-                        {
-                            var getNA = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false && (x.HandleStep== null || x.HandleStep==""));
-                            if (getNA == null)
-                            {
-                                var detailLists = db.Check_CheckSpecialDetail.Where(x => x.CheckSpecialId == newCheckSpecial.CheckSpecialId && x.CompleteStatus == false);
-                                if (detailLists.Count() > 0)
-                                {
-                                    message = Check_CheckSpecialService.IssueRectification(detailLists.ToList(), newCheckSpecial);
-                                }
-                            }
-                            else
-                            {
-                                message += "存在待整改，没有处理措施的记录！";
-                            }
-                        }
-                    }
+                    ///五环不需要
+                    //if (newItem.States == Const.State_1)
+                    //{
+                    //    var getC = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false);
+                    //    if (getC == null)
+                    //    {
+                    //        newCheckSpecial.States = Const.State_2;
+                    //        Check_CheckSpecialService.UpdateCheckSpecial(newCheckSpecial);
+                    //    }
+                    //    else
+                    //    {
+                    //        var getNA = newItem.CheckSpecialDetailItems.FirstOrDefault(x => x.CompleteStatus == false && (x.HandleStep== null || x.HandleStep==""));
+                    //        if (getNA == null)
+                    //        {
+                    //            var detailLists = db.Check_CheckSpecialDetail.Where(x => x.CheckSpecialId == newCheckSpecial.CheckSpecialId && x.CompleteStatus == false);
+                    //            if (detailLists.Count() > 0)
+                    //            {
+                    //                message = Check_CheckSpecialService.IssueRectification(detailLists.ToList(), newCheckSpecial);
+                    //            }
+                    //        }
+                    //        else
+                    //        {
+                    //            message += "存在待整改，没有处理措施的记录！";
+                    //        }
+                    //    }
+                    //}
                 }
                 return message;
             }
@@ -238,6 +271,7 @@ namespace BLL
                                   CheckItemDetailSetId = x.CheckItemSetId,
                                   CheckItemDetailContent = x.CheckItemSetContent,
                                   Rectification_Date = string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
+                                  CheckOpinions=x.CheckOpinions,
                               };
                 return getInfo.ToList();
             }
@@ -290,6 +324,7 @@ namespace BLL
                                   CheckItemDetailSetId=x.CheckItemSetId,
                                   CheckItemDetailContent=x.CheckItemSetContent,
                                   Rectification_Date= string.Format("{0:yyyy-MM-dd}", x.Rectification_Date),
+                                  CheckOpinions=x.CheckOpinions
                               };
                 return getInfo.First();
             }
@@ -316,7 +351,7 @@ namespace BLL
                         UnitId = newDetail.UnitId,
                         HandleStep = newDetail.HandleStep,
                         HiddenHazardType = newDetail.HiddenHazardType,
-                        CompleteStatus = newDetail.CompleteStatus ?? false,
+                        CompleteStatus = newDetail.CompleteStatus,
                         RectifyNoticeId = newDetail.RectifyNoticeId,
                         LimitedDate = Funs.GetNewDateTime(newDetail.LimitedDate),
                         CompletedDate = Funs.GetNewDateTime(newDetail.CompletedDate),
@@ -325,10 +360,11 @@ namespace BLL
                         CheckArea = newDetail.WorkAreaId,
                         CheckContent = newDetail.CheckContent,
 
-                        //整改日期、检查内容、检查内容id
+                        //整改日期、检查内容、检查内容id、处理意见
                         CheckItemSetId= newDetail.CheckItemDetailSetId,
                         CheckItemSetContent= newDetail.CheckItemDetailContent,
-                        Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date)
+                        Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date),
+                        CheckOpinions=newDetail.CheckOpinions,
                     };
                     if (newCheckSpecialDetail.CompleteStatus == false && newCheckSpecialDetail.HandleStep.Contains("1") && string.IsNullOrEmpty(newCheckSpecialDetail.HiddenHazardType))
                     {
@@ -371,10 +407,11 @@ namespace BLL
                         updateDetail.CheckArea = newCheckSpecialDetail.CheckArea;
                         updateDetail.CheckContent = newCheckSpecialDetail.CheckContent;
 
-                        //整改日期、检查内容、检查内容id
+                        //整改日期、检查内容、检查内容id、处理意见
                         updateDetail.CheckItemSetId = newDetail.CheckItemDetailSetId;
                         updateDetail.CheckItemSetContent = newDetail.CheckItemDetailContent;
                         updateDetail.Rectification_Date = Funs.GetNewDateTime(newDetail.Rectification_Date);
+                        updateDetail.CheckOpinions = newDetail.CheckOpinions;
                         db.SubmitChanges();
                     }
                     ////保存附件
diff --git a/SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs b/SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs
index f349d0ac..621af157 100644
--- a/SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs
+++ b/SGGL/BLL/HSSE/Check/Check_CheckSpecialService.cs
@@ -244,7 +244,8 @@ namespace BLL
                             {
                                 Model.RectifyNoticesItemItem newRItem = new Model.RectifyNoticesItemItem
                                 {
-                                    WrongContent = item.Unqualified
+                                    //WrongContent = item.Unqualified
+                                    WrongContent = item.CheckItemSetContent
                                 };
                                 if (string.IsNullOrEmpty(rectifyNotices.CheckSpecialDetailId))
                                 {
@@ -298,7 +299,8 @@ namespace BLL
                         foreach (var item in getUnitDItem)
                         {
                             Model.PunishNoticeItemItem newPItem = new Model.PunishNoticeItemItem();
-                            newPItem.PunishContent = item.Unqualified;
+                            //newPItem.PunishContent = item.Unqualified;
+                            newPItem.PunishContent = item.CheckItemSetContent;
                             newPItem.SortIndex = item.SortIndex;
                             punishNotice.PunishNoticeItemItem.Add(newPItem);
                             if (string.IsNullOrEmpty(punishNotice.CheckSpecialDetailId))
@@ -335,7 +337,8 @@ namespace BLL
                         foreach (var item in getUnitDItem)
                         {
                             Model.RectifyNoticesItemItem newRItem = new Model.RectifyNoticesItemItem();
-                            pauseNotice.ThirdContent += item.Unqualified;
+                            //pauseNotice.ThirdContent += item.Unqualified;
+                            pauseNotice.ThirdContent += item.CheckItemSetContent;
                             string checkAreaName= UnitWorkService.GetNameById(item.CheckArea);
                             if (!string.IsNullOrEmpty(checkAreaName))
                             {
diff --git a/SGGL/BLL/SysManage/UnitService.cs b/SGGL/BLL/SysManage/UnitService.cs
index dbe2aed1..647c8449 100644
--- a/SGGL/BLL/SysManage/UnitService.cs
+++ b/SGGL/BLL/SysManage/UnitService.cs
@@ -761,5 +761,21 @@ namespace BLL
                 return q;
             }
         }
+
+        /// <summary>
+        /// 获取问题类型名称
+        /// </summary>
+        /// <param name="UnitId"></param>
+        /// <returns></returns>
+        public static string GetQuestionTypeId(string RegisterTypesId)
+        {
+            string name = string.Empty;
+            var unit = Funs.DB.HSSE_Hazard_HazardRegisterTypes.FirstOrDefault(x => x.RegisterTypesId == RegisterTypesId);
+            if (unit != null)
+            {
+                name = unit.RegisterTypesName;
+            }
+            return name;
+        }
     }
 }
diff --git a/SGGL/FineUIPro.Web/File/Word/HSSE/专项检查.doc b/SGGL/FineUIPro.Web/File/Word/HSSE/专项检查.doc
index 84c6efe3..90ca6147 100644
--- a/SGGL/FineUIPro.Web/File/Word/HSSE/专项检查.doc
+++ b/SGGL/FineUIPro.Web/File/Word/HSSE/专项检查.doc
@@ -1,9 +1,61 @@
-
-                                  专项检查
-项目名称：                                         编号：
-
-|检查类别       |                               |检查日期        |                 |
-|参检人员       |                                                                 |
-
-
-序号 |单位工程 |受检单位 |问题描述 |问题类型 |处理结果 |隐患类别 | |
+PK
+�N�@	docProps/PK�N�@N�N\
qdocProps/app.xml��Qo�0�ߗ�?ޡ�9S0�Ӳ����4�͠m�j�߯�E����9�=��C����Π
�"���&K.����`�{�RQ�V
+H�+�=>���
+��`<!L�7֪B�5�Q��p�J�Z'u�dUqk�N�b�g.D	e�n����8������|泸*��:�R�{�ӆ��A7�li
&�r��4&hH�PM�u�ԛ#E޸p7�9.I�ZS���#E
+ii[���wAv���;ܬ��
��F��e�����w����mv��
�N9��J��3j]��a��>~:9Fq���$��q�N⧗<�g�y0�$e���8�I�L��8_4N"�������?o,ݧު;
PK�N�@+J
}docProps/core.xml��OO� ��&~��{�2�H��?��%&�h�x�%��v3~U����j�<��=<�(�󽪢X'k]�4!(�k!��@��E|�"���5�����k��6`��v��m�7cǷ��K�C���b>�v�
�l8#�+�L0�p+��`D�R�Ai�l�	�P��N���r.���?�p����-�1轓�4M�L�����w�Qc���
����v�[`D���)y��ܮ��H6��,Φ+rI�)%�%�'�_�
+��ږW����������T��e���q}q�������7�Q25<	ʶ���l�R��x<v��S~
PK�N�@���r*
docProps/custom.xml��MK�@���a��f?�m�%I�G�AA�UB�i�ݐ�T����R�x����yf&Z���h;�cH�Եi:����c�B��tS�F������*�� G�I<B��V�z/Uek��fT���æm�Z����3B���3
+
_8x�����';�}<^7�>�G�*�51|+x^�p�6"G����X"�2��"ݼC0���R~�ۇ;�m��eS�7[9z�����ź1a�3DY�oPN��w��?mf��|�c<�|FiZn8��a�eΉ��b^0��ϔ�&�O�:�2�PK
+�N�@word/PK�N�@�%��	�eword/styles.xml�]Kr���;�w@`e/$�7Ҵ��ݔdu���Mɳ.E��
\D������6�=�U�"�jV����{Y���>��G�W����?><�=�2�b�??���{Y�E2�c��g�/�������,�x�
@�]���_�yz9e���,;�)O��\����S-F1Sߊ� �q�r1���F'GG�~#�~���
+� �������K9���W�;�>��W2(b��q�x6�$[�4��b,qY���
+�G�u�}�VR���
�2�I���L$
���PSq�Pq���#
���Zv�,��]�]Sf�c��K/މ�b�t3@��4�Y.�+��o�Z���0H*�[^;>���M��_�TlAp����O�����Q���QU?�_�ύL��[]�,�	Bb
X���L�pf���<�Y��k�����;�,o
~��G�>��)�ߖIic`yՆ����2�\I>�O�!W��|���bc�>�,E�[��9�!�uu���V�!ש^{����T��c�Ç�����p��F��e��k�S�2@������ƐB��́�Eo$LW���>�Dɲ�L��w�Ѧ奡5�I���g�!~�q��?���!>tB�
+l���uG�
��w���!;pw ��w��ݩ00A��2�H
K�� 54,AbhX��аI�a	RB�$��%H��!�}��F��8�K�'2�^�_	�Y�GED��_\��n�����fo4��[�
3m�N�^���N�'��\,
+���x/���:�C �dP<�����$��s�`h����B�H$�K�xF�)[Ё�$4�EX95�46�Ɗ|��ڂ"�b�e�Gg.�g�^
+q'2�G�F��Qĩ����XN�v5��W�{6|�\���-#���І����z�J���L����꾂���
+���7�}F\�D�c&��së�T,��n�1S�VC��#Sl�X����������D��j�ɺ�F�&P/")�л���d��P)CC@�

A�:���=��t�vw�d;�{��,��)��rb��IJ��_��P�h����H�=¤��I�.A#y
N�k���u��AQ�憉f�o)W0N�m����Q$W<�S�r��;�B�\��e"�®��2�=K�G�`!Q]�*�ȳ7{=/���?��g�nn����0����T�T�����xT��2$x
+h����$�(�!����$�ET����G5�rNE1eqJ�q4�?���`l�bx���)��<:�����K��N�^RӚȊ��< ��A/�s)��������4yJ�I�`	&ɂ��d5T������U�H�y�E�f��B�@�q��V�!��#C@^E��jJ@0ZS��_��<l���k��|k��k�i�J���3ˬZ���Jt3ݽx�W��N��v�x7�d�n���ݠ�ŻA'�w�N�W�ϡ�O�oq��~��,���S���:{w(�u��br��G%�z��Lvl��zⅴ�WⓅ�ѵx48�������6lǢ�Z^?թr�l�Á���v�0މ�2����P�f_�_�?�����
+���H�S�=E�U�ͦ��)�9u�ӏ)��$<�-�;]PՒ����c|ӕ����d����o���Ѫ~>R�.l;B�`���O�[�6<���–�
E�"ؒ���!��'�0�v�T�|Q�4��bsG�b��'��)��ڷ�\$�/��Zۗho��K����%�[�����=���$6Uh�R�\6mh���<4DC萳xc
67m�7���m�Ʋؼ�K��\��r9�7��Y��D��%ro,��x#���KbS�F�6��eӆ��-�X"�<4Dm�F�?pQ?��=�=G0����-�زؼ�K��\��r9�7��Y��D��%ro,��x#���K�o,�MMm�7��&
Q[��D�⍜�uo,��A��e�yg�xc�0��ro,��xc���K�,�X"g�F��7�#�X.�64��o,�M��x#������Q��,6m�7���]��ˆ7��Y��D��%ro,��xc���I�&�X�xc�l��hj[��D6yh���$ro�BG�Ʋ��-�X�wv�7�#�X.g��9�7��Y��D��%ro$��xcI0��iC��m����!j��!��ط�H�_�n>
�r��9���u:z���^���zἹ�y%��Ok^|O���j7��(�~�|}�Q�0ޚ�1V"�+�X�h�߃��L��l�n���ջ���'�7-�����|c��@��3c������/}u�m_j��+��|S�j� �����e�'���Eu?��k�c<9x�j�5�����A��g�>S��UQM�Ȧַ�,�Q��pw��өy��O��&�׋�"������fC�n�N�,���u�e���1<��Ѐ&<��	�\�`|��L������'��<{|dv�<�|�b���,X5�]PImcʟ��u���e��PK�N�@S��ł�
+word/settings.xml�V[O�8~_i�C��Ҧ7JD
�P�3)�훓�����v�i��qSm
�f�Oq��;�c���hc��"��<���50�EB�z�=/&͡�P�Q����b�}�����"PXkS
��*`��K�΂VK�)fH��s`��dHï\���y֌ː&�Do[�v{�U0b��D��X
+%Vڨb�"1�>NC��]�9q�0ץŖ�|\�$S��)��:��WAlur���J�
+�2�k��{F!�"�JA���2D���
�S}�nY�-�~�<՞+z��A�mg$�H�2Cx���\i��H�=^Q'E�Nb^9qP5��V��5XL�\HQh���yЛ;!X�2,c(������c�$�*��Dp�Jb1��Ń�a.��yr��b� R�j$8B	&U�=I`Ʀ�	s���y�?	^����B-2g��ql�
+��$���Ĉ����D������Q���� 2Dǵ�
��i8h+�`?��X�8E�he�LHA�g	����X��PUz圛�+�O�|�ٜ#�x�C�⫭�c�C��$:-�S�F|��wE�J/�*�9]HD�|XB)}�3�e�d�`
���E��ٌp|��:�S��“�ڊ\��v5�v�A�1h,K��\$�V.ɾk���t���m��an�mH@��ܸt0�[
+I�:$;|ɓ{���
+��s�rs��GX݋m�'Aa��?�ʚM(���NNy��_�����������>B ��2
�F�����X���� l���=/����|�\,Ӈ��m��_���"���9Y}�LN��=�T�Ұ9��=�:`p��OoNm�q���v�t\��!����������۹���z��a����܃��f���U8U,0�ۓ�8�'ӓ
f���HԘ����H�_�����9a9f�i�!J'�c��f��񪄥s$�5n%!?��b��c�;�[X왵VH��^s��^��#st�G���p����x�Hت�S�>���P��1o>���0R�R��vi���hC�R�'��,��=Z�#��]�5
	<�ʟhݩx���W�������#HU���u�nM�����մ���k�����V)�
+I	��莆���'w�8�H6	�*���	��9RSjx8���͋_PK
+�N�@word/theme/PK�N�@ݵ�
+�word/theme/theme1.xml�Y͏7�W��0�;�$�cY�E��e��"
���83f=��vvɭ�c�JUi�C�z�j�R/��ٖ���B����N����B��f<���>~��#�.��hp�� ,o���Q�|�b�'���`��f��Q��V8�"����G�ЖLq����j������
1�a$γ	��ۘ�Ix��F��	���F5�"y�(�w���\g���\
+50���4�%`|TQ��Lt(�m��;f'|_�
EB‡V�_��}imBT����v���+⣪��'�r�Z�^k��5��U\��k��>
@��ilqtn6k�v��@�ѣ��Y��:xK���w�흨��5�语���v���5���+�Q'j��d��|�^��{^�RJ�tU�z�.!cF���f����-������b�r�%Z��1�_�"I�@�&x�F@��d�I�O�T�9�F�w34+Cj�@�8��Vxu��Z_=������g�~9}�����F�#���Ėz��?�4���w/}����O����~ T�œ_?��ٓ�|���<���6|@2,���$��2pLGŵ��IRDl��<(Gj���L���ȃkc7��9t����cp?�SI<���<`���Fᚚ�
+�`�'������D��7w�N~{�	�M�S�I�c�!E�D	α�7v��ǻ��8q= #���.	ڈxC2 C�M�=�A^f>!�NlnmF}^w񱋄�@�c�S'�W�T�̧r�2j|��gd�G6�'$d:���ᓹ��_+�נ���~@g����t�#�ld�uR�M|�>�S��8����I�����!(_���;�>�܂�i�� ��2�\^���oF��V}�����l�f��׸�U������w�e�p⭙��F��ܞ;������]4�1����9h��{ߜ����oɋ.
Zm�^[�3��{L(����B�,<�.*!}���)l�£*c����J�D�L���a�V��@�ٍ�؜-+�z�'��Q�PO��c�\e�7��5&*��4�
�Za�i��h�(���������>�S\�t�Z�s�;▢�R�in����	\P���MZ�Nc�M NB�SM�c$����e…�"���k*��!#󀒬n����\S�2��C���ל�e��uS����x����x$mfZ#��h5l
+���I0�S~
U+Q��8
g�ztR/pWU�տ r���Cd�O����X�NRd�S����$��Zp���u�3��
׆p?��Q��a/��C�f�Ws���eŬ�+ZgQ�C8�-�n*�-._�ެ��TT.F��uRa�۩�s*Tv& e	��|i�Yyp�Rk���Ц��fذv}<[Hy�^�(���l:�@��f��׭��ʹ�c��β�ڊ�Y���3�nY51���U��@OQ�T7>���!R��냻��Z�|'`Gy)`��Ӕ��@Z�-F]���𺦝��X�Dc�v)n��-�T�;��w�߹��2kah<��i�����6�]���S*����PK�N�@�Z���Iword/document.xml�\�o�����w��D+a2��pT�t���X��w������S @��p� u�
��h�F���ƴ����ݽ��MR6lǫ�����������^|�N��y�x"l8���S�+�^�o8�ݼ�����.�E��O���o�q1�w�;
+x(K@"L�i�6���Q�\N�
X�xn,ѓ�ʢ��\^NE�-oT�����I��Xx�G�������VO�
�ɺ�����Q��#&���{�hW��pFqX�Z�:�U�C��Ԉ�F1�]U�
j�s� �d�E�0V�C�.��a���ҨZ�j/�"kp9f),ENp�܌��J���
�7_�"�E��`�����6Љ��V�M���H�䅩�ϝ�
��&#��ȵX���;�w>j{�0����D�*[SCK�"0%��
�x֝(i�)��L��n���i����V$�W�,�Oy%����~(b��ali�VJ�J( NtWGt��3�1~9���YJ��o8�l��{!O
+���K1g�K4/��z]��D(c�~za"�#"�v+f=��=_��ЕT"E�MSA�
+Iю��/_�W��}z�x]�X�{����Ƚ�Ko%!�n�k��� �?��ن����z�1‰�VԴxa�=�3���,N��ۙ���H-�v�ͳ{�U	��{��6�B�h�V*�
+����1?���ϟ`'�a���P=6�ml����V�����֩
��tC��F^��,���ǰ��Ӎ�.�������?�����"�K6�?�+��x��Y�|^������.�ZI���D1Ox|ȝ&��ɿ��~���_���?K����"�iK�Z�Z�B��X��܇����+$��m�~�oO��E�[Z�����}#Z`@U� 5�ր��v�]��-�=sTU5�g6�B/��+V��S5�Lʎ�R	z�;~[����u]�5�G%z5�MP~���s�9U
+;��
݁���J:O�Ǧ7%,���?#��[��/�Ϋy�R>��]R�!��_��8m8۵
+�EE�n�;,{
����_�}
�
+��5�(ߧ����!�fB�qéaG���'
+�����	b�ڴy�Z�w���9_�?�Vx�~r�;�uv$F8�jq�{��ֲ�}�]����
+V~ֲ�Հ_��
+
��-�?����3��g�Q��!DAn��g� ����R�8U��
(��^�x�Œ����M;R���;Z�'g�2�r��d�2u�(��/�j�1��G4lD�V#�hL-�#�D�D4u\�:WK��U2�����C_��CBҦf�4��Z��6~
+v�~6��A���J�]!��^��;TjѼ��Gx���"H�l;�v~Ó�Sm�����0�04�	t�͏���
�Pp��������b�}���`U��@ȣ��=��Tٓ<hs������6ʢR������O���i��L�������<���+�cݖ�-�/��F�N˜�\�2�Â3F���
�2�w���y/��7�{����G��m>�Ђ7��Tv8Fv���������k�Q��t�k�}�W�LC���/�,�c��㻟>�����'_~����%���R~��
|(�򖈇�S�?�H�\�֪��KEJ��y�!C�@��}Θ�Q��v�˷����g��Z{�w��ܻ>M�����X��;:� �3F��r8�}�O"\� Xn��c�I����kF�@�K��lz������{^�E��`�g,��d���ȧ�)kEC��D��h���hE?����?����X+چt�#�{U4?�x��#�`"�<(Cqc�Y�5�'�q6��e��(�<�A��;hg �S���Ǟ=�
+������*E�� C�?������5�bs|�}p�=���ǟ��L۪A�8��Bt`q��(6�V���A�sS�2�R
+Wş�g��i���@���Tp��塵oِ����,,�� Oȶ�� 8/8�����9����6'�E����Ń�X0���u
+��5�[��aU0C�i�`jg�Va���*#Z]sAigMF���.<�:g
��8A�0俫�����`�
+����?Y߷�7�}Q�\��࠼V#����r��Q���?+-k~pI͐}�,�poE��١Ԑ�Hң�W@6x�����m���Q�����$L6�Qz5޸
����?<�B�1aJ\�V� 7&�*ma���2�/�B��oPK�N�@��Ӽ�	word/fontTable.xml�UAn�0�����)F� q#���=�2eI����
=�G?P�7���蒴�8�HB����],G3���o�
+�6\��c�&5�r��Ϸ�Q��P9���,Cf����7���T�1
�K3E�fMS��3&�9V5��TZ��4T��G�5m��W�Y�Ƨh�F��E�%/�;U����5����f�k����ӭUzRkU0c`Ϣ����
��	^heT��fB?Qh[A9��NT(���T*M�`ג],�ڡ���\0|`m�Q	*]BM�2�@��2�#�N�	�~��(���Ն5�؇K*x�XE����k��U��jn�5�O��܌q�����*M�����k�`(�����!�r
+�ǥ�<�9�>�*7g�)����_�����
� �����:o��o�0a%�W�6nX@{
C����n��	CE�0��M'7��_'8z6$��~�!��ׄXa�I��4ڟW�Ӫ�_b'+��O��rc���qD7�Ϡ�a�$\o�l!,��.rX6h���ſ�?v���x
]��];Y{N�Q���0���H�5g�Zf'��3�k��A�j´|R�+�Xk�H�i!ƪ[8+@pĈ�)��zzjtZDߩ��--��#��G�h�ǚ�0"wǦ��F�Kt����{�%�89�%�)��6`׆K,��\�PK
+�N�@_rels/PK�N�@
""��_rels/.rels���J1���!�}7�*"�loD�H}�!��
���L�}{������r2g�|s�zst�x��m�
+�U
����N���aq"3z�C��D6������2�{�(.>+�㝔Y��0W!�/�6$�\��Ɉz��U]��������ik�A�N�l��;���t����r�(Θ:b�!i>��r�fu>��JG���1��ے�7Pay,��]1�<h|�T<td��<�8Gt��D��9�y���}��
PK
+�N�@word/_rels/PK�N�@�P��word/_rels/document.xml.rels���j�0���}qҍ1F�^Ơב=��(�cK��OڵP�K.�O���C�v�3y����TE	
+���z����(bZ�c@3��ۛ�z��1��@���5�
'KEL���<Y�{����=�MY>�|�
���ڷ�}��I����]7:|��k��"t7�ã���#8�
+!}�~M��,R/ou�a�&!�����p�\C�VE���1A�>����
PK�N�@|�I~b
[Content_Types].xml���n�0E�����Ub袪*�>�-�
�3
�~�3P��Na
JQ7����X���fHh�/E������R�O^�{�!)_)<�b(F���d
3^��3�� %�8�E��y��)��4�Q�O5y���I<����1<A�斲�%^�$�(���ĆU
+�5Z�ʅ�v(��P��v�L��� ���Y���$SA6V�^�c
Y=N!�d��x�
�P�Fg�WP@��
+�<r$$2�u>��!���f���9Rp�3w6�ۘ_¿B����]]�u��5k@���l�Mv��������0Nԇ�C�;�l�OJ �<^�����
+���m�I<��}�/n��鐲�ӆ�PK
�N�@|�I~b

 +([Content_Types].xmlPK

+�N�@�%_rels/PK
�N�@
""��
 �%_rels/.relsPK

+�N�@	docProps/PK
�N�@N�N\
q
 'docProps/app.xmlPK
�N�@+J
}
 �
docProps/core.xmlPK
�N�@���r*

 *docProps/custom.xmlPK

+�N�@�word/PK

+�N�@�&word/_rels/PK
�N�@�P��
 
+'word/_rels/document.xml.relsPK
�N�@�Z���I
 �word/document.xmlPK
�N�@��Ӽ�	
 �"word/fontTable.xmlPK
�N�@S��ł�
+
 �word/settings.xmlPK
�N�@�%��	�e
 �word/styles.xmlPK

+�N�@[word/theme/PK
�N�@ݵ�
+�
 �word/theme/theme1.xmlPK��)
\ No newline at end of file
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs
index 29002a1c..c178df09 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecial.aspx.cs
@@ -1,4 +1,5 @@
 using Aspose.Words;
+using Aspose.Words.Tables;
 using BLL;
 using System;
 using System.Collections.Generic;
@@ -45,7 +46,7 @@ namespace FineUIPro.Web.HSSE.Check
                 Technique_CheckItemSetService.InitCheckItemSetDropDownList(this.drpSupCheckItemSet, "2", "0", true);
                 ////权限按钮方法
                 this.GetButtonPower();
-                btnNew.OnClientClick = Window1.GetShowReference("CheckSpecialEdit.aspx") + "return false;";
+                //btnNew.OnClientClick = Window1.GetShowReference("CheckSpecialEdit.aspx") + "return false;";
                 ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 BindGrid();
@@ -203,7 +204,9 @@ namespace FineUIPro.Web.HSSE.Check
                 }
                 else
                 {
-                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckSpecialEdit.aspx?CheckSpecialId={0}", CheckSpecialId, "编辑 - ")));
+                    //PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckSpecialEdit.aspx?CheckSpecialId={0}", CheckSpecialId, "编辑 - ")));
+                    //pc端只有台账
+                    PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("CheckSpecialView.aspx?CheckSpecialId={0}", CheckSpecialId, "查看 - ")));
                 }
             }
         }
@@ -254,7 +257,7 @@ namespace FineUIPro.Web.HSSE.Check
             {
                 if (buttonList.Contains(BLL.Const.BtnAdd))
                 {
-                    this.btnNew.Hidden = false;
+                    //this.btnNew.Hidden = false;
                 }
                 if (buttonList.Contains(BLL.Const.BtnModify))
                 {
@@ -357,7 +360,7 @@ namespace FineUIPro.Web.HSSE.Check
             initTemplatePath = "File\\Word\\HSSE\\专项检查.doc";
             uploadfilepath = rootPath + initTemplatePath;
             newUrl = uploadfilepath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".doc");
-            filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf");
+            //filePath = initTemplatePath.Replace(".doc", string.Format("{0:yyyy-MM}", DateTime.Now) + ".pdf");
             if (File.Exists(newUrl)) {
                 File.Delete(newUrl);
             }
@@ -427,6 +430,65 @@ namespace FineUIPro.Web.HSSE.Check
                 }
 
             }
+            Bookmark bookmarkWorkAreaName = doc.Range.Bookmarks["WorkAreaName"];
+            if (bookmarkWorkAreaName != null)
+            {
+                if (checkSpecial != null)
+                {
+                    if (!string.IsNullOrEmpty(checkSpecial.WorkAreaId))
+                    {
+                        bookmarkWorkAreaName.Text = UnitWorkService.GetUnitWorkName(checkSpecial.WorkAreaId);
+                    }
+
+                }
+
+            }
+
+            Bookmark bookmarkResponsibleName = doc.Range.Bookmarks["ResponsibleName"];
+            if (bookmarkResponsibleName != null)
+            {
+                if (checkSpecial != null)
+                {
+                    if (!string.IsNullOrEmpty(checkSpecial.ResponsibleUnit))
+                    {
+                        bookmarkResponsibleName.Text = UnitService.GetUnitNameByUnitId(checkSpecial.ResponsibleUnit);
+                    }
+
+                }
+
+            }
+
+            Bookmark bookmarkQuestionName = doc.Range.Bookmarks["QuestionName"];
+            if (bookmarkQuestionName != null)
+            {
+                if (checkSpecial != null)
+                {
+                    if (!string.IsNullOrEmpty(checkSpecial.QuestionType))
+                    {
+                        bookmarkQuestionName.Text = UnitService.GetQuestionTypeId(checkSpecial.QuestionType);
+                    }
+
+                }
+
+            }
+
+            Bookmark bookmarkPartInPersonNames = doc.Range.Bookmarks["PartInPersonNames"];
+            if (bookmarkPartInPersonNames != null)
+            {
+                if (checkSpecial != null)
+                {
+                    if (!string.IsNullOrEmpty(checkSpecial.PartInPersonNames))
+                    {
+                        bookmarkPartInPersonNames.Text = checkSpecial.PartInPersonNames;
+                    }
+
+                }
+
+            }
+            //WorkAreaName
+            //    ResponsibleName
+            //    QuestionName
+            //    PartInPersonNames
             //专项检查列表
             Aspose.Words.DocumentBuilder builder = new Aspose.Words.DocumentBuilder(doc);
             builder.MoveToBookmark("tab");
@@ -443,6 +505,57 @@ namespace FineUIPro.Web.HSSE.Check
                                        orderby x.SortIndex
                                        select x).ToList();
             int num = 1;
+            #region 插入表头
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 40;
+            builder.Write("序号");
+
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 100;
+            builder.Write("问题描述");
+
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 250;
+            builder.CellFormat.WrapText = true;
+            builder.Write("检查内容");
+
+            //builder.InsertCell();
+            //builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            //builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            //builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            //builder.CellFormat.Width = 60;
+            //builder.Write("处理结果");
+
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 60;
+            builder.Write("整改期限");
+
+            builder.InsertCell();
+            builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+            builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+            builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+            builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+            builder.CellFormat.Width = 60;
+            builder.Write("处理措施");
+            builder.EndRow();
+            #endregion
             foreach (Model.View_CheckSpecialDetail detail in checkSpecialDetails)
             {
                 //序号
@@ -451,80 +564,89 @@ namespace FineUIPro.Web.HSSE.Check
                 builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                 builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 20;
+                builder.CellFormat.Width = 40;
                 builder.Write(num.ToString());
-                //单位工程
-                builder.InsertCell();
-                builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
-                builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
-                builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
-                builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 55;
-                builder.Write(string.IsNullOrEmpty(detail.CheckAreaName) ? "" : detail.CheckAreaName);
-                //单位
-                builder.InsertCell();
-                builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
-                builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
-                builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
-                builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 120;
-                builder.Write(string.IsNullOrEmpty(detail.UnitName) ? "" : detail.UnitName);
+                ////单位工程
+                //builder.InsertCell();
+                //builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+                //builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+                //builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+                //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+                //builder.CellFormat.Width = 60;
+                //builder.Write(string.IsNullOrEmpty(detail.CheckAreaName) ? "" : detail.CheckAreaName);
+                ////单位
+                //builder.InsertCell();
+                //builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+                //builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+                //builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+                //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+                //builder.CellFormat.Width = 120;
+                //builder.Write(string.IsNullOrEmpty(detail.UnitName) ? "" : detail.UnitName);
                 //问题描述
                 builder.InsertCell();
                 builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                 builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                 builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 40;
-                builder.Write(string.IsNullOrEmpty(detail.Unqualified) ? "" : detail.Unqualified);
-                //问题类型
-                builder.InsertCell();
-                builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
-                builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
-                builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
-                builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
                 builder.CellFormat.Width = 100;
-                builder.Write(string.IsNullOrEmpty(detail.CheckItemName)?"": detail.CheckItemName);
+                builder.Write(string.IsNullOrEmpty(detail.Unqualified) ? "" : detail.Unqualified);
+                //问题内容
+                builder.InsertCell();
+                builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+                builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+                builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+                builder.ParagraphFormat.Alignment = ParagraphAlignment.Left;//水平居中对齐
+                builder.CellFormat.Width = 250;
+                builder.CellFormat.WrapText = true;
+                builder.Write(string.IsNullOrEmpty(detail.CheckItemSetContent)?"": detail.CheckItemSetContent);
 
-                //处理结果
+                ////处理结果
+                //builder.InsertCell();
+                //builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
+                //builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
+                //builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
+                //builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
+                //builder.CellFormat.Width = 60;
+                //builder.Write(string.IsNullOrEmpty(detail.CompleteStatusName) ? "" : detail.CompleteStatusName);
+                //整改期限
                 builder.InsertCell();
                 builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                 builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                 builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 50;
-                builder.Write(string.IsNullOrEmpty(detail.CompleteStatusName) ? "" : detail.CompleteStatusName);
+                builder.CellFormat.Width = 60;
+                builder.Write(string.Format("{0:yyyy-MM-dd}", detail.Rectification_Date)); 
                 //隐患类别
                 builder.InsertCell();
                 builder.CellFormat.VerticalMerge = Aspose.Words.Tables.CellMerge.None;
                 builder.CellFormat.HorizontalMerge = Aspose.Words.Tables.CellMerge.First;
                 builder.CellFormat.VerticalAlignment = Aspose.Words.Tables.CellVerticalAlignment.Center;//垂直居中对齐
                 builder.ParagraphFormat.Alignment = ParagraphAlignment.Center;//水平居中对齐
-                builder.CellFormat.Width = 50;
-                builder.Write(string.IsNullOrEmpty(detail.HiddenHazardTypeName) ? "" : detail.HiddenHazardTypeName);
+                builder.CellFormat.Width = 60;
+                builder.Write(string.IsNullOrEmpty(detail.HandleStepLink) ? "" : detail.HandleStepLink);
                 builder.EndRow();
                 num++;
             }
             builder.EndTable();
             doc.Save(newUrl);
             //生成PDF文件
-            string pdfUrl = newUrl.Replace(".doc", ".pdf");
+            //string pdfUrl = newUrl.Replace(".doc", ".pdf");
             Document doc1 = new Aspose.Words.Document(newUrl);
             //验证参数
-            if (doc1 == null) { throw new Exception("Word文件无效"); }
-            doc1.Save(pdfUrl, Aspose.Words.SaveFormat.Pdf);//还可以改成其它格式
-            string fileName = Path.GetFileName(filePath);
-            FileInfo info = new FileInfo(pdfUrl);
+            //if (doc1 == null) { throw new Exception("Word文件无效"); }
+            //doc1.Save(pdfUrl, Aspose.Words.SaveFormat.Pdf);//还可以改成其它格式
+            string fileName = Path.GetFileName(newUrl);
+            FileInfo info = new FileInfo(newUrl);
             long fileSize = info.Length;
             Response.Clear();
             Response.ContentType = "application/x-zip-compressed";
             Response.AddHeader("Content-Disposition", "attachment;filename=" + System.Web.HttpUtility.UrlEncode(fileName, System.Text.Encoding.UTF8));
             Response.AddHeader("Content-Length", fileSize.ToString());
-            Response.TransmitFile(pdfUrl, 0, fileSize);
+            Response.TransmitFile(newUrl, 0, fileSize);
             Response.Flush();
             Response.Close();
             File.Delete(newUrl);
-            File.Delete(pdfUrl);
+            //File.Delete(pdfUrl);
         }
         #endregion
     }
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx
index 3e87226e..4eb70936 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx
+++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx
@@ -33,6 +33,18 @@
                     </f:TextBox>
                 </Items>
             </f:FormRow>
+
+            <f:FormRow>
+                <Items>
+                     <f:TextBox ID="txtResponsibleUnit" runat="server" Label="受检单位" Readonly="true">
+                    </f:TextBox>
+                    <f:TextBox ID="txtWorkAreaId" runat="server" Label="单位工程" Readonly="true" Width="200px">
+                    </f:TextBox>
+                      <f:TextBox ID="txtQuestionType" runat="server" Label="问题类型" Readonly="true">
+                    </f:TextBox>
+                </Items>
+            </f:FormRow>
+
             <f:FormRow>
                 <Items>
                      <f:TextBox ID="txtPartInPersons" runat="server" Label="参检人员" Readonly="true" MaxLength="200">
@@ -50,28 +62,28 @@
                         <Columns>      
                             <f:RowNumberField EnablePagingNumber="true" HeaderText="序号" Width="50px" HeaderTextAlign="Center"
                                   TextAlign="Center" />
-                            <f:RenderField Width="130px" ColumnID="CheckAreaName" DataField="CheckAreaName" SortField="CheckAreaName"
+                         <%--   <f:RenderField Width="130px" ColumnID="CheckAreaName" DataField="CheckAreaName" SortField="CheckAreaName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="单位工程">
-                            </f:RenderField>
-                            <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
+                            </f:RenderField>--%>
+                          <%--  <f:RenderField Width="240px" ColumnID="UnitName" DataField="UnitName" SortField="UnitName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="受检单位">
-                            </f:RenderField>
-                                  <f:RenderField Width="200px" ColumnID="Unqualified" DataField="Unqualified" SortField="Unqualified"
+                            </f:RenderField>--%>
+                        <f:RenderField Width="200px" ColumnID="Unqualified" DataField="Unqualified" SortField="Unqualified"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题描述" >                              
                             </f:RenderField>
-                            <f:RenderField Width="160px" ColumnID="CheckItemName" DataField="CheckItemName" SortField="CheckItemName"
+                          <%--  <f:RenderField Width="160px" ColumnID="CheckItemName" DataField="CheckItemName" SortField="CheckItemName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="问题类型">                                
-                            </f:RenderField>
-                            <f:RenderField Width="250px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" SortField="CheckItemSetContent"
+                            </f:RenderField>--%>
+                            <f:RenderField Width="650px" ColumnID="CheckItemSetContent" DataField="CheckItemSetContent" SortField="CheckItemSetContent"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="检查内容">                                
                             </f:RenderField>
                             <f:RenderField Width="160px" ColumnID="Rectification_Date" DataField="Rectification_Date" SortField="Rectification_Date"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="整改期限">                                
                             </f:RenderField>
 
-                            <f:RenderField Width="80px" ColumnID="CompleteStatusName" DataField="CompleteStatusName" SortField="CompleteStatusName"
+                           <%-- <f:RenderField Width="80px" ColumnID="CompleteStatusName" DataField="CompleteStatusName" SortField="CompleteStatusName"
                                 FieldType="String" HeaderTextAlign="Center" TextAlign="Left" HeaderText="处理结果">
-                            </f:RenderField>   
+                            </f:RenderField>   --%>
                             <f:LinkButtonField Width="150px" ColumnID="HandleStepLink" DataTextField="HandleStepLink" DataToolTipField="HandleStepLink" HeaderText="处理措施"
                                  CommandName="click" EnableAjax="false"  />                            
                             <f:RenderField Width="80px" ColumnID="HiddenHazardTypeName" DataField="HiddenHazardTypeName" SortField="HiddenHazardTypeName"
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs
index 523b09c0..ae8ccfb0 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.cs
@@ -66,6 +66,10 @@ namespace FineUIPro.Web.HSSE.Check
                                            where x.CheckSpecialId == this.CheckSpecialId
                                            orderby x.UnitName, x.SortIndex
                                            select x).ToList();
+                    //新增加的三项
+                    this.txtResponsibleUnit.Text = UnitService.GetUnitNameByUnitId(checkSpecial.ResponsibleUnit);
+                    this.txtWorkAreaId.Text = UnitWorkService.GetUnitWorkName(checkSpecial.WorkAreaId);
+                    this.txtQuestionType.Text = UnitService.GetQuestionTypeId(checkSpecial.QuestionType);
                 }
                 Grid1.DataSource = checkSpecialDetails;
                 Grid1.DataBind();
diff --git a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs
index eb5b15b4..e9ca0ba9 100644
--- a/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs
+++ b/SGGL/FineUIPro.Web/HSSE/Check/CheckSpecialView.aspx.designer.cs
@@ -7,11 +7,13 @@
 // </自动生成>
 //------------------------------------------------------------------------------
 
-namespace FineUIPro.Web.HSSE.Check {
-    
-    
-    public partial class CheckSpecialView {
-        
+namespace FineUIPro.Web.HSSE.Check
+{
+
+
+    public partial class CheckSpecialView
+    {
+
         /// <summary>
         /// form1 控件。
         /// </summary>
@@ -20,7 +22,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::System.Web.UI.HtmlControls.HtmlForm form1;
-        
+
         /// <summary>
         /// PageManager1 控件。
         /// </summary>
@@ -29,7 +31,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.PageManager PageManager1;
-        
+
         /// <summary>
         /// SimpleForm1 控件。
         /// </summary>
@@ -38,7 +40,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Form SimpleForm1;
-        
+
         /// <summary>
         /// txtCheckSpecialCode 控件。
         /// </summary>
@@ -47,7 +49,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckSpecialCode;
-        
+
         /// <summary>
         /// rbType 控件。
         /// </summary>
@@ -56,7 +58,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.RadioButtonList rbType;
-        
+
         /// <summary>
         /// txtSupCheckItemSet 控件。
         /// </summary>
@@ -65,7 +67,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtSupCheckItemSet;
-        
+
         /// <summary>
         /// txtCheckDate 控件。
         /// </summary>
@@ -74,7 +76,34 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtCheckDate;
-        
+
+        /// <summary>
+        /// txtResponsibleUnit 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtResponsibleUnit;
+
+        /// <summary>
+        /// txtWorkAreaId 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtWorkAreaId;
+
+        /// <summary>
+        /// txtQuestionType 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.TextBox txtQuestionType;
+
         /// <summary>
         /// txtPartInPersons 控件。
         /// </summary>
@@ -83,7 +112,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPartInPersons;
-        
+
         /// <summary>
         /// txtPartInPersonNames 控件。
         /// </summary>
@@ -92,7 +121,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.TextBox txtPartInPersonNames;
-        
+
         /// <summary>
         /// Grid1 控件。
         /// </summary>
@@ -101,7 +130,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Grid Grid1;
-        
+
         /// <summary>
         /// Toolbar1 控件。
         /// </summary>
@@ -110,7 +139,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Toolbar Toolbar1;
-        
+
         /// <summary>
         /// lbTemp 控件。
         /// </summary>
@@ -119,7 +148,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Label lbTemp;
-        
+
         /// <summary>
         /// btnAttachUrl 控件。
         /// </summary>
@@ -128,7 +157,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnAttachUrl;
-        
+
         /// <summary>
         /// ToolbarFill1 控件。
         /// </summary>
@@ -137,7 +166,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.ToolbarFill ToolbarFill1;
-        
+
         /// <summary>
         /// btnClose 控件。
         /// </summary>
@@ -146,7 +175,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Button btnClose;
-        
+
         /// <summary>
         /// hdId 控件。
         /// </summary>
@@ -155,7 +184,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdId;
-        
+
         /// <summary>
         /// hdAttachUrl 控件。
         /// </summary>
@@ -164,7 +193,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.HiddenField hdAttachUrl;
-        
+
         /// <summary>
         /// WindowAtt 控件。
         /// </summary>
@@ -173,7 +202,7 @@ namespace FineUIPro.Web.HSSE.Check {
         /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
         /// </remarks>
         protected global::FineUIPro.Window WindowAtt;
-        
+
         /// <summary>
         /// Window1 控件。
         /// </summary>
diff --git a/SGGL/FineUIPro.Web/HSSE/InformationAnalysis/CheckAnalysis.aspx.cs b/SGGL/FineUIPro.Web/HSSE/InformationAnalysis/CheckAnalysis.aspx.cs
index 7ca15220..e1888b58 100644
--- a/SGGL/FineUIPro.Web/HSSE/InformationAnalysis/CheckAnalysis.aspx.cs
+++ b/SGGL/FineUIPro.Web/HSSE/InformationAnalysis/CheckAnalysis.aspx.cs
@@ -59,37 +59,66 @@ namespace FineUIPro.Web.HSSE.InformationAnalysis
             dtCheck.Columns.Add("检查类型", typeof(string));
             dtCheck.Columns.Add("数量", typeof(string));
 
-            List<Model.SpResourceCollection> newCheckAnalyseView = new List<Model.SpResourceCollection>();
-            var checkAnalyseView = from x in Funs.DB.View_CheckAnalysis
-                                   where x.ProjectId == this.ProjectId
-                                   select x;
-            if (!string.IsNullOrEmpty(this.txtStarTime.Text))
-            {
-                checkAnalyseView = checkAnalyseView.Where(x => x.CheckTime >= Funs.GetNewDateTime(this.txtStarTime.Text));
-            }
-            if (!string.IsNullOrEmpty(this.txtEndTime.Text))
-            {
-                checkAnalyseView = checkAnalyseView.Where(x => x.CheckTime <= Funs.GetNewDateTime(this.txtEndTime.Text));
-            }
-            if (checkAnalyseView.Count() > 0)
-            {
-                foreach (var item in checkAnalyseView)
-                {
-                    Model.SpResourceCollection view = new Model.SpResourceCollection
-                    {
-                        UnitName = BLL.Check_ProjectCheckItemSetService.ConvertCheckItemType(item.CheckItem),
-                        TotalCount = 1
-                    };
-                    newCheckAnalyseView.Add(view);
-                }
-            }
+            //List<Model.SpResourceCollection> newCheckAnalyseView = new List<Model.SpResourceCollection>();
+            //var checkAnalyseView = from x in Funs.DB.View_CheckAnalysis
+            //                       where x.ProjectId == this.ProjectId
+            //                       select x;
+            //if (!string.IsNullOrEmpty(this.txtStarTime.Text))
+            //{
+            //    checkAnalyseView = checkAnalyseView.Where(x => x.CheckTime >= Funs.GetNewDateTime(this.txtStarTime.Text));
+            //}
+            //if (!string.IsNullOrEmpty(this.txtEndTime.Text))
+            //{
+            //    checkAnalyseView = checkAnalyseView.Where(x => x.CheckTime <= Funs.GetNewDateTime(this.txtEndTime.Text));
+            //}
+            //if (checkAnalyseView.Count() > 0)
+            //{
+            //    foreach (var item in checkAnalyseView)
+            //    {
+            //        Model.SpResourceCollection view = new Model.SpResourceCollection
+            //        {
+            //            UnitName = BLL.Check_ProjectCheckItemSetService.ConvertCheckItemType(item.CheckItem),
+            //            TotalCount = 1
+            //        };
+            //        newCheckAnalyseView.Add(view);
+            //    }
+            //}
 
-            var checkType = newCheckAnalyseView.Select(x => x.UnitName).Distinct();
-            foreach (var itemType in checkType)
+            //var checkType = newCheckAnalyseView.Select(x => x.UnitName).Distinct();
+            string[] TypeArray = { "HSE巡检", "专项检查", "综合检查", "开工前检查", "季节性/节假日前检查" };
+            #region 加载各项数据的子数据
+            var count1 = Funs.DB.View_Hazard_HazardRegister.Where(x => x.ProjectId == this.ProjectId).ToList().Count();
+
+            var count2 = (from x in Funs.DB.Check_CheckSpecialDetail
+                          join y in Funs.DB.Check_CheckSpecial on x.CheckSpecialId equals y.CheckSpecialId
+                          select x).ToList().Count();
+
+            var count3 = (from x in Funs.DB.Check_CheckColligationDetail
+                          join y in Funs.DB.Check_CheckColligation on x.CheckColligationId equals y.CheckColligationId
+                          where y.ProjectId == this.ProjectId
+                          select x).ToList().Count();
+
+            var count4 = (from x in Funs.DB.Check_CheckWorkDetail
+                          join y in Funs.DB.Check_CheckWork on x.CheckWorkId equals y.CheckWorkId
+                          where y.ProjectId == this.ProjectId
+                          select x).ToList().Count;
+
+            var count5 = (from x in Funs.DB.Check_CheckHolidayDetail
+                          join y in Funs.DB.Check_CheckHoliday on x.CheckHolidayId equals y.CheckHolidayId
+                          select x).ToList().Count();
+
+            List<CheckAnalysisModel> list = new List<CheckAnalysisModel>();
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[0], count = count1 });
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[1], count = count2 });
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[2], count = count3 });
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[3], count = count4 });
+            list.Add(new CheckAnalysisModel() { itemType = TypeArray[4], count = count5 });
+            #endregion
+            foreach (var itemType in list)
             {
                 DataRow rowUnit = dtCheck.NewRow();
-                rowUnit["检查类型"] = itemType;
-                rowUnit["数量"] = newCheckAnalyseView.Where(x => x.UnitName == itemType).Count();
+                rowUnit["检查类型"] = itemType.itemType;
+                rowUnit["数量"] = itemType.count;
                 dtCheck.Rows.Add(rowUnit);
             }
 
@@ -97,6 +126,11 @@ namespace FineUIPro.Web.HSSE.InformationAnalysis
             this.gvCheck.DataBind();
             this.ChartCostTime.CreateChart(BLL.ChartControlService.GetDataSourceChart(dtCheck, "危险因素分析", this.drpChartType.SelectedValue, 1150, 450, this.ckbShow.Checked));
         }
+
+        public class CheckAnalysisModel {
+            public string itemType { get; set; }
+            public int count { get; set; }
+        }
         #endregion
 
         #region 统计查询
diff --git a/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs b/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs
index b5539e84..8d6f8c13 100644
--- a/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs
+++ b/SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs
@@ -203,5 +203,9 @@ namespace Model
         /// </summary>
         public string Rectification_Date { get; set; }
 
+        /// <summary>
+        /// 处理意见
+        /// </summary>
+        public string CheckOpinions { get; set; }
     }
 }
diff --git a/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs b/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs
index 91f4f824..bda13b16 100644
--- a/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs
+++ b/SGGL/Model/APIItem/HSSE/CheckSpecialItem.cs
@@ -180,5 +180,65 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        ///  受检单位
+        /// </summary>
+        public string ResponsibleUnit
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  受检单位
+        /// </summary>
+        public string ResponsibleUnitName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  单位工程ID
+        /// </summary>
+        public string WorkAreaId
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  单位工程ID
+        /// </summary>
+        public string WorkAreaName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  问题类型
+        /// </summary>
+        public string QuestionType
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        ///  问题类型
+        /// </summary>
+        public string QuestionTypeName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 审核人
+        /// </summary>
+        public string ResponsibleMan { get; set; }
+
+        /// <summary>
+        /// 审核状态
+        /// </summary>
+        public string AuditState { get; set; }
+
     }
 }
diff --git a/SGGL/Model/Model.cs b/SGGL/Model/Model.cs
index f3139172..339bc509 100644
--- a/SGGL/Model/Model.cs
+++ b/SGGL/Model/Model.cs
@@ -59583,6 +59583,14 @@ namespace Model
 		
 		private string _CheckItemSetId;
 		
+		private string _ResponsibleUnit;
+		
+		private string _WorkAreaId;
+		
+		private string _QuestionType;
+		
+		private string _ResponsibleMan;
+		
 		private EntityRef<Base_Project> _Base_Project;
 		
 		private EntityRef<Technique_CheckItemSet> _Technique_CheckItemSet;
@@ -59623,6 +59631,14 @@ namespace Model
     partial void OnPartInPersonNamesChanged();
     partial void OnCheckItemSetIdChanging(string value);
     partial void OnCheckItemSetIdChanged();
+    partial void OnResponsibleUnitChanging(string value);
+    partial void OnResponsibleUnitChanged();
+    partial void OnWorkAreaIdChanging(string value);
+    partial void OnWorkAreaIdChanged();
+    partial void OnQuestionTypeChanging(string value);
+    partial void OnQuestionTypeChanged();
+    partial void OnResponsibleManChanging(string value);
+    partial void OnResponsibleManChanged();
     #endregion
 		
 		public Check_CheckSpecial()
@@ -59960,6 +59976,86 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleUnit", DbType="NVarChar(50)")]
+		public string ResponsibleUnit
+		{
+			get
+			{
+				return this._ResponsibleUnit;
+			}
+			set
+			{
+				if ((this._ResponsibleUnit != value))
+				{
+					this.OnResponsibleUnitChanging(value);
+					this.SendPropertyChanging();
+					this._ResponsibleUnit = value;
+					this.SendPropertyChanged("ResponsibleUnit");
+					this.OnResponsibleUnitChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WorkAreaId", DbType="NVarChar(50)")]
+		public string WorkAreaId
+		{
+			get
+			{
+				return this._WorkAreaId;
+			}
+			set
+			{
+				if ((this._WorkAreaId != value))
+				{
+					this.OnWorkAreaIdChanging(value);
+					this.SendPropertyChanging();
+					this._WorkAreaId = value;
+					this.SendPropertyChanged("WorkAreaId");
+					this.OnWorkAreaIdChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_QuestionType", DbType="NVarChar(50)")]
+		public string QuestionType
+		{
+			get
+			{
+				return this._QuestionType;
+			}
+			set
+			{
+				if ((this._QuestionType != value))
+				{
+					this.OnQuestionTypeChanging(value);
+					this.SendPropertyChanging();
+					this._QuestionType = value;
+					this.SendPropertyChanged("QuestionType");
+					this.OnQuestionTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ResponsibleMan", DbType="NVarChar(50)")]
+		public string ResponsibleMan
+		{
+			get
+			{
+				return this._ResponsibleMan;
+			}
+			set
+			{
+				if ((this._ResponsibleMan != value))
+				{
+					this.OnResponsibleManChanging(value);
+					this.SendPropertyChanging();
+					this._ResponsibleMan = value;
+					this.SendPropertyChanged("ResponsibleMan");
+					this.OnResponsibleManChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecial_Base_Project", Storage="_Base_Project", ThisKey="ProjectId", OtherKey="ProjectId", IsForeignKey=true)]
 		public Base_Project Base_Project
 		{
@@ -60099,6 +60195,8 @@ namespace Model
 		
 		private System.Nullable<System.DateTime> _Rectification_Date;
 		
+		private string _CheckOpinions;
+		
 		private EntityRef<Base_Unit> _Base_Unit;
 		
 		private EntityRef<WBS_UnitWork> _WBS_UnitWork;
@@ -60151,6 +60249,8 @@ namespace Model
     partial void OnCheckItemSetContentChanged();
     partial void OnRectification_DateChanging(System.Nullable<System.DateTime> value);
     partial void OnRectification_DateChanged();
+    partial void OnCheckOpinionsChanging(string value);
+    partial void OnCheckOpinionsChanged();
     #endregion
 		
 		public Check_CheckSpecialDetail()
@@ -60608,6 +60708,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CheckOpinions", DbType="NVarChar(2000)")]
+		public string CheckOpinions
+		{
+			get
+			{
+				return this._CheckOpinions;
+			}
+			set
+			{
+				if ((this._CheckOpinions != value))
+				{
+					this.OnCheckOpinionsChanging(value);
+					this.SendPropertyChanging();
+					this._CheckOpinions = value;
+					this.SendPropertyChanged("CheckOpinions");
+					this.OnCheckOpinionsChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Check_CheckSpecialDetail_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
 		public Base_Unit Base_Unit
 		{
diff --git a/SGGL/WebAPI/Controllers/PersonController.cs b/SGGL/WebAPI/Controllers/PersonController.cs
index 71118084..a146cd00 100644
--- a/SGGL/WebAPI/Controllers/PersonController.cs
+++ b/SGGL/WebAPI/Controllers/PersonController.cs
@@ -1083,5 +1083,28 @@ namespace WebAPI.Controllers
             return responeData;
         }
         #endregion
+
+        #region 二维码扫码获取人员
+        /// <summary>
+        /// 二维码扫码获取人员
+        /// </summary>
+        /// <param name="personId"></param>
+        /// <returns></returns>
+        public Model.ResponeData getPersonByPersonIdQrcode(string personId)
+        {
+            var responeData = new Model.ResponeData();
+            try
+            {
+                responeData.data = APIPersonService.getPersonByPersonIdQrcode(personId);
+            }
+            catch (Exception ex)
+            {
+                responeData.code = 0;
+                responeData.message = ex.Message;
+            }
+
+            return responeData;
+        }
+        #endregion
     }
 }
\ No newline at end of file