From b86413a21cb8ecce7e36fb4927906a26df0a1265 Mon Sep 17 00:00:00 2001 From: lsm Date: Thu, 26 Dec 2024 15:24:58 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=9B=A2=E4=BD=93=E8=81=8C=E4=B8=9A?= =?UTF-8?q?=E7=97=85=E7=99=BB=E8=AE=B0=EF=BC=9B2=E3=80=81=E4=B8=AA?= =?UTF-8?q?=E4=BA=BA=E8=81=8C=E4=B8=9A=E7=97=85=E7=99=BB=E8=AE=B0=EF=BC=9B?= =?UTF-8?q?3=E3=80=81=E8=81=8C=E4=B8=9A=E7=97=85=E5=9B=A2=E4=BD=93?= =?UTF-8?q?=E6=96=B0=E5=BB=BA=E5=88=86=E7=BB=84=E6=97=B6=E5=90=8C=E6=97=B6?= =?UTF-8?q?=E6=8F=92=E5=85=A5=E6=A0=87=E5=87=86=E6=A3=80=E6=9F=A5=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=EF=BC=9B4=E3=80=81=E8=81=8C=E4=B8=9A=E7=97=85?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=99=BB=E8=AE=B0=E5=AE=8C=E6=88=90=E5=90=8E?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8F=92=E5=85=A5=E6=A0=87=E5=87=86=E6=A3=80?= =?UTF-8?q?=E6=9F=A5=E9=A1=B9=E7=9B=AE=EF=BC=9B5=E3=80=81=E7=A7=91?= =?UTF-8?q?=E5=AE=A4=E5=88=86=E6=A3=80=E8=B0=83=E7=94=A8=E8=81=8C=E4=B8=9A?= =?UTF-8?q?=E7=97=85=E9=97=AE=E8=AF=8A=EF=BC=9B6=E3=80=81=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E7=A7=91=E5=AE=A1=E6=A0=B8=E5=BF=BD=E7=95=A5=E4=B9=99?= =?UTF-8?q?=E8=82=9D=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Entity/BasePatient.cs | 21 + PEIS/Entity/EnrollmentFeeItem.cs | 1 + PEIS/Entity/EnrollmentOrg.cs | 2 +- PEIS/Entity/EnrollmentOrgFeeItem.cs | 1 + PEIS/Entity/EnrollmentPatient.cs | 4 + PEIS/Model/CacheDataModel.cs | 14 + .../Enrollment/EnrollentOrgGroupModel.cs | 12 +- .../Enrollment/EnrollmentOrgFeeItemModel.cs | 2 +- PEIS/Model/Enrollment/EnrollmentOrgModel.cs | 7 +- .../Enrollment/EnrollmentPatientModel.cs | 14 +- PEIS/Properties/licenses.licx | 3 + PEIS/ReportFiles/PReport.frx | 12 +- PEIS/Utils/ExcelHelper.cs | 16 +- PEIS/Utils/Global.cs | 5 + .../Enrollment/EnrollmentOrgForm.Designer.cs | 152 ++--- PEIS/View/Enrollment/EnrollmentOrgForm.cs | 99 ++- PEIS/View/Enrollment/EnrollmentOrgForm.resx | 595 +++++++++--------- PEIS/View/Enrollment/EnrollmentPersonForm.cs | 6 + .../NewEnrollmentPersonForm.Designer.cs | 165 ++++- .../Enrollment/NewEnrollmentPersonForm.cs | 163 ++++- .../Enrollment/NewEnrollmentPersonForm.resx | 9 + PEIS/View/Exam/PartForm.Designer.cs | 26 +- PEIS/View/Exam/PartForm.cs | 22 + PEIS/View/Exam/PartForm.resx | 75 ++- 24 files changed, 947 insertions(+), 479 deletions(-) diff --git a/PEIS/Entity/BasePatient.cs b/PEIS/Entity/BasePatient.cs index 8cc0091..f82d901 100644 --- a/PEIS/Entity/BasePatient.cs +++ b/PEIS/Entity/BasePatient.cs @@ -52,6 +52,22 @@ namespace PEIS.Entity [RefFlag(true)] public String ImportErrorInfo { get; set; } + // 在岗情况 + [RefFlag(true)] + public String JobStatus { get; set; } + // 危害因素 + [RefFlag(true)] + public String HazardFactors { get; set; } + // 工种 + [RefFlag(true)] + public String JobTypes { get; set; } + // 工龄 + [RefFlag(true)] + public String WorkYears { get; set; } + // 接害工龄 + [RefFlag(true)] + public String HazardYears { get; set; } + #endregion other public BasePatient() @@ -84,6 +100,11 @@ namespace PEIS.Entity ExamDate = item.ExamDate; ExamType = item.Type; Company = item.Company; + JobTypes = item.JobTypes; + JobStatus = item.JobStatus; + WorkYears = item.WorkYears; + HazardYears = item.HazardYears; + HazardFactors = item.HazardFactors; } diff --git a/PEIS/Entity/EnrollmentFeeItem.cs b/PEIS/Entity/EnrollmentFeeItem.cs index f8d353a..6577d8a 100644 --- a/PEIS/Entity/EnrollmentFeeItem.cs +++ b/PEIS/Entity/EnrollmentFeeItem.cs @@ -36,6 +36,7 @@ namespace PEIS.Entity public String GiveUpCode { get; set; } public String KeyNo { get; set; } public bool? IsSend{ get; set; } + public bool IsOccupational { get; set; } [RefFlag(true)] public Decimal Fee { get; set; } diff --git a/PEIS/Entity/EnrollmentOrg.cs b/PEIS/Entity/EnrollmentOrg.cs index 5b3b331..0b71037 100644 --- a/PEIS/Entity/EnrollmentOrg.cs +++ b/PEIS/Entity/EnrollmentOrg.cs @@ -26,6 +26,6 @@ namespace PEIS.Entity public String SpellCode { get; set; } // 是否职业病团体 - public bool? IsOccupational { get; set; } + public bool IsOccupational { get; set; } } } \ No newline at end of file diff --git a/PEIS/Entity/EnrollmentOrgFeeItem.cs b/PEIS/Entity/EnrollmentOrgFeeItem.cs index 13e33d3..e3b716b 100644 --- a/PEIS/Entity/EnrollmentOrgFeeItem.cs +++ b/PEIS/Entity/EnrollmentOrgFeeItem.cs @@ -31,5 +31,6 @@ namespace PEIS.Entity public Int32? Seq { get; set; } public Int64? OID { get; set; } public String KeyNo { get; set; } + public bool IsOccupational { get; set; } } } \ No newline at end of file diff --git a/PEIS/Entity/EnrollmentPatient.cs b/PEIS/Entity/EnrollmentPatient.cs index eb5bd36..4b71156 100644 --- a/PEIS/Entity/EnrollmentPatient.cs +++ b/PEIS/Entity/EnrollmentPatient.cs @@ -62,6 +62,10 @@ namespace PEIS.Entity public String HazardFactors { get; set; } // 工种 public String JobTypes { get; set; } + // 工龄 + public String WorkYears { get; set; } + // 接害工龄 + public String HazardYears { get; set; } /// /// 0：默认值，体检客户端登记； diff --git a/PEIS/Model/CacheDataModel.cs b/PEIS/Model/CacheDataModel.cs index dd52864..7d0463c 100644 --- a/PEIS/Model/CacheDataModel.cs +++ b/PEIS/Model/CacheDataModel.cs @@ -35,6 +35,7 @@ namespace LIS.Model ThreadPool.QueueUserWorkItem(state => CacheDataModel.GetConclusions()); ThreadPool.QueueUserWorkItem(state => CacheDataModel.GetSign()); ThreadPool.QueueUserWorkItem(state => CacheDataModel.GetAllDeptList()); + ThreadPool.QueueUserWorkItem(state => CacheDataModel.GetHazardType()); } catch { @@ -67,6 +68,19 @@ namespace LIS.Model "SELECT hisCode AS DeptCode, RTRIM(name) AS DeptName FROM Dict_Dept WHERE hisCode<>'' ORDER BY Seq"); } + public static void GetHazardType() + { + Global._lstDictHazardTypes = DAOHelp.GetDataBySQL($@"SELECT + Name,ParentID + FROM Dict_HazardType WHERE ParentID IS NULL + UNION ALL + SELECT + Name, 0 AS 'ParentID' + FROM Dict_HazardType + WHERE ID NOT IN(SELECT ParentID FROM Dict_HazardType WHERE ParentID IS NOT NULL GROUP BY ParentID) + AND ParentID IS NOT NULL GROUP BY Name"); + } + //public static void GetHospitalCode() //{ // DataRowCollection rows = DAOHelp.GetDataBySQL("select * from dict_hospital").Rows; diff --git a/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs b/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs index 89c6309..a0f7dc3 100644 --- a/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs +++ b/PEIS/Model/Enrollment/EnrollentOrgGroupModel.cs @@ -41,12 +41,20 @@ namespace PEIS.Model.Enrollment { var list = DAOHelp.GetDataBySQL($"SELECT a.*, b.Name,b.Birthday,b.CardType, b.CardNo,b.Education, b.Marriage,b.Nation, b.Tel1, b.Tel2, CASE b.Sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '' END AS Sex FROM Enrollment_OrgPatient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE GroupID = {item.ID} AND OID = {item.OID}"); if (list.Count != 0){ - Global.Msg("info", "当前分组已存在人员！"); + Global.Msg("info", $@"当前{item.Name}分组已存在人员！"); return; } - DAOHelp.ExecuteSql($@"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}', Description= '{item.Description}', Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}', + if (item.Type.Contains("职业")) + { + DAOHelp.ExecuteSql($@"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}',Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}', JobStatus = '{item.JobStatus}', JobTypes = '{item.JobTypes}', HazardFactors = '{item.HazardFactors}' WHERE ID= {item.ID}", false); + } + else + { + DAOHelp.ExecuteSql($@"UPDATE ENROLLMENT_ORGGROUP SET Name= '{item.Name}',Sex= '{item.Sex}', Marriage= '{item.Marriage}', AgeMin= {item.AgeMin}, AgeMax= {item.AgeMax}, Type= '{item.Type}' WHERE ID= {item.ID}", false); + } + } } } \ No newline at end of file diff --git a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs index 56362df..57eb465 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgFeeItemModel.cs @@ -33,7 +33,7 @@ namespace PEIS.Model.Enrollment public List GetItems(Int64 groupID) { - return DAOHelp.GetDataBySQL($"SELECT ID, GroupID, PackId, PackName, FID,FeeItemCode, FeeItemName, Quantity, Unit,Price, SettlePrice, ItemClass, CreateTime, Creator, DeptCode, DeptName, KeyNo FROM Enrollment_OrgFeeItem WHERE GroupID = {groupID} Order by PackID, ItemClass, DeptCode, FeeItemCode"); + return DAOHelp.GetDataBySQL($"SELECT ID, GroupID, PackId, PackName, FID,FeeItemCode, FeeItemName, Quantity, Unit,Price, SettlePrice, ItemClass, CreateTime, Creator, DeptCode, DeptName, KeyNo, IsOccupational FROM Enrollment_OrgFeeItem WHERE GroupID = {groupID} Order by PackID, ItemClass, DeptCode, FeeItemCode"); } public void AddPackFeeItem(Int64 packID, Int64 oeID, Int64 groupID, Int64 oID) diff --git a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs index 7b5cbb5..5d2dfdd 100644 --- a/PEIS/Model/Enrollment/EnrollmentOrgModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentOrgModel.cs @@ -55,12 +55,7 @@ namespace PEIS.Model.Enrollment var normal = $@"EXEC sp_InsertNormalFeeItem {eID};"; // 发送后变更执行科室 //同步分检 - var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01411', DeptName = '内科' WHERE KeyNo = '87933664' AND FeeItemCode = 'Z1061' AND EID = {eID}; - UPDATE Enrollment_FeeItem SET DeptCode = '01412', DeptName = '外科' WHERE KeyNo = '87933665' AND FeeItemCode = 'Z1062' AND EID = {eID}; - UPDATE Enrollment_FeeItem SET DeptCode = '01413', DeptName = '五官科' WHERE KeyNo = '87933667' AND FeeItemCode = 'Z1063' AND EID = {eID}; - UPDATE Enrollment_FeeItem SET DeptCode = '01415', DeptName = '口腔科' WHERE KeyNo = '87933670' AND FeeItemCode = 'Z1064' AND EID = {eID}; - UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965917' AND FeeItemCode = 'Z1065' AND EID = {eID}; - UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965918' AND FeeItemCode = 'Z1066' AND EID = {eID}; EXEC sp_SyncExamPart {eID};"; + var dept = $@"EXEC sp_UpdateSendToDept {eID};"; var cResult = DAOHelp.ExecuteSql(checkCost, false); var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false); diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index b052bf1..e0e0b32 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -56,7 +56,12 @@ namespace PEIS.Model.Enrollment ExamDate = '{item.ExamDate}', Photo = '{item.Photo}', Company = '{item.Company}', - SpellCode = '{item.SpellCode}' + SpellCode = '{item.SpellCode}', + JobTypes = '{item.JobTypes}', + JobStatus = '{item.JobStatus}', + WorkYears = '{item.WorkYears}', + HazardYears = '{item.HazardYears}', + HazardFactors = '{item.HazardFactors}' WHERE ID = {item.ID}"; var baseStr = $@"update base_patient set name = '{item.Name}', Sex = '{item.Sex}', Birthday = '{item.Birthday}', CardType = '{item.CardType}', CardNo = '{item.CardNo}', SpellCode = '{item.SpellCode}', Marriage = '{item.Marriage}', Description = '{item.Description}' where ID = {item.PID}"; @@ -118,12 +123,7 @@ namespace PEIS.Model.Enrollment var normal = $@"EXEC sp_InsertNormalFeeItem {EId};"; // 发送后变更执行科室 - var dept = $@"UPDATE Enrollment_FeeItem SET DeptCode = '01411', DeptName = '内科' WHERE KeyNo = '87933664' AND FeeItemCode = 'Z1061' AND EID = {EId}; - UPDATE Enrollment_FeeItem SET DeptCode = '01412', DeptName = '外科' WHERE KeyNo = '87933665' AND FeeItemCode = 'Z1062' AND EID = {EId}; - UPDATE Enrollment_FeeItem SET DeptCode = '01413', DeptName = '五官科' WHERE KeyNo = '87933667' AND FeeItemCode = 'Z1063' AND EID = {EId}; - UPDATE Enrollment_FeeItem SET DeptCode = '01415', DeptName = '口腔科' WHERE KeyNo = '87933670' AND FeeItemCode = 'Z1064' AND EID = {EId}; - UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965917' AND FeeItemCode = 'Z1065' AND EID = {EId}; - UPDATE Enrollment_FeeItem SET DeptCode = '01414', DeptName = '一般检查' WHERE KeyNo = '87965918' AND FeeItemCode = 'Z1066' AND EID = {EId}; EXEC sp_SyncExamPart {EId};"; + var dept = $@"EXEC sp_UpdateSendToDept {EId};"; var cResult = DAOHelp.ExecuteSql(checkCost, false); var eResult = DAOHelp.ExecuteSql(enrollmentPatient, false); diff --git a/PEIS/Properties/licenses.licx b/PEIS/Properties/licenses.licx index 98d9998..3acb427 100644 --- a/PEIS/Properties/licenses.licx +++ b/PEIS/Properties/licenses.licx @@ -1 +1,4 @@ DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit, DevExpress.XtraGrid.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v17.1, Version=17.1.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index 952d1a4..8a03c69 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -315,7 +315,7 @@ namespace FastReport - + @@ -447,7 +447,7 @@ namespace FastReport - + @@ -567,10 +567,10 @@ namespace FastReport - - + + - + diff --git a/PEIS/Utils/ExcelHelper.cs b/PEIS/Utils/ExcelHelper.cs index c74b680..fb2e601 100644 --- a/PEIS/Utils/ExcelHelper.cs +++ b/PEIS/Utils/ExcelHelper.cs @@ -70,7 +70,7 @@ namespace PEIS.Utils continue; } SuccessList.Add(readPatient); - continuousEmpty = 0; + continuousEmpty = 0; } }; } @@ -93,14 +93,14 @@ namespace PEIS.Utils Name = dataRow.GetCell(1)?.ToString().Replace(" ", ""), Contactor1 = dataRow.GetCell(1)?.ToString().Replace(" ", ""), Sex = sex.Contains("女")?"2":"1", - Nation = dataRow.GetCell(3)?.ToString(), - Marriage = dataRow.GetCell(4)?.ToString(), - CardNo = dataRow.GetCell(5)?.ToString(), + Nation = dataRow.GetCell(3)?.ToString().Replace(" ", ""), + Marriage = dataRow.GetCell(4)?.ToString().Replace(" ", ""), + CardNo = dataRow.GetCell(5)?.ToString().Replace(" ", ""), CardType = "居民身份证", - Address1 = dataRow.GetCell(6)?.ToString(), - Tel1 = dataRow.GetCell(7)?.ToString(), - DeptName = dataRow.GetCell(8)?.ToString(), - Description = dataRow.GetCell(9)?.ToString(), + Address1 = dataRow.GetCell(6)?.ToString().Replace(" ", ""), + Tel1 = dataRow.GetCell(7)?.ToString().Replace(" ", ""), + DeptName = dataRow.GetCell(8)?.ToString().Replace(" ", ""), + Description = dataRow.GetCell(9)?.ToString().Replace(" ", ""), SpellCode = PingYinHelper.GetTotalPingYin(dataRow.GetCell(1)?.ToString().Replace(" ", "")).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(dataRow.GetCell(1)?.ToString().Replace(" ", "")).FirstPingYin[0] }; } diff --git a/PEIS/Utils/Global.cs b/PEIS/Utils/Global.cs index c882b69..e6e114a 100644 --- a/PEIS/Utils/Global.cs +++ b/PEIS/Utils/Global.cs @@ -40,6 +40,11 @@ namespace PEIS.Utils /// public static List _lstSign = new List(); + /// + /// 接害类型 + /// + public static List _lstDictHazardTypes = new List(); + public static Hospital _hospital = new Hospital(); public static List _lstConclusion = new List(); public static List _lstAllDept = new List(); diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs index 768e3e0..771ee49 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs @@ -132,6 +132,7 @@ this.JobStatusCol = new DevExpress.XtraGrid.Columns.GridColumn(); this.RiCmbJobStatus = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox(); this.HazardFactorsCol = new DevExpress.XtraGrid.Columns.GridColumn(); + this.RiCmbHazardFactors = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit(); this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -383,7 +384,6 @@ this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.RiCmbHazardFactors = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit(); @@ -415,6 +415,7 @@ ((System.ComponentModel.ISupportInitialize)(this.RiCmbExamType)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RiCmbJobTypes)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.RiCmbJobStatus)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.RiCmbHazardFactors)).BeginInit(); this.panel3.SuspendLayout(); this.TpGroupFeeItem.SuspendLayout(); this.panel5.SuspendLayout(); @@ -481,7 +482,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView5)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView8)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.RiCmbHazardFactors)).BeginInit(); this.SuspendLayout(); // // gridColumn99 @@ -572,7 +572,7 @@ this.gridColumn21}); this.DgvOrg.FixedLineWidth = 1; this.DgvOrg.GridControl = this.DgcOrg; - this.DgvOrg.IndicatorWidth = 50; + this.DgvOrg.IndicatorWidth = 65; this.DgvOrg.Name = "DgvOrg"; this.DgvOrg.OptionsMenu.EnableColumnMenu = false; this.DgvOrg.OptionsSelection.MultiSelect = true; @@ -946,13 +946,13 @@ this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.FastGroupMove}); this.contextMenuStrip1.Name = "CostFastMenu"; - this.contextMenuStrip1.Size = new System.Drawing.Size(125, 26); + this.contextMenuStrip1.Size = new System.Drawing.Size(131, 28); // // FastGroupMove // this.FastGroupMove.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastGroupMove.Name = "FastGroupMove"; - this.FastGroupMove.Size = new System.Drawing.Size(124, 22); + this.FastGroupMove.Size = new System.Drawing.Size(130, 24); this.FastGroupMove.Text = "批量移除"; // // DgvGroupPatient @@ -986,7 +986,7 @@ this.gridColumn55}); this.DgvGroupPatient.FixedLineWidth = 1; this.DgvGroupPatient.GridControl = this.DgcGroupPatient; - this.DgvGroupPatient.IndicatorWidth = 50; + this.DgvGroupPatient.IndicatorWidth = 65; this.DgvGroupPatient.Name = "DgvGroupPatient"; this.DgvGroupPatient.OptionsSelection.MultiSelect = true; this.DgvGroupPatient.OptionsView.ColumnAutoWidth = false; @@ -1332,7 +1332,7 @@ this.gridColumn56}); this.DgvPatient.FixedLineWidth = 1; this.DgvPatient.GridControl = this.DgcPatient; - this.DgvPatient.IndicatorWidth = 50; + this.DgvPatient.IndicatorWidth = 65; this.DgvPatient.Name = "DgvPatient"; this.DgvPatient.OptionsSelection.MultiSelect = true; this.DgvPatient.OptionsView.ColumnAutoWidth = false; @@ -1586,7 +1586,7 @@ this.ImportBtn.Image = ((System.Drawing.Image)(resources.GetObject("ImportBtn.Image"))); this.ImportBtn.Location = new System.Drawing.Point(406, 2); this.ImportBtn.Name = "ImportBtn"; - this.ImportBtn.Size = new System.Drawing.Size(111, 33); + this.ImportBtn.Size = new System.Drawing.Size(143, 39); this.ImportBtn.TabIndex = 5; this.ImportBtn.Text = "全部导入"; this.ImportBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -1599,7 +1599,7 @@ this.NewBaseBtn.Image = global::PEIS.Properties.Resources.添加; this.NewBaseBtn.Location = new System.Drawing.Point(284, 2); this.NewBaseBtn.Name = "NewBaseBtn"; - this.NewBaseBtn.Size = new System.Drawing.Size(113, 33); + this.NewBaseBtn.Size = new System.Drawing.Size(145, 39); this.NewBaseBtn.TabIndex = 4; this.NewBaseBtn.Text = "新增成员"; this.NewBaseBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText; @@ -1683,7 +1683,7 @@ this.gridColumn18}); this.DgvGroup.FixedLineWidth = 1; this.DgvGroup.GridControl = this.DgcGroup; - this.DgvGroup.IndicatorWidth = 30; + this.DgvGroup.IndicatorWidth = 65; this.DgvGroup.Name = "DgvGroup"; this.DgvGroup.OptionsSelection.MultiSelect = true; this.DgvGroup.OptionsView.ColumnAutoWidth = false; @@ -1845,6 +1845,15 @@ this.HazardFactorsCol.OptionsFilter.AllowFilter = false; this.HazardFactorsCol.Width = 90; // + // RiCmbHazardFactors + // + this.RiCmbHazardFactors.AutoHeight = false; + this.RiCmbHazardFactors.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.RiCmbHazardFactors.IncrementalSearch = true; + this.RiCmbHazardFactors.Name = "RiCmbHazardFactors"; + this.RiCmbHazardFactors.SeparatorChar = ';'; + // // gridColumn11 // this.gridColumn11.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); @@ -1984,7 +1993,7 @@ this.gridColumn81}); this.DgvGroupFeeItem.FixedLineWidth = 1; this.DgvGroupFeeItem.GridControl = this.DgcGroupFeeItem; - this.DgvGroupFeeItem.IndicatorWidth = 30; + this.DgvGroupFeeItem.IndicatorWidth = 65; this.DgvGroupFeeItem.Name = "DgvGroupFeeItem"; this.DgvGroupFeeItem.OptionsView.AllowCellMerge = true; this.DgvGroupFeeItem.OptionsView.ColumnAutoWidth = false; @@ -2187,11 +2196,11 @@ // TpPack // this.TpPack.Controls.Add(this.DgcPack); - this.TpPack.Location = new System.Drawing.Point(4, 23); + this.TpPack.Location = new System.Drawing.Point(4, 24); this.TpPack.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TpPack.Name = "TpPack"; this.TpPack.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.TpPack.Size = new System.Drawing.Size(452, 512); + this.TpPack.Size = new System.Drawing.Size(452, 523); this.TpPack.TabIndex = 1; this.TpPack.Text = "套餐"; this.TpPack.UseVisualStyleBackColor = true; @@ -2202,7 +2211,7 @@ this.DgcPack.Location = new System.Drawing.Point(2, 3); this.DgcPack.MainView = this.DgvPack; this.DgcPack.Name = "DgcPack"; - this.DgcPack.Size = new System.Drawing.Size(448, 506); + this.DgcPack.Size = new System.Drawing.Size(448, 517); this.DgcPack.TabIndex = 122; this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack, @@ -2228,7 +2237,7 @@ this.gridColumn88}); this.DgvPack.FixedLineWidth = 1; this.DgvPack.GridControl = this.DgcPack; - this.DgvPack.IndicatorWidth = 30; + this.DgvPack.IndicatorWidth = 65; this.DgvPack.Name = "DgvPack"; this.DgvPack.OptionsSelection.MultiSelect = true; this.DgvPack.OptionsView.ColumnAutoWidth = false; @@ -2363,11 +2372,11 @@ // this.TpFeeItem.Controls.Add(this.DgcFeeItem); this.TpFeeItem.Controls.Add(this.FeeItemSearch); - this.TpFeeItem.Location = new System.Drawing.Point(4, 23); + this.TpFeeItem.Location = new System.Drawing.Point(4, 24); this.TpFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TpFeeItem.Name = "TpFeeItem"; this.TpFeeItem.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.TpFeeItem.Size = new System.Drawing.Size(452, 512); + this.TpFeeItem.Size = new System.Drawing.Size(452, 523); this.TpFeeItem.TabIndex = 0; this.TpFeeItem.Text = "收费项目"; this.TpFeeItem.UseVisualStyleBackColor = true; @@ -2380,7 +2389,7 @@ this.DgcFeeItem.Name = "DgcFeeItem"; this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1}); - this.DgcFeeItem.Size = new System.Drawing.Size(448, 484); + this.DgcFeeItem.Size = new System.Drawing.Size(448, 495); this.DgcFeeItem.TabIndex = 137; this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem, @@ -2407,7 +2416,7 @@ this.gridColumn73}); this.DgvFeeItem.FixedLineWidth = 1; this.DgvFeeItem.GridControl = this.DgcFeeItem; - this.DgvFeeItem.IndicatorWidth = 30; + this.DgvFeeItem.IndicatorWidth = 65; this.DgvFeeItem.Name = "DgvFeeItem"; this.DgvFeeItem.OptionsSelection.MultiSelect = true; this.DgvFeeItem.OptionsView.ColumnAutoWidth = false; @@ -2611,7 +2620,7 @@ this.gridColumn66}); this.DgvGroup2.FixedLineWidth = 1; this.DgvGroup2.GridControl = this.DgcGroup2; - this.DgvGroup2.IndicatorWidth = 30; + this.DgvGroup2.IndicatorWidth = 65; this.DgvGroup2.Name = "DgvGroup2"; this.DgvGroup2.OptionsSelection.MultiSelect = true; this.DgvGroup2.OptionsView.ColumnAutoWidth = false; @@ -2966,20 +2975,20 @@ this.toolStripMenuItem15, this.PFastRefreshCost}); this.PersonCostFastMenu.Name = "CostFastMenu"; - this.PersonCostFastMenu.Size = new System.Drawing.Size(161, 276); + this.PersonCostFastMenu.Size = new System.Drawing.Size(169, 276); // // PFastCharge // this.PFastCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastCharge.Image"))); this.PFastCharge.Name = "PFastCharge"; - this.PFastCharge.Size = new System.Drawing.Size(160, 34); + this.PFastCharge.Size = new System.Drawing.Size(168, 34); this.PFastCharge.Text = "记账"; // // PFastAllCharge // this.PFastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastAllCharge.Image"))); this.PFastAllCharge.Name = "PFastAllCharge"; - this.PFastAllCharge.Size = new System.Drawing.Size(160, 34); + this.PFastAllCharge.Size = new System.Drawing.Size(168, 34); this.PFastAllCharge.Text = "全部记账"; // // PFastDeleteCost @@ -2987,7 +2996,7 @@ this.PFastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("PFastDeleteCost.Image"))); this.PFastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastDeleteCost.Name = "PFastDeleteCost"; - this.PFastDeleteCost.Size = new System.Drawing.Size(160, 34); + this.PFastDeleteCost.Size = new System.Drawing.Size(168, 34); this.PFastDeleteCost.Text = "删除订单"; // // PFastCancelCharge @@ -2995,7 +3004,7 @@ this.PFastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("PFastCancelCharge.Image"))); this.PFastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastCancelCharge.Name = "PFastCancelCharge"; - this.PFastCancelCharge.Size = new System.Drawing.Size(160, 34); + this.PFastCancelCharge.Size = new System.Drawing.Size(168, 34); this.PFastCancelCharge.Text = "取消记账"; // // PFastChangeCost @@ -3003,20 +3012,20 @@ this.PFastChangeCost.Image = global::PEIS.Properties.Resources.刷新; this.PFastChangeCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastChangeCost.Name = "PFastChangeCost"; - this.PFastChangeCost.Size = new System.Drawing.Size(160, 34); + this.PFastChangeCost.Size = new System.Drawing.Size(168, 34); this.PFastChangeCost.Text = "订单转换"; // // toolStripMenuItem14 // this.toolStripMenuItem14.Name = "toolStripMenuItem14"; - this.toolStripMenuItem14.Size = new System.Drawing.Size(160, 34); + this.toolStripMenuItem14.Size = new System.Drawing.Size(168, 34); this.toolStripMenuItem14.Text = "全部删除订单"; this.toolStripMenuItem14.Visible = false; // // toolStripMenuItem15 // this.toolStripMenuItem15.Name = "toolStripMenuItem15"; - this.toolStripMenuItem15.Size = new System.Drawing.Size(160, 34); + this.toolStripMenuItem15.Size = new System.Drawing.Size(168, 34); this.toolStripMenuItem15.Text = "全部取消记账"; this.toolStripMenuItem15.Visible = false; // @@ -3025,7 +3034,7 @@ this.PFastRefreshCost.Image = global::PEIS.Properties.Resources.刷新; this.PFastRefreshCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.PFastRefreshCost.Name = "PFastRefreshCost"; - this.PFastRefreshCost.Size = new System.Drawing.Size(160, 34); + this.PFastRefreshCost.Size = new System.Drawing.Size(168, 34); this.PFastRefreshCost.Text = "刷新订单"; this.PFastRefreshCost.Visible = false; // @@ -3068,7 +3077,7 @@ this.DgvCheckCost2.FormatRules.Add(gridFormatRule1); this.DgvCheckCost2.GridControl = this.DgcCheckCost2; this.DgvCheckCost2.GroupFormat = "{0}"; - this.DgvCheckCost2.IndicatorWidth = 40; + this.DgvCheckCost2.IndicatorWidth = 65; this.DgvCheckCost2.Name = "DgvCheckCost2"; this.DgvCheckCost2.OptionsCustomization.AllowFilter = false; this.DgvCheckCost2.OptionsMenu.EnableColumnMenu = false; @@ -3420,20 +3429,20 @@ this.TFastAllDeleteCost, this.TFastAllCancelCharge}); this.TeamCostFastMenu.Name = "CostFastMenu"; - this.TeamCostFastMenu.Size = new System.Drawing.Size(161, 242); + this.TeamCostFastMenu.Size = new System.Drawing.Size(169, 242); // // TFastCharge // this.TFastCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastCharge.Image"))); this.TFastCharge.Name = "TFastCharge"; - this.TFastCharge.Size = new System.Drawing.Size(160, 34); + this.TFastCharge.Size = new System.Drawing.Size(168, 34); this.TFastCharge.Text = "记账"; // // TFastAllCharge // this.TFastAllCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastAllCharge.Image"))); this.TFastAllCharge.Name = "TFastAllCharge"; - this.TFastAllCharge.Size = new System.Drawing.Size(160, 34); + this.TFastAllCharge.Size = new System.Drawing.Size(168, 34); this.TFastAllCharge.Text = "全部记账"; // // TFastDeleteCost @@ -3441,7 +3450,7 @@ this.TFastDeleteCost.Image = ((System.Drawing.Image)(resources.GetObject("TFastDeleteCost.Image"))); this.TFastDeleteCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastDeleteCost.Name = "TFastDeleteCost"; - this.TFastDeleteCost.Size = new System.Drawing.Size(160, 34); + this.TFastDeleteCost.Size = new System.Drawing.Size(168, 34); this.TFastDeleteCost.Text = "删除订单"; // // TFastCancelCharge @@ -3449,7 +3458,7 @@ this.TFastCancelCharge.Image = ((System.Drawing.Image)(resources.GetObject("TFastCancelCharge.Image"))); this.TFastCancelCharge.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastCancelCharge.Name = "TFastCancelCharge"; - this.TFastCancelCharge.Size = new System.Drawing.Size(160, 34); + this.TFastCancelCharge.Size = new System.Drawing.Size(168, 34); this.TFastCancelCharge.Text = "取消记账"; // // TFastChangeCost @@ -3457,20 +3466,20 @@ this.TFastChangeCost.Image = global::PEIS.Properties.Resources.刷新; this.TFastChangeCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TFastChangeCost.Name = "TFastChangeCost"; - this.TFastChangeCost.Size = new System.Drawing.Size(160, 34); + this.TFastChangeCost.Size = new System.Drawing.Size(168, 34); this.TFastChangeCost.Text = "订单转换"; // // TFastAllDeleteCost // this.TFastAllDeleteCost.Name = "TFastAllDeleteCost"; - this.TFastAllDeleteCost.Size = new System.Drawing.Size(160, 34); + this.TFastAllDeleteCost.Size = new System.Drawing.Size(168, 34); this.TFastAllDeleteCost.Text = "全部删除订单"; this.TFastAllDeleteCost.Visible = false; // // TFastAllCancelCharge // this.TFastAllCancelCharge.Name = "TFastAllCancelCharge"; - this.TFastAllCancelCharge.Size = new System.Drawing.Size(160, 34); + this.TFastAllCancelCharge.Size = new System.Drawing.Size(168, 34); this.TFastAllCancelCharge.Text = "全部取消记账"; this.TFastAllCancelCharge.Visible = false; // @@ -4100,11 +4109,11 @@ // tabPage1 // this.tabPage1.Controls.Add(this.DgcPack2); - this.tabPage1.Location = new System.Drawing.Point(4, 23); + this.tabPage1.Location = new System.Drawing.Point(4, 24); this.tabPage1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.tabPage1.Size = new System.Drawing.Size(372, 362); + this.tabPage1.Size = new System.Drawing.Size(372, 361); this.tabPage1.TabIndex = 1; this.tabPage1.Text = "套餐"; this.tabPage1.UseVisualStyleBackColor = true; @@ -4115,7 +4124,7 @@ this.DgcPack2.Location = new System.Drawing.Point(2, 3); this.DgcPack2.MainView = this.DgvPack2; this.DgcPack2.Name = "DgcPack2"; - this.DgcPack2.Size = new System.Drawing.Size(368, 356); + this.DgcPack2.Size = new System.Drawing.Size(368, 355); this.DgcPack2.TabIndex = 122; this.DgcPack2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPack2, @@ -4141,7 +4150,7 @@ this.gridColumn132}); this.DgvPack2.FixedLineWidth = 1; this.DgvPack2.GridControl = this.DgcPack2; - this.DgvPack2.IndicatorWidth = 40; + this.DgvPack2.IndicatorWidth = 65; this.DgvPack2.Name = "DgvPack2"; this.DgvPack2.OptionsMenu.EnableColumnMenu = false; this.DgvPack2.OptionsSelection.MultiSelect = true; @@ -4277,11 +4286,11 @@ // this.tabPage2.Controls.Add(this.DgcFeeItem2); this.tabPage2.Controls.Add(this.FeeItemSearch2); - this.tabPage2.Location = new System.Drawing.Point(4, 23); + this.tabPage2.Location = new System.Drawing.Point(4, 24); this.tabPage2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3); - this.tabPage2.Size = new System.Drawing.Size(372, 362); + this.tabPage2.Size = new System.Drawing.Size(372, 361); this.tabPage2.TabIndex = 0; this.tabPage2.Text = "收费项目"; this.tabPage2.UseVisualStyleBackColor = true; @@ -4294,7 +4303,7 @@ this.DgcFeeItem2.Name = "DgcFeeItem2"; this.DgcFeeItem2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit2}); - this.DgcFeeItem2.Size = new System.Drawing.Size(368, 334); + this.DgcFeeItem2.Size = new System.Drawing.Size(368, 333); this.DgcFeeItem2.TabIndex = 138; this.DgcFeeItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem2, @@ -4321,7 +4330,7 @@ this.gridColumn140}); this.DgvFeeItem2.FixedLineWidth = 1; this.DgvFeeItem2.GridControl = this.DgcFeeItem2; - this.DgvFeeItem2.IndicatorWidth = 40; + this.DgvFeeItem2.IndicatorWidth = 65; this.DgvFeeItem2.Name = "DgvFeeItem2"; this.DgvFeeItem2.OptionsMenu.EnableColumnMenu = false; this.DgvFeeItem2.OptionsSelection.MultiSelect = true; @@ -4515,7 +4524,7 @@ this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2); - this.menuStrip1.Size = new System.Drawing.Size(789, 44); + this.menuStrip1.Size = new System.Drawing.Size(828, 44); this.menuStrip1.TabIndex = 129; this.menuStrip1.Text = "menuStrip1"; // @@ -4524,7 +4533,7 @@ this.TsmiCheckOrg.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCheckOrg.Image"))); this.TsmiCheckOrg.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiCheckOrg.Name = "TsmiCheckOrg"; - this.TsmiCheckOrg.Size = new System.Drawing.Size(120, 40); + this.TsmiCheckOrg.Size = new System.Drawing.Size(127, 40); this.TsmiCheckOrg.Text = "生成团体订单"; // // toolStripMenuItem1 @@ -4537,7 +4546,7 @@ this.TsmiCheckPerson.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCheckPerson.Image"))); this.TsmiCheckPerson.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiCheckPerson.Name = "TsmiCheckPerson"; - this.TsmiCheckPerson.Size = new System.Drawing.Size(122, 40); + this.TsmiCheckPerson.Size = new System.Drawing.Size(129, 40); this.TsmiCheckPerson.Text = "生成个人订单"; // // toolStripMenuItem7 @@ -4554,28 +4563,28 @@ this.TsmiPrintCost.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintCost.Image"))); this.TsmiPrintCost.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiPrintCost.Name = "TsmiPrintCost"; - this.TsmiPrintCost.Size = new System.Drawing.Size(116, 40); + this.TsmiPrintCost.Size = new System.Drawing.Size(122, 40); this.TsmiPrintCost.Text = "打印收费单"; // // TsmiPrintPerson // this.TsmiPrintPerson.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintPerson.Image"))); this.TsmiPrintPerson.Name = "TsmiPrintPerson"; - this.TsmiPrintPerson.Size = new System.Drawing.Size(188, 26); + this.TsmiPrintPerson.Size = new System.Drawing.Size(199, 26); this.TsmiPrintPerson.Text = "打印个人收费单"; // // TsmiPrintTeam // this.TsmiPrintTeam.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintTeam.Image"))); this.TsmiPrintTeam.Name = "TsmiPrintTeam"; - this.TsmiPrintTeam.Size = new System.Drawing.Size(188, 26); + this.TsmiPrintTeam.Size = new System.Drawing.Size(199, 26); this.TsmiPrintTeam.Text = "打印团体收费单"; // // TsmiPrintGroup // this.TsmiPrintGroup.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintGroup.Image"))); this.TsmiPrintGroup.Name = "TsmiPrintGroup"; - this.TsmiPrintGroup.Size = new System.Drawing.Size(188, 26); + this.TsmiPrintGroup.Size = new System.Drawing.Size(199, 26); this.TsmiPrintGroup.Text = "打印团体分组收费单"; // // toolStripMenuItem3 @@ -4589,7 +4598,7 @@ this.TsmiFee.Image = ((System.Drawing.Image)(resources.GetObject("TsmiFee.Image"))); this.TsmiFee.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiFee.Name = "TsmiFee"; - this.TsmiFee.Size = new System.Drawing.Size(80, 40); + this.TsmiFee.Size = new System.Drawing.Size(83, 40); this.TsmiFee.Text = "记账"; this.TsmiFee.Visible = false; // @@ -4603,7 +4612,7 @@ this.TsmiSend.Image = ((System.Drawing.Image)(resources.GetObject("TsmiSend.Image"))); this.TsmiSend.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiSend.Name = "TsmiSend"; - this.TsmiSend.Size = new System.Drawing.Size(112, 40); + this.TsmiSend.Size = new System.Drawing.Size(118, 40); this.TsmiSend.Text = "发送到科室"; // // toolStripMenuItem4 @@ -4616,7 +4625,7 @@ this.TsmiPrintGuide.Image = ((System.Drawing.Image)(resources.GetObject("TsmiPrintGuide.Image"))); this.TsmiPrintGuide.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiPrintGuide.Name = "TsmiPrintGuide"; - this.TsmiPrintGuide.Size = new System.Drawing.Size(116, 40); + this.TsmiPrintGuide.Size = new System.Drawing.Size(122, 40); this.TsmiPrintGuide.Text = "打印导检单"; // // toolStripMenuItem5 @@ -4629,7 +4638,7 @@ this.TsmiOpenFeeItem.Image = ((System.Drawing.Image)(resources.GetObject("TsmiOpenFeeItem.Image"))); this.TsmiOpenFeeItem.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiOpenFeeItem.Name = "TsmiOpenFeeItem"; - this.TsmiOpenFeeItem.Size = new System.Drawing.Size(120, 40); + this.TsmiOpenFeeItem.Size = new System.Drawing.Size(127, 40); this.TsmiOpenFeeItem.Text = "打开收费项目"; // // toolStripMenuItem6 @@ -4642,7 +4651,7 @@ this.TsmiBatchCtrl.Image = ((System.Drawing.Image)(resources.GetObject("TsmiBatchCtrl.Image"))); this.TsmiBatchCtrl.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.TsmiBatchCtrl.Name = "TsmiBatchCtrl"; - this.TsmiBatchCtrl.Size = new System.Drawing.Size(104, 40); + this.TsmiBatchCtrl.Size = new System.Drawing.Size(109, 40); this.TsmiBatchCtrl.Text = "批量操作"; this.TsmiBatchCtrl.Visible = false; // @@ -4694,14 +4703,14 @@ this.FastGroup, this.FastCancelGroup}); this.InfoFastMenu.Name = "CostFastMenu"; - this.InfoFastMenu.Size = new System.Drawing.Size(205, 214); + this.InfoFastMenu.Size = new System.Drawing.Size(217, 214); // // FastCamera // this.FastCamera.Image = ((System.Drawing.Image)(resources.GetObject("FastCamera.Image"))); this.FastCamera.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastCamera.Name = "FastCamera"; - this.FastCamera.Size = new System.Drawing.Size(204, 30); + this.FastCamera.Size = new System.Drawing.Size(216, 30); this.FastCamera.Text = "拍照"; // // FastDelete @@ -4709,41 +4718,41 @@ this.FastDelete.Image = ((System.Drawing.Image)(resources.GetObject("FastDelete.Image"))); this.FastDelete.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; this.FastDelete.Name = "FastDelete"; - this.FastDelete.Size = new System.Drawing.Size(204, 30); + this.FastDelete.Size = new System.Drawing.Size(216, 30); this.FastDelete.Text = "删除成员"; // // FastExport // this.FastExport.Image = global::PEIS.Properties.Resources.Excel; this.FastExport.Name = "FastExport"; - this.FastExport.Size = new System.Drawing.Size(204, 30); + this.FastExport.Size = new System.Drawing.Size(216, 30); this.FastExport.Text = "导出所有成员"; // // FastExportTime // this.FastExportTime.Image = global::PEIS.Properties.Resources.Excel; this.FastExportTime.Name = "FastExportTime"; - this.FastExportTime.Size = new System.Drawing.Size(204, 30); + this.FastExportTime.Size = new System.Drawing.Size(216, 30); this.FastExportTime.Text = "导出指定时间范围成员"; // // FastRecall // this.FastRecall.Image = global::PEIS.Properties.Resources.取消弃检; this.FastRecall.Name = "FastRecall"; - this.FastRecall.Size = new System.Drawing.Size(204, 30); + this.FastRecall.Size = new System.Drawing.Size(216, 30); this.FastRecall.Text = "撤回发送"; // // FastGroup // this.FastGroup.Name = "FastGroup"; - this.FastGroup.Size = new System.Drawing.Size(204, 30); + this.FastGroup.Size = new System.Drawing.Size(216, 30); this.FastGroup.Text = "组合缴费"; this.FastGroup.Visible = false; // // FastCancelGroup // this.FastCancelGroup.Name = "FastCancelGroup"; - this.FastCancelGroup.Size = new System.Drawing.Size(204, 30); + this.FastCancelGroup.Size = new System.Drawing.Size(216, 30); this.FastCancelGroup.Text = "取消组合缴费"; this.FastCancelGroup.Visible = false; // @@ -4777,7 +4786,7 @@ this.DgvEnrollment.GridControl = this.DgcEnrollment; this.DgvEnrollment.GroupCount = 1; this.DgvEnrollment.GroupFormat = ""; - this.DgvEnrollment.IndicatorWidth = 55; + this.DgvEnrollment.IndicatorWidth = 65; this.DgvEnrollment.Name = "DgvEnrollment"; this.DgvEnrollment.OptionsFilter.AllowFilterEditor = false; this.DgvEnrollment.OptionsMenu.EnableColumnMenu = false; @@ -5281,13 +5290,6 @@ // this.gridView8.Name = "gridView8"; // - // RiCmbHazardFactors - // - this.RiCmbHazardFactors.AutoHeight = false; - this.RiCmbHazardFactors.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.RiCmbHazardFactors.Name = "RiCmbHazardFactors"; - // // EnrollmentOrgForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -5334,6 +5336,7 @@ ((System.ComponentModel.ISupportInitialize)(this.RiCmbExamType)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RiCmbJobTypes)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.RiCmbJobStatus)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.RiCmbHazardFactors)).EndInit(); this.panel3.ResumeLayout(false); this.TpGroupFeeItem.ResumeLayout(false); this.panel5.ResumeLayout(false); @@ -5405,7 +5408,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView5)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView8)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.RiCmbHazardFactors)).EndInit(); this.ResumeLayout(false); } diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.cs b/PEIS/View/Enrollment/EnrollmentOrgForm.cs index 548dcb5..799d990 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.cs +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.cs @@ -1,8 +1,11 @@ -using DevExpress.XtraGrid.Columns; +using DevExpress.XtraEditors.Controls; +using DevExpress.XtraEditors.Repository; +using DevExpress.XtraGrid.Columns; using DevExpress.XtraGrid.Views.Grid; using DevExpress.XtraGrid.Views.Grid.ViewInfo; using DevExpress.XtraPrinting.Native; using FastReport; +using Newtonsoft.Json; using PEIS.Base; using PEIS.Entity; using PEIS.Event; @@ -213,13 +216,14 @@ namespace PEIS.View.Enrollment RiCmbMarriage.Items.Add("所有"); RiCmbMarriage.Items.Add("已婚"); RiCmbMarriage.Items.Add("未婚"); - RiCmbJobStatus.Items.Add("岗前"); - RiCmbJobStatus.Items.Add("在岗"); - RiCmbJobStatus.Items.Add("岗后"); + RiCmbJobStatus.Items.AddRange(Global._lstDictHazardTypes.Where(a => a.ParentID == null).ToList().Select(a => a.Name).ToList()); RiCmbJobTypes.Items.Add("测试工种1"); RiCmbJobTypes.Items.Add("测试工种2"); - RiCmbHazardFactors.Items.Add("危害因素1"); - RiCmbHazardFactors.Items.Add("危害因素2"); + + foreach (var item in Global._lstDictHazardTypes.Where(a => a.ParentID != null).ToList().Select(a => a.Name).ToList()) + { + RiCmbHazardFactors.Items.Add(item); + } OnGetPack(); OnGetFeeItem(); @@ -329,21 +333,82 @@ namespace PEIS.View.Enrollment DgvGroup.CloseEditor(); DgvGroup.UpdateCurrentRow(); + var IsOccupational = Convert.ToBoolean(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "IsOccupational")); foreach (var item in _lstGroup) { item.Sex = item.Sex == null ? "0" : item.Sex.Equals("男") ? "1" : item.Sex.Equals("女") ? "2" : "0"; - switch (item.ID) + item.Type = IsOccupational ? "职业体检" : "健康体检"; + if(item.ID != 0) { - case 0: - item.Save(); - break; - - default: - OnUpdateGroup(item); - break; + var _list = DAOHelp.GetDataBySQL($@"SELECT * FROM Enrollment_OrgGroup WHERE ID = {item.ID}"); + var _lItem = _list.Count() == 0 ? null : _list[0]; + if (_lItem == null) continue; + if (JsonConvert.SerializeObject(_lItem) == JsonConvert.SerializeObject(item)) continue; + OnUpdateGroup(item); + } + else + { + item.Save(); } } OnGetEnrollmentOrgGroup(Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())); + + if (IsOccupational) + { + foreach (var item in _lstGroup) + { + // 同步后的不可更改项目 + if (item.CheckTime != null) continue; + + // 避免重复开设，删除分组原有所有项目 + DAOHelp.ExecuteSql($@"UPDATE Enrollment_OrgFeeItem SET GroupID = -{item?.ID}, CreateTime = GETDATE(), CreatorCode = '{Global.currentUser.Code}', Creator = '{Global.currentUser.Name}' WHERE GroupID = {item?.ID}"); + + List _feeItemsList = new List(); + + // 接害类型 + var _hazardList = item.HazardFactors.Split(';').Select(s => s.Trim()).ToList(); + + foreach (var hItem in _hazardList?.Select(s => s?.ToString()).ToList()) + { + var feeItem = DAOHelp.GetDataBySQL($@"EXEC sp_HazardFactors_FeeItem '{item.JobStatus.Trim()}', '{hItem.Trim()}' "); + _feeItemsList.AddRange(feeItem); + } + + + // 去除重复项 + var _distFeeItem = _feeItemsList.GroupBy(g => g.KeyNo).Select(s => s.First()).ToList(); + + foreach (var dItem in _distFeeItem) + { + EnrollmentOrgFeeItem eItem = new EnrollmentOrgFeeItem(); + Int32 index = 0; + + eItem.OEID = item?.OID; + eItem.GroupID = item?.ID; + eItem.FID = dItem.ID; + eItem.FeeItemCode = dItem.FeeItemCode; + eItem.FeeItemName = dItem.FeeItemName; + eItem.Quantity = 1; + eItem.Unit = dItem.Unit; + eItem.Price = dItem.Price; + eItem.SettlePrice = dItem.SettlePrice; + eItem.ItemClass = dItem.ItemClass; + eItem.CreateTime = DateTime.Now; + eItem.CreatorCode = Global.currentUser.Code; + eItem.Creator = Global.currentUser.Name; + eItem.DeptCode = dItem.DeptCode; + eItem.DeptName = dItem.DeptName; + eItem.Seq = index; + eItem.KeyNo = dItem.KeyNo; + eItem.IsOccupational = true; + eItem.OID = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "OID").ToString()); + + eItem.Save(); + } + + } + } + } /// @@ -515,6 +580,12 @@ namespace PEIS.View.Enrollment return; } + if (item.IsOccupational && Convert.ToBoolean(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "IsOccupational"))) + { + Global.Msg("info", "此为职业体检必检项目，不可改动！"); + return; + } + if (DgvGroupFeeItem.FocusedColumn.ToString() == "套餐" && item.PackId != null) { if (Global.Msg("warn", "确定移除当前套餐吗？") == DialogResult.No) return; diff --git a/PEIS/View/Enrollment/EnrollmentOrgForm.resx b/PEIS/View/Enrollment/EnrollmentOrgForm.resx index debec70..754d1cb 100644 --- a/PEIS/View/Enrollment/EnrollmentOrgForm.resx +++ b/PEIS/View/Enrollment/EnrollmentOrgForm.resx @@ -126,9 +126,9 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAGVJREFUSEtj - GAVDC5iFXG6AMlGAWcjVUCiTfAAy3Czkyn+z0KtRUCEwABkOFg+5sgoqRDqAG45mCJLhQEymL0YNxwqG - ruEgQHMLQGDUEpLAMLSEFoUdDIAsgTJRAMWuHwU0BAwMALZSy+0cd7O8AAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAF5JREFUSEtj + YBgFQwqYhVxuQBcDAbOQq6HoYiQDkOFmIVf+m4VejUIVvxoKFg+5sgpZnCQANxzNECTD/5Pti1HDsYKh + azgI0NwCEBi1hCQwDC2hRWEHAzQtrkcBzQAAtlLL7bkHJToAAAAASUVORK5CYII= @@ -136,70 +136,68 @@ - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft - V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp - Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E - JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/ - h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan - nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt - dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY - A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1 - tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB - m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh - 1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ - KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/ - VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB - tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA - bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R - rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB - Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb - OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt - LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ - RU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft + V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G + qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/ + COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9 + aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe + kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4 + TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm + Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G + pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV + gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1 + ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf + 11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ + 2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo + VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX + LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY + x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv + jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl + mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/ + 364njv2rTroAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft - V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp - Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E - JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/ - h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan - nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt - dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY - A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1 - tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB - m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh - 1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ - KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/ - VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB - tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA - bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R - rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB - Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb - OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt - LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ - RU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft + V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G + qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/ + COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9 + aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe + kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4 + TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm + Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G + pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV + gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1 + ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf + 11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ + 2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo + VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX + LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY + x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv + jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl + mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/ + 364njv2rTroAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAYVJREFUSEvt - U7FKA0EQvVr9AQvR0lrE2kK/IIW2aUK4ncUr0iq2QQTB0sLCRsRarPQTBAtbsVDEQiEml3T63jInQe42 - 3iZRizwYbt/czHu3c7vRBH+Gd5HVQaGlo0Eqct0R+SiKsRj6YuSGY0PeuIYJlS1GXtMwobL/FNmBeG40 - pjXlRVaPnS1rqhzaxrTcaJJkllzFvq7A97FhfUuexvGcpsoBzQ8UaIkskv/A8JH8qVab0lQ5oPmGAqm1 - K+Q+w5c4nsG6l/EgYKRXFMBzndxn+GbMvKsVeSUPAgzOKYJnRXmhYceYJeV35EHoWHtEka5Ildxn2LN2 - jWvWkAcBzXsUwUgT5YWGeLfhakVOyYMAgW0naswOuc8Qz1j5IXkQYLBFkba1+8p9hu7j8G6XPAgYT9WJ - 4l+S0yiLfs41ag9Yiysk5EHAjirOUORMU4VA7YkzNGZTU+XB+6eGl/27ywvUXLA2u7PBwIG5V9PBgVpt - Gw74P00eGF/A7Lhbry9oywS/hSj6BPErPBdI/H2zAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAYRJREFUSEvt + lTFLA0EQhVOrf8BCtLQWsbbQX2ChbZoQbt7iFWkVWxFBsExhYSNiLVbmJwgWtsFCEQuF5GaTTpllF44x + d1lyBi3ywUAeu/ve7mSXq9Vm/BV9YHNc6TWVsECHga+imkpgWf164NTQrapa2v8HekHV0v7/i3Ah3lqt + eT02ijCfgXU9FkVG1HOtSdNF0eFphBup28bAo2ibJEt5n2gYeBaDHrAqOiLwRfRrozGX94mGgQe3Y2M2 + RJcFvifJAgPDShclI7oXg4xoW3RZ4CfRspsLfGifaCxw404I7HhdGMhEa14/aZ9o2Ji2mAyAuuiywKEx + W35zHe0TjQVOfEtTrwsDLbDrW3qlfaJh4MCZEh2KLgtkIPH6XPtEY4F9t2tjTr0uC3Sb6wNH2ieaDKg7 + U2PaovXHNv87A85krjUG2icauZ3+FNd6TGOBSxdItKfHopH35wPv8qcbVQzcuvb7NzsxTNQN/9XYIurq + 9RORAcfhS1BUTHQxaDZX9NoZU+cb8Ss8F83+y7EAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt - lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k - iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo - 4OWtCNeHAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHhJREFUSEvt + lEEOgCAMBPmkv9iX+T+8ampigtjUrlLCgTm2u9OEAylNhmMDlgys9fwN6Ui3nj+QYAZ25gjdYQpM9oan + 6MmYWAJrR6GJtNkvSmFz+UUhbi8XQg+EPpEm1GafsETWzoVH4MmoMEUme0IX2E74dz3pzgHsaODlqTYF + xgAAAABJRU5ErkJggg== @@ -207,70 +205,68 @@ - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft - V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp - Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E - JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/ - h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan - nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt - dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY - A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1 - tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB - m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh - 1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ - KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/ - VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB - tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA - bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R - rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB - Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb - OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt - LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ - RU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft + V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G + qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/ + COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9 + aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe + kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4 + TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm + Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G + pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV + gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1 + ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf + 11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ + 2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo + VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX + LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY + x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv + jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl + mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/ + 364njv2rTroAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft - V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp - Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E - JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/ - h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan - nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt - dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY - A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1 - tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB - m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh - 1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ - KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/ - VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB - tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA - bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R - rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB - Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb - OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt - LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ - RU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft + V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G + qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/ + COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9 + aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe + kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4 + TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm + Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G + pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV + gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1 + ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf + 11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ + 2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo + VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX + LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY + x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv + jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl + mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/ + 364njv2rTroAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAYVJREFUSEvt - U7FKA0EQvVr9AQvR0lrE2kK/IIW2aUK4ncUr0iq2QQTB0sLCRsRarPQTBAtbsVDEQiEml3T63jInQe42 - 3iZRizwYbt/czHu3c7vRBH+Gd5HVQaGlo0Eqct0R+SiKsRj6YuSGY0PeuIYJlS1GXtMwobL/FNmBeG40 - pjXlRVaPnS1rqhzaxrTcaJJkllzFvq7A97FhfUuexvGcpsoBzQ8UaIkskv/A8JH8qVab0lQ5oPmGAqm1 - K+Q+w5c4nsG6l/EgYKRXFMBzndxn+GbMvKsVeSUPAgzOKYJnRXmhYceYJeV35EHoWHtEka5Ildxn2LN2 - jWvWkAcBzXsUwUgT5YWGeLfhakVOyYMAgW0naswOuc8Qz1j5IXkQYLBFkba1+8p9hu7j8G6XPAgYT9WJ - 4l+S0yiLfs41ag9Yiysk5EHAjirOUORMU4VA7YkzNGZTU+XB+6eGl/27ywvUXLA2u7PBwIG5V9PBgVpt - Gw74P00eGF/A7Lhbry9oywS/hSj6BPErPBdI/H2zAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAYRJREFUSEvt + lTFLA0EQhVOrf8BCtLQWsbbQX2ChbZoQbt7iFWkVWxFBsExhYSNiLVbmJwgWtsFCEQuF5GaTTpllF44x + d1lyBi3ywUAeu/ve7mSXq9Vm/BV9YHNc6TWVsECHga+imkpgWf164NTQrapa2v8HekHV0v7/i3Ah3lqt + eT02ijCfgXU9FkVG1HOtSdNF0eFphBup28bAo2ibJEt5n2gYeBaDHrAqOiLwRfRrozGX94mGgQe3Y2M2 + RJcFvifJAgPDShclI7oXg4xoW3RZ4CfRspsLfGifaCxw404I7HhdGMhEa14/aZ9o2Ji2mAyAuuiywKEx + W35zHe0TjQVOfEtTrwsDLbDrW3qlfaJh4MCZEh2KLgtkIPH6XPtEY4F9t2tjTr0uC3Sb6wNH2ieaDKg7 + U2PaovXHNv87A85krjUG2icauZ3+FNd6TGOBSxdItKfHopH35wPv8qcbVQzcuvb7NzsxTNQN/9XYIurq + 9RORAcfhS1BUTHQxaDZX9NoZU+cb8Ss8F83+y7EAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt - lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k - iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo - 4OWtCNeHAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHhJREFUSEvt + lEEOgCAMBPmkv9iX+T+8ampigtjUrlLCgTm2u9OEAylNhmMDlgys9fwN6Ui3nj+QYAZ25gjdYQpM9oan + 6MmYWAJrR6GJtNkvSmFz+UUhbi8XQg+EPpEm1GafsETWzoVH4MmoMEUme0IX2E74dz3pzgHsaODlqTYF + xgAAAABJRU5ErkJggg== @@ -278,152 +274,151 @@ - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAATVJREFUSEvd - lr1xwkAQhVWKIwLXcMdQg1PrNITEZGSUQANuwE04VUAGPTD6cQ3mnnhnY6+8QgfIhm9mZ3b3nfYJ6eZQ - 8qeYrBqZtJpcNPxMjpdYV+fWVR+XjTrneAkW4K5Yng1mYSZLiSpGchuGJi2WNq3WLAXQsIblN37rN2h3 - 41/+q4/t2NVPbCXI0YPGVj+6HqnJ6pVx5ca6skQgR49yf059h5Pp7gHBUsU+vz8ylZxq2Ac8cqaS6xgq - MzURWtuOa3Zwx3VMJfqF5eKnaTDz5+WcLUG0IbCumAXTT7O0yCi3Em1IgzdGOJybGhqXCbCOqUQTsb2/ - /nYOvzDU2taPNjwmGLJUiTb0x9gL9LaAxmUC6Ewlmnj/j/SYwQ378P8MsQlYnk2zoXTDgT8TB/8Qvj5J - sgdpisHcZQhdPAAAAABJRU5ErkJggg== + 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 + KGtGXgAAAABJRU5ErkJggg== - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft - VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G - DSXwwOVTu1dvLVcfRai1wcPapcF4LxhXX3XYC2sbh248QzP5ZBlpQ52tbRyuGa62lB2zPH58oJ3o7xiX - xxwELcojibDZrXMw1HTrJMJmfX3FomsIWpRHEmGzOW4jePXsQIB73P2gBbW/E8iESQfCw40adGEg4KxA - O64Oo4DPMJCuXYaome7DhPeGnR/IJ3jZtjjag7xlon+nBHAgFIDgeFLRQNoDvGzbNGBmGLH4K6ND+a/N - DySPsHbzaBGoQL4JTbrXfNSr8IsCmT8G7+Na1UAY2HBqv1gguMIMcXT7uIZ73X7RQKMJzeqB8Gm4fVyr - GggDG07t/+dA0DP+6hjVA00hf6C9enGC+KOdwyGQ1rKyy3H/3N1osW4QXc4OtKzsOjDx+dhyeaKe/jrK - E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft + VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2 + K1bMgA+p90VpLoU037OwNBfyQN8ghKyVkOZ3GdYK/TsQ0lypuDOriXkPdUX/DmwxXXFsKkR5RBUnIsoD + i7eqfhNSn6YgaYU8BoHFbL+fJmqmBvpC4VSSVshjEFjcLHcj+HDvYKB3XCh9omfoMQgsziqQO5D9gXhz + CzU6DESMCrSV5uAEfGIg20Sb7t52eK/Z+YF8khevDaI46Feh6hu+jIGGfzFupXoDqfpGXq3xGKhnNGL9 + WxYO5W8bbhnd236UhFCg3lkzhmubQ/0U/lEg/ltwhpaLBuLghmPjswWiK/UQSzvOny26QlmeoaxWiCOL + M8SRaSD/U++OLxhoDNMHKs3RCvJDG8M2UGmOqB+N98/qRUhTuVkmsyIt1E+CUD+7Quozzvxx6jNpoO6K + FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft - VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G - DSXwwOVTu1dvLVcfRai1wcPapcF4LxhXX3XYC2sbh248QzP5ZBlpQ52tbRyuGa62lB2zPH58oJ3o7xiX - xxwELcojibDZrXMw1HTrJMJmfX3FomsIWpRHEmGzOW4jePXsQIB73P2gBbW/E8iESQfCw40adGEg4KxA - O64Oo4DPMJCuXYaome7DhPeGnR/IJ3jZtjjag7xlon+nBHAgFIDgeFLRQNoDvGzbNGBmGLH4K6ND+a/N - DySPsHbzaBGoQL4JTbrXfNSr8IsCmT8G7+Na1UAY2HBqv1gguMIMcXT7uIZ73X7RQKMJzeqB8Gm4fVyr - GggDG07t/+dA0DP+6hjVA00hf6C9enGC+KOdwyGQ1rKyy3H/3N1osW4QXc4OtKzsOjDx+dhyeaKe/jrK - E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft + VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2 + K1bMgA+p90VpLoU037OwNBfyQN8ghKyVkOZ3GdYK/TsQ0lypuDOriXkPdUX/DmwxXXFsKkR5RBUnIsoD + i7eqfhNSn6YgaYU8BoHFbL+fJmqmBvpC4VSSVshjEFjcLHcj+HDvYKB3XCh9omfoMQgsziqQO5D9gXhz + CzU6DESMCrSV5uAEfGIg20Sb7t52eK/Z+YF8khevDaI46Feh6hu+jIGGfzFupXoDqfpGXq3xGKhnNGL9 + WxYO5W8bbhnd236UhFCg3lkzhmubQ/0U/lEg/ltwhpaLBuLghmPjswWiK/UQSzvOny26QlmeoaxWiCOL + M8SRaSD/U++OLxhoDNMHKs3RCvJDG8M2UGmOqB+N98/qRUhTuVkmsyIt1E+CUD+7Quozzvxx6jNpoO6K + FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft - VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G - DSXwwOVTu1dvLVcfRai1wcPapcF4LxhXX3XYC2sbh248QzP5ZBlpQ52tbRyuGa62lB2zPH58oJ3o7xiX - xxwELcojibDZrXMw1HTrJMJmfX3FomsIWpRHEmGzOW4jePXsQIB73P2gBbW/E8iESQfCw40adGEg4KxA - O64Oo4DPMJCuXYaome7DhPeGnR/IJ3jZtjjag7xlon+nBHAgFIDgeFLRQNoDvGzbNGBmGLH4K6ND+a/N - DySPsHbzaBGoQL4JTbrXfNSr8IsCmT8G7+Na1UAY2HBqv1gguMIMcXT7uIZ73X7RQKMJzeqB8Gm4fVyr - GggDG07t/+dA0DP+6hjVA00hf6C9enGC+KOdwyGQ1rKyy3H/3N1osW4QXc4OtKzsOjDx+dhyeaKe/jrK - E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft + VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2 + K1bMgA+p90VpLoU037OwNBfyQN8ghKyVkOZ3GdYK/TsQ0lypuDOriXkPdUX/DmwxXXFsKkR5RBUnIsoD + i7eqfhNSn6YgaYU8BoHFbL+fJmqmBvpC4VSSVshjEFjcLHcj+HDvYKB3XCh9omfoMQgsziqQO5D9gXhz + CzU6DESMCrSV5uAEfGIg20Sb7t52eK/Z+YF8khevDaI46Feh6hu+jIGGfzFupXoDqfpGXq3xGKhnNGL9 + WxYO5W8bbhnd236UhFCg3lkzhmubQ/0U/lEg/ltwhpaLBuLghmPjswWiK/UQSzvOny26QlmeoaxWiCOL + M8SRaSD/U++OLxhoDNMHKs3RCvJDG8M2UGmOqB+N98/qRUhTuVkmsyIt1E+CUD+7Quozzvxx6jNpoO6K + FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXpJREFUWEft - VMttxCAQdQlpIA3klEPMKreUEGlB2nSzp+0gh7Swl5SQEnwAK+UkzAL2gAa8tgHl4yc9WQzj956xPc2G - DSXwwOVTu1dvLVcfRai1wcPapcF4LxhXX3XYC2sbh248QzP5ZBlpQ52tbRyuGa62lB2zPH58oJ3o7xiX - xxwELcojibDZrXMw1HTrJMJmfX3FomsIWpRHEmGzOW4jePXsQIB73P2gBbW/E8iESQfCw40adGEg4KxA - O64Oo4DPMJCuXYaome7DhPeGnR/IJ3jZtjjag7xlon+nBHAgFIDgeFLRQNoDvGzbNGBmGLH4K6ND+a/N - DySPsHbzaBGoQL4JTbrXfNSr8IsCmT8G7+Na1UAY2HBqv1gguMIMcXT7uIZ73X7RQKMJzeqB8Gm4fVyr - GggDG07t/+dA0DP+6hjVA00hf6C9enGC+KOdwyGQ1rKyy3H/3N1osW4QXc4OtKzsOjDx+dhyeaKe/jrK - E2hYuQ0bCqJpvgGNsilBELCZFAAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft + VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2 + K1bMgA+p90VpLoU037OwNBfyQN8ghKyVkOZ3GdYK/TsQ0lypuDOriXkPdUX/DmwxXXFsKkR5RBUnIsoD + i7eqfhNSn6YgaYU8BoHFbL+fJmqmBvpC4VSSVshjEFjcLHcj+HDvYKB3XCh9omfoMQgsziqQO5D9gXhz + CzU6DESMCrSV5uAEfGIg20Sb7t52eK/Z+YF8khevDaI46Feh6hu+jIGGfzFupXoDqfpGXq3xGKhnNGL9 + WxYO5W8bbhnd236UhFCg3lkzhmubQ/0U/lEg/ltwhpaLBuLghmPjswWiK/UQSzvOny26QlmeoaxWiCOL + M8SRaSD/U++OLxhoDNMHKs3RCvJDG8M2UGmOqB+N98/qRUhTuVkmsyIt1E+CUD+7Quozzvxx6jNpoO6K + FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABDJJREFUWEft - V11oVEcU3lCxrdhfrKLV0gf7g1Cwbnbvrgmyalv6Q3/ce8cmxoegiJSC4A/GP9SH+iDYpxYLfehLaYvp - Q2mh9CnYljZaSNXdubMxtRClakBiREGNMW38ztwzd+/e3P3L1if94IOdc86cc/bMzJm5sfu4p9C6Jv+E - JeSrCdvdkHTkLsuW65JCrcgINZNN7j6E6H7AS8DNgRNl+B94POkowdPuDhJtcgECVUokij1Wx5lH2cX/ - h+T7/c/D+T+BQGNJ2/2KqpAWauHCN848GLfzLyZsuTbhuN9DT1Uytidh8yS7ahxWu5wDp+f8AEJ+lxan - nmZ1JJpF7gXY/m7mWI77R1r0PszqxkDO/GQcdYDFGs1CJVveOf0ID2OJbOGVWGyiiX5nMkenoVrf+HNt - dVgbNQLLLrxpHJJzFmtYWXc55NfBE/H2gVnQ7/Hs5BcmKVrKhJB/so+xuFDP6MlTBYIcZWejS1flZrNY - A7JvWUccCfy+SvuKzZB4IWV0liMPsbh+vCxOPAUn/2pntvsJizXon8L5a9CdNcEC7EqKfJpNNSzh/qZ1 - tjvIovph2a5tgmBvLGOxhuWonUYXRVT2AptqIJHNRpdq63+WxfUBCX1onLS0nZ7HYg2ctN1GV4ZDbKpB - m93oEo5ayeL6EAwaf7tvBos1LKFacV3s9+j2enZy3JcJdwubasB+kfGFhDpYXB9Q5nY4uExOqBexWCMh - 1A4ToAzPs6kG7zdPJ+RbLJ4arGxufrj917uH0ME3GR01TRZXB6rytzdRHmFRJOiUpRyZIcK+m4ON+bLQ - KUNVjrHNRRbVhmJCQcpxr1urjZnOwYfY1AfmfMy2oywqAT1RoPuLlpmqzeLaEJ1QCYfBg3Tz85SqCO+/ - VLawhNpITa+AYkLqEvgzfv8KBruwITVMXJ5kE6CQP+KRtobdlSAt8i/h9P1Q9CHHUbXXWR2NQIW6WaRB - tzsux48QFIn6SVWg+ozmxUXfY9TPAvdZmMN03+kgUSgmFL2pvRejXI1ThDdPqDqaekkpEL2HvgZv8ThA - bddjxvRiYPeTUS0hwuL3Tj5uTlOYmI9HWzC4z9toFV+SDV2wGN80uvAeK0G5JQtCBy4GqsYrqMgBuv3R - rfdifK1EX+2NVEuFakoIfrBvPqCnK8bbQbOUhkNIdOMioaaz22jUVCHc1kiY77HJxNK8S4G8y3nSIRjB - Xba14kYOopgQH3u8n3E0O+m0sElF0KbHnPXwEX4n3YC/fXV/swUqFKLETe7+RMlFf0FMNCGgwPyB0Nzb - OJGf0hOXDetD+YRKSE2xh5aE9pPXBlQ+ZINT5X5e7eukKooJySO651CLp2M6+Z+X46iuSLYwl102hpSt - LN0r8KBikQ98gTyH5LZhj/zCSxhMRC9NwxWZKmiT07H2TpbbRcmy6j7uJcRidwDfrieOkompDQAAAABJ - RU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAABANJREFUWEft + V1mIXFUQnWBwCa7BKK7kIy4MCJrOrdttgrQrLrj1rdKZxI+gSBBBcMG4oX7oh6BfioIf/oiK40dQEL+G + qJhEIYvTt25PYgIxRA1IjBhQxyQ6Uv3e6653+/X0Ev1KDhR0v1rueXXr1q03MnIcxxJWrKyfZcnfaBw/ + COifsc7fDxSuq1I4Nbb930A0cUJCgKcAebaL/APIXwMGiv3/U5gxf1EPIkUyaVftPD2OddSAe6cvBeS9 + aqFD4Pg9yUKFwpIlt+w8qeTqlxvn7zPIH6dZymy3VSgsjGMODTvuzwXkPa0FyK+r0LcXxHYay2jqMkDe + kPlY5G8qtPGU2G4oSLD224aXtW4ZBVh+x/bTsv+m1rhhZGR2nvyuVtfPN8gftHxdeFP7DgXrGrdmASV4 + TlfjawH5d0DeWhrfcbZBfi6x8+9kpGQrDfkt2TaXKFysYwwMg7w+DTZz9d1T52gdIH+k6uSA+v2b1FVm + Z2uNcnvr/Ks6xkC4irYuAuS/k3Tz61onb2rR3wTI3ysimawFqle0vSX+Ko2zWz8fCNaxyxYxtcY1OR2G + pwuItMQg/6jtwfGjma48Nr1Y6/qGdfxwFmT52PbztQ7IPxuTiGSftpdib5MN12td39CLlm7fvEDrLIUV + gP7FRHhjYuePtJ4RPxbZjypCq7Sub4DjcUD+RYJIL9I6Q+Gpgqxo+UHbp/WW6MjfpnUDw9amLozb/6A1 + ZJx/JNNJ09S6OQGOdyWO/sNYpyGnrIy+KgLIE+lih1rPolMG5DelNj/p5z3RJqTFH0m6dVhTXb375AKf + 11LbmVgnkBEFkL+TbZZsx/o5UUwoJ/sB+RW5+WPfbojrr1xrLJU2EpdBIdqEws+A4XNA/jLqwplIw9yQ + 2Cgh/ylQWBnHFVSofgUQf6IzbyjcHNvloDI0oZ/L7Q4uvJQQ7SBXIOEt8SvR5jOkn6n7LJb9ct/ptXLo + VdTJxOjvSWaeKDtJRmVLZSGZh94H5L86STTtJrP/MjHE67TQi5Dgyru2nZmdpliSoS0m0JTDFsO7YiMX + LCD/meniGsuh25ZppEc9XrCb/CozlNz+lsLzgHwwp+81I/WTob4IOd5lyD8koysgP6m2MpN90kZGKZwY + x8+hrwyNTS9u32OdYjHcKQsll3PHIThgMDw+ZyFrdBx78usMhdVyWmLbIkjRA/kHCuakPwDDCwN/s3Vv + jHKT82dCrvgLYnaefIGA4x2R72GD/IaMuLFHX+hOKCfSFCdlS6SekjYQ6jERi/x2r6+TntBF3ew50uLl + mHa+eTeZaWak1jgvjj0Uyi7YZq+gMBrrrGtcYtE/AeS/SLcwlxEhctQZGRZS5HKs04lxrZCNbY7jmMC/ + 364njv2rTroAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAh5JREFUWEft - ls9K3FAUxmenK4Wu7MIHsItCKbYdTDKzqIi1W7E4uXGs0F27EUToZh6hiDsFFy0I4gN0Z5ciLupO6bp/ - kntT6APIeM6dLzZxbiaZuYOr+cEHk3PP+fJN5iaTyohh4/hhyw3Cxzi8f1wh264vfzoiWkbpftEBIE+o - jyj3R70ZTc01/rxwfFk36XkjnkBrF+kAWr78XN349wDLxbgi2uky6eis5sfzaMvFMMf6XgvCKlryobTn - qaEL0gmLLuU2WjTeejzNv7HecEIdkU4p+A/qjTFrkLr2gvgtLLpxAvk6aa411CzKGXBCOtld8/Jy/OgT - 7LI4Qm52mtQBShlo7TBtZCPeR7D9T+fb8WLYQukWqve4tP2Jfrpd2GbJC0C1L2kDGzlCfYBtN6YAbiN+ - dNdEizYr99GlfMd7x1mTT6n2UM+Y+oX85YnolTbNwxSAhjYyRnRPu8HvZ1g2kunv6BvdRTNYzsd4BYQ6 - Toy8IFpBuSdJv/YScr/ebI9zPe1rxBxAPwfITG2hVEhy8vRjmD1tAlwtvm+PoVQIz3uBXMWh0ddIXoDC - wQKsA9DGW8LhQFgGUF9fLv+dxOFAWAUoHCqBVQBXhAv4ODBWAXq9eJTFKsAwGAUoH4BesbiRRc/9Jyhb - wT6JZ6nXdGq8TAboAbTHqQcVz996kS9OUQw14w9oaDqBdXlo6A29C2ybvllZ8Tz7wHJEDpXKDbpMJvlM - sZ3hAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAi5JREFUWEft + lj1rFFEUhtNppWClhT9AC0HEj+A9d7dQxI82GNx7xmjAThtBAjb5CSJ2ChYRBMkPsItlkBSxi1j7Mffc + EfwBsnJmd+LcM2eyd4aQKg+8xc55z3vOzszOztzcIfuMcfkqZPk5efzAAKQxOPpu0C/I2oFQLjCVxfBc + 1pMYLvmTV0e/rhhHQ02XR8Ux2VNRX2B6Ntbml/+ckL5WAP3LRshEnweuuC79EqWPtT3I8nnpbQCOtmpN + XwBpg2UxrNR99kFxmq9xecNh+AAYNgH9N0AqlOFThb82Kx7WcyJMRncq82AULso6Mx242QxPl3H+hcwt + MUhPJ6bwVtYYQHovw/qK7yOZP/12XMxXZW3vU9tNBv0rmV/StgAgvZMhfWUwPKlnR2gLwKg4K0NKOdpi + n3H0iO8dc58ugKNTZY/0TvTDor8VDZRoC1j0y2LwGmQ/L8WdMcrwTxbDGelroC0AGNarIJv5u3GHTn24 + QXozXBof5ePy0jbQFyifA/zLeBa729lduPYYnlyu/gt8vfl4fCR2t8P9NqN79c8yV0Uz8gIzG2eg5apo + xvIMOLodO7uh5apoRsDw8drC7+OxsxtaropmnNmUgJarohkB8xuxqztaropm3OvFIxUtVyXZ2JHk3GRj + R5Jzk40dSc7lVyw2smzmz8t6Hzinykx6TQeknaoBHL3mrfuK+3ezkHbkrFb+/wHtmzbkjJkA0qJFvyK/ + VRdxP+fI7EMk/wC6TCb5sn2T7wAAAABJRU5ErkJggg== - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAV1JREFUWEft - l09OAyEUxucI3RjTK7hqY8tsXbk2FRa9glsP0F7C83iELhjqwsPoUN/nUAojMGC64Jd8SXnte3yh/G0q - lf9ixeXDmndvvd7jJF/XQi2oTB4WT4cZ492h11eKWt59LMXnDZWbDnvutijuHgW/jLwXKjcdxuUehSkU - DPJ0DQrFw7gSPyZMDYX9UrvLmDtPz0nqbhxzmEtL90XdulkJxVyJJdVy+UjdX2IOsR7SkhpMjcwt0xCF - ipFkqN3KW7TvN8f56UeZQN04Q0LdoZ17t0XdKEMa/OfUzEayIaBN9cs021k2yVCJs2z4PsFQibMM8TRD - nngIyLM79sXPqIYc8TNCDdGKc84ZCFsF8tIMOSbvKe4whLZPPkOoi3j/2X9xs5f3mCEU9mnMEGJBV1vq - 7HcD1DHbUAzIs0do0uU/p6EsVEN/cXXPoKt7KGrs1ReuAk/pSsVL03wDEqTl6G2XZ9cAAAAASUVORK5C - YII= + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAWhJREFUWEft + lT1OxDAQhfcINAhxBapFbJyWihqBXewVaDkAewnOwxG2sA0FhwGZxcR+8ST+pfInvSLjeOZp4nE2m07n + n9hxeTtw9Tpw9ZYm+TwIvcV8RWzvj2eMqyPj6itHI1cf1+LzHPNmwx7V3iafd2BZzr4nzJsN4/JgE+Pa + GlOn5AHXomFci5MJV1NiWvplHgvvM2cS6wZx29xaphbW99gJzXBTa41c3qGPP9wWm5a21GRq4Wy5hnCt + NlmGxr28sM83D++X+H4JeYaEvrLPtW/bLEMG+839N8vJNmQxpmr+y4oMtfiXTesZhlr8y8oMEfEYqMJU + 3IMqTMVjoApTcQ+qMBWPgSpMxT2owhj/nbjZeXFlrwqqMBX3CB3en3jA0JQwLMrQ2mH3wPFeMoQdQS0Z + srHQdTADL0ATQ0MphAydFL4wo6hpqArd0Bqh6YuVs4+eplRw+lIVNU2p4PTFq2CaOp0MvgESpOXoqidz + oAAAAABJRU5ErkJggg== - iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAbtJREFUSEvt - VrtKxEAUTa+9P2AlWImNJOOCsH+wheSximBnI/a7lWBnYyfY2tj4AxZ21gt+gbDJZAsRtNR7NmdmX9FN - dhPYwgOHzL1z7z3zSjJOFXCDuMtmPXADfcom2g0v1N940jXRXxoY/fgM0IYAzVzBzF5w1pL8BNKsRjAr - kvYQWA/T3sQAvEi/ScdwJrVRNCiXLQGcNCsHRe02/As6KkhupP+epjmphQeIWGjQLCKofcSoKL2W499h - /BW75wK1kUNzviBg3j/QDZMHugsBtZFH829BKd5i/wyx1AyzwAdg+qWX2HIzRAFDxNm2P9hiiAVjpr88 - 5ZcUMII0c7G0oCmQx/wlXVawrXdQxMwOtHbdSyof4TuQZi5EaPjaVCJYBKstiKDlOdpDwxlBN9S3FK2N - 0KCc4zSC900vSs/M6eMoP4WYdWfcP7Kn/RnlUL0gd8IntaFBuXyoMDmxo5Mkun+F2x4cS+wX4pFLdzmo - IN6zdx25IqhQP46PHMx+XfY+9KHagybTF0Ojlay7kT73wuSZRWco+/MqopfK728zrRo0w/7avp/uiviR - /CMvlB83Dw7jDXavIhznByHwy8BScOvDAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAaBJREFUSEvt + lr1KA0EQx9Nr7wtYCVZiI7vrgZA3SCG3c1EEuzRiHyvBzsZOsLWx8QUs7KwDPkEgt7MpRNBSGe92bzO5 + hFzuIhb+Ych+zN5vd+bmsq1WAxI6veBjjUpoPA3akQT8ot+y+cqi3YcnoDYBiv40MOsveWoJ+ETm+o0A + s4fYATmuxuxgYgMywaE7ycoswWEBzHbiw9a0cqhPwz+wpbS5kYD3rp+/qTP9uZYAYkw+KrHXQmM/97/i + frNUGUhy9UcmwDzw+XmqBBRgOg7EjUI95a8x4kVfCUhynzeXO9+Ox1tlvj9RmPzyVAM6LfKy1AaGueNW + HtK6wC7uhOH81ZBKsHdkfDyUK5tGgIvobwOzGqprRQ6dTQEF4G0OXZkRwwMj/bYpE9tjBf6Rn7ofjhd9 + Pu7W2RdaOzGW2B4xPLBMCsyJ3928+0ku0R0fS8BP8qe1fH4hKZ3u+btOgkMF+MhPlP11+fvQu+qO2/w5 + lRR1zLpI8EyCeeZ5CfLzKsFeqni0zdfXUhtGa/ux3ZVgjpTGcxWn7YPDdIP7/Sl9AyHwy8Ak/n1mAAAA + AElFTkSuQmCC - iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAANJJREFUWEft - l18KwjAMh3sUL7G5R++wCj56M4/iIaz46FG0Kc1ACDRLGpAtH/woLV32tfsDDY6E4fy8ajNdXodaTs84 - p/cY00eTKT5OtZye/xXKLWw9O1nCVGiI6V6HWFBCKFsmSOkphP3jnG5lkgQXarErIWhL/Rzos7AUgppl - zIVciMCFWrhQi/0JQQsFuFmuy7ERUqSr0LJaRboK9cRECFZLnb04MRGCYlhYmm0L/Zy9hKml7F5q6qac - mAjBS46PQpxtC8HWE5/4muCP01lHCF/A7hOfW+9fQwAAAABJRU5ErkJggg== + iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAANVJREFUWEft + l1sKgzAQRV1KN6H10z0kQj+7sy6li3BKP7OUygQiZZo2k8dA0TlwCT4yngQNpuuUAvr5ca3NeHmeaN1i + BgNusPCqyWiXidYt5n+FDDicenbsMokK9Rbu9NovYkJBlt6bRUuhcHw2cKP3s1GhFIcSwtbXN+Bo/69I + CmFNf06FVCiCCqVQoRTHE8IWC3Cz9RMTqkhToW20FWkq1BIRIRwt3XdxIyLk/2Ei70lO9i30sf8qSKjV + RCgGfSA3IkLvK3Jx9i2EUx/5xHMSFk4llxXA7hOfWT0/MAAAAABJRU5ErkJggg== @@ -431,138 +426,136 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAARhJREFUSEvt - VLEOwVAU7aeYDH7Apm2I0WawkYjNJDFbfYCxbSQmiVHY/IDFF13nvhx9RFVfEQMnuWnfufee09v3Wu/3 - EMRyyAuWlQdEJC9Y9gUEiVT8SBZ4iszRC0ckM9WirAXIBAU6ZnZj8RDVoqzFJcllaRgDaHFp8cygEUnb - T2QcxjJCXYv0HUoZ4L322WgD75rpGzBf3ABPPGWTik78WOaXNSbqsiwFc8UNwB2Vh1GdlNdcSlU5nLoT - qRTKI5wMMhtc6/MazATNWGqk3jyBfjjalMhO9wD3Q+zDVjlcByxLYWpdDBQQX7HxOvZM34A5NwPFR78D - Fzw04I/OJF8M3ZsNZS3CSDpImhPzYqxh0KPsH1+H550BOIr69OqcMmkAAAAASUVORK5CYII= + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAQBJREFUSEvt + VLsKwkAQzKdYWfgDdt4dEUs7CzsFsbMSrG39AMvbQ7ASLEU7f8DGLxrZmIO40cglPgodmCJ7szPZu0ui + 6OegCcciSn0wNAFFlPrPQTvUlMVSjhxMizl7SX8OcOmY+aYwgr2kvz+8ynvoX1LWnwa0LDrKYWIIY01o + y3WPUgHaYiBvC++11DGCAwxhljGdKsLCPyuHntQHB2jCieuG0PS1eIV6EmBxvlWXC7jbEKovakgmiAkN + X3vtBPzhXO/2ns9AE0aKsEsCCMOcPjSAoR3WaWOWB6ljlApgvPU7CMHDgPRHlyxWJJ/NVvpHxqLrb0xF + bhShL/3/+B4uOIr69HXlzckAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAVxJREFUSEvt - UrFKA0EQPUuxEzvT2YqNteAXWPgBdgbC7p4spLAztVjZW1oG7OwULEQsrBRsxFYro96dxGZ9b5kTxdyy - a7TLg4GZ23nz3gyXTTA2XrVerbQ+HRV460nb7/HvAn8KOiq1duNEcCs+jjpFSkBkR8aFwdszpGxE3RfT - +w1w8w43F8xlQE/iM+dbodQeT1N0OkusowHSQ2XMLXMOre/7NecbBA5YV9bOs44GSDeIR+YhAeR91s7a - adbRwInOsMHQdbszIQFscMLak1JQKnVEIkRaIQHkV4gnT0pBaYy/7TDPF4MCSt2jvvOkFMD5Lge9GbPS - JOCcmyq0HsDMpdDiAeI2ByHWmgSerZ31PcYcCy0eIG2SjA02OFSGe4E6HxizwB6YORRaPHCidZLxN23J - px8o83zZb6D1vnyKB52SXLttirpHaGmA+3NxGIrrl3Z7TigTpCLLPgCVmc4p5cU+VwAAAABJRU5ErkJg - gg== + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAVNJREFUSEvt + k7FKA0EQhmMpdmJnOluxsRZ8AgsfwM5A2H9OFlLYmVqs7C0tA3Z2ChYiFlYKNmKrldHsrMRmZY47iUNu + N0e0ywcDszcz/+zMco3GjGkZAJseuBxnA6Cr82vz7w3+FLkRA2Eai04lQb2GusbAgdYdi+xeTH/XlHmT + 5P7CA18M3IhfCHQL+/El5ow5ktW4dntNa0Rh4MUTPYovouV+R32JOWNO5OytXdYaURh4YOBV/FgDBnpy + DtbOa40oHrjyRMPQ6SzEGjhjLuSs65OwMWf56ETNWAMG7hh40/VJmCjf7TDLVqMNjHlm4EnXJ/FEhyL0 + SbRR1SCEMOeAPhPd6vokDtgXIQa2qhq8W7uY5xCd6/okTLRbTLBT9R/0iVYkxwGnuj6JJ9rOHxnY07ES + zrL1YspjHUui1lJpow9eGw9cFzeM2f1Hq7Wka2dMzDeVmc4pCQ9DHQAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU - 0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j - LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei - ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3 - mS9gn2bY4UY/UzQ7E9TqfeTFtnuB+XAfzSHKr11kSl/uBebDiZ89ZCst3OUkdwL28sIVsE83ock+EIQV - 2Mz2wxeg6/UAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAENSURBVDhPrZHbSgJRGEZ9KX2HfI18I9ELkS5KCREMDBSN + VLRA0xDREQ+FTJai47mm8TDOF7NlhulHNwO14LvarHXxb4fjv4jnW6CLZRqIpKoI3Zbw3HwDdX6hC6cI + RnNwuT38yE1WoJ6JL5RC+rFxiAji8Uj0rkY9E+9lksnGqMu4TlSoZ7JT9yxihKjLuIoXqcfQNA2yssVo + KrOA8+z8eOAiVqAuY7NVMVsqEIdLfiAQyVAX6l7DSt5gIH2hI874AX84TX0o6x2k+Td6HwvUuxI/oD9a + 0Q+3+FyjP1qh1ZuiLAztB6yHe+nPUWuP8VB9tx+wHk54naBUH+D+SbQXMP771LgB/dHOqPsnfgDYzPbD + 7s5C8AAAAABJRU5ErkJggg== iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp - olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4 - 4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm - YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl - 5Kni3aFlFg2j3y1z5mnRTJccnNIltQhwq0jFry+mOXNtpWZWDx1Z1NhV3C3JwGFOw25SYjVe5oYhiUKd - HKMmwQUrMWUw/CF3NnZvvYKqUh1TvUroS3fXe7HXkwidMngTS2t5KLbregSzMY2f3Wr4qKW6LJvGR1rX - 0MLor8OhKYTJBn/GHvvxrliCTBrsOqXIoOBHh5K+hmSq7FqmexTQHuUytkaKxuNMNgYyVneA4Qd7GKjc - hjLaRzxH7gIU6JIZaEvgtk1D8wsxSWecCDgNzWFMvwxm/PkhRmr3Mli1nW9lvjRdWc0Jf+/5jzRmyWmv - S+GOLQu6U6BFjPvqKOP1AYw88WOoZif9DgmfLVtxaj1RSLdwNvrkPCA3M54KqxrnvRia9MKcGrUrqFOt - 5H7qKsqT1mGO9+Lqhc2ELdw+U/r0i+gVZ8hMiCDx3DHORwZyKnQ/hw/uYt9uCTskPvh6e7Fp41rWr/Fg - g6eHO+A/lyD8ARfG3mk9fv1YAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJGSURBVDhPxZJdSJNhGIa/gw46ssiKQiiwPPBkEBRRHYQU + USiKZRYkaULNHyqMhTl/2tR0c3Nz6le6rG26pk4ryyjsRyoUiZimjjRTs6KwFDNDJf+ucAN1KdVZN9wH + L89zX8/zvryC8I9SGmxcUFvIFu38XvuromSiRyjdYHOdI2WFCB/73lBt1S9yR8uTP04Ki88lJDYPYba5 + q83M+HCVyz+HbEwOmLBbculofbok5FCcjpAYA0HSAoSqUh1jQ+Ue4en+IiadCZRfV1NWnIWpMB1jXhpX + tHIKVIme0AqzhrGv5rnwTH8RdMnBKV3SiwA3SlT8+GycC9dVa1x+YM+h1qbidlkWdlMGNqMSi3iRa4YU + inVyRE2SG1ZmzGLkfb5r7d4GBTXlOqZ7ldCX6el3SuhJhk4ZvI6ntTIc61U9gknM4Hu3Gj5ouVORS9ND + rbtp4eqvIsERxlRjIOOPAnhbKkEmDXVfpcSg4FuHkr7GVGpsWmZ6FNAe4w62RoPjKFNNwYzX72Pk/i4G + q7egjPXDIsrdgCJdKoNtSdy0amh+robOBGg/Cc0RzLwIZeLZAUbrdjNUs5UvFf44Lq3kWKDv/EOKOXLa + 69O4Zc2B7jRoiYSXh5loCGL0cQDDtdsZsEv4ZN6MU+uNQrqJ07HH5wH52YlUWdQ478bh0AtzbtIuo161 + nHvpK6hMWYMp0YfL5zYSsXD6rPSZ59ErTpGdFEXymSOcjQ7mRPheDu7fwZ6dErZJ/PD39WHD+tWsXeXF + Om+vJX/n/9MvF8beaWm1d4MAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW - DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3 - 8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ - 1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH - 4AJizD4UXJrCAUuzEDgbZrjgou2DiohshIcnQtgme5GTPYbkJKcQ1N8OckHW2REVi+RXuM8fxGaDG4oy - ALPZIQQ11Z+5QDk1oKJ/hjv7P2FTfCMOH3mFxMQ6IbhROYWOdrCnBI4dfwPr0V4+bRoY9UzXppMjcDdS - rC8hy3YhuFI2gTYf2A4Aza4f7N2/o/zaLB8qDYx6zszwr8P7k1thNFYIweXCMXgeAfedq2xxwjClZUeV - Jd2GtDNFETiJwfs8MBjKhMCWN8pgoLoqzE8miH1GjE7G4PsZjE7OQsm9ij2mFg7rdrug1xcJAa2l4w7W - r00Cgk/n38S7wBwC04u4UGxHrMHF4CbEJtyDLj5fCDIzhljfSxzeavRgyw4Zj9t64GvvQ0d3P3pfD2Kv - 2QqNvgFxDN6urYdWmyMElJMnevh60obRktA701PRtGlg1DOdSkXwzrisaMG/RZLWAE60OMW5fNhvAAAA - AElFTkSuQmCC + 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 - tAAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAF+SURBVDhPnZLNSwJBHIb9F7x26VbQuTp1KPCQQbfuEUZE + kOFNErp2iTpEkSkFqZgoht+thbZaUGlIZB+HDqFkkRCEleXHvjEju7SjG9ILL8vAPA+/mR2VP3EHtt5Y + Fi4uA3vgDBc3Oaj+CgGUYnUfoU+rgzOQUJbsxa9ZTsqanUP0JNuQ+PnWEvfBJctJWd2JoH9kUirL0jjD + aZaTUq3VqUQUsSyNzX/KcjS5xyI4PgXLbpDWHU4gXyg2S7a8SZalGwnse6/C89SoI12gktv7vFyy6Yqx + PBwhnsIv9cb6GXUqESeRCdYdUZbHsi0kCcSSNZnCaFqRC8gF/Q65OCI4/ALOhQZMvkSgipcwN7+oLBAE + AR/lCj3CbOaTSkhF2GQNQj8zrSz4rtTw+lZG6uoBvkiSSggowgbDOLaN6tYC8X+LXbL4sB87psfRL5gx + OjYF3qoByma5hGwmT7Wdanu7UeI6qMSkG2h+E+1kYriLSsgU/5b0dKqhGRwC59nAD0DfQkh848odAAAA + AElFTkSuQmCC iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi - LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb - QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk - EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C - 1NsXzN4PKIxJLLgeIJ2MoXvmFraNBKK3eXZRIveJPvs7FIYniEkXZENOdE+GIZ2Ko10TwLK7tJmKmL0F - EEYarYM+NMnt0C1sQzpx/lcSEnZ2gcKY/gs0dlmZuWvmjjmpwA1qxVp2AWFIMAF/OAGBzMjMI7ZrtJCb - 4Df3o4Zfxy7QrdxDRFKol5khkpR2H4qmIOzUQNBGwrsXYxccnNOQqNbQ0KGGZ+eEPVwdeLxvqqrf4wGh - TNAAAAAASUVORK5CYII= + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGASURBVDhPrZFLSwIBFIX9NYGbFoUlFElU1EJQUCYhCLNI + yyhbREpkBTqCaSZJO1toCDVGD5AwKkohsyijskWv8YFpCUbrghOOILlwmMBvcy+Xc77N5fFqzU38Gb7t + A/y9vaayWKcCFbeqvOcLsK16K8LU3iEiFzFugiIuN4WDkyhTyH0UoNbNIplIcBdsBU5hX/UinckhFImh + VzmGt7cMd8FR+AqLLg82d4LQLyyhTznCvVwkmc5ian4JQxNzIPpHYbLY/icootXbQCgnQWgsCJ3HuQtS + Hz+w+r+gIJMwe54gMVxDbryHY4NG9D7PLqJz3xhwfkJhekGHygPpiBtyQxiSmTi6tEEse0ufqYrVXwBB + ZtA+vIOWXid05m1Ipi/LJSHhZBcoyHQ50CyzM7vM+MBMKniH+o4xdgFhoplAIExDICWZfdxxizbVJvit + g6jjN7ALdCuPEKkoNEqtEIlLvz+MpiDs0ULQqYJ//5pdcHyZgVi9hqZuDXy7Z+zhWvELqqrf48XNh8IA + AAAASUVORK5CYII= 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 diff --git a/PEIS/View/Enrollment/EnrollmentPersonForm.cs b/PEIS/View/Enrollment/EnrollmentPersonForm.cs index 207be21..56570db 100644 --- a/PEIS/View/Enrollment/EnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/EnrollmentPersonForm.cs @@ -480,6 +480,12 @@ namespace PEIS.View.Enrollment return; } + if (item.IsOccupational && _chooseRegItem.Type.Contains("职业")) + { + Global.Msg("info", "此为职业体检必检项目，不可改动！"); + return; + } + if (DgvEFeeItem.FocusedColumn.ToString() == "套餐" && item.PackId != null) { if (Global.Msg("warn", "确定移除当前套餐吗？") == DialogResult.No) return; diff --git a/PEIS/View/Enrollment/NewEnrollmentPersonForm.Designer.cs b/PEIS/View/Enrollment/NewEnrollmentPersonForm.Designer.cs index 989cac7..a3b4e20 100644 --- a/PEIS/View/Enrollment/NewEnrollmentPersonForm.Designer.cs +++ b/PEIS/View/Enrollment/NewEnrollmentPersonForm.Designer.cs @@ -73,8 +73,19 @@ this.label6 = new System.Windows.Forms.Label(); this.ExamDate = new System.Windows.Forms.DateTimePicker(); this.CardTypeComboBox = new System.Windows.Forms.ComboBox(); + this.HazardYears = new System.Windows.Forms.TextBox(); + this.JobTypes = new System.Windows.Forms.TextBox(); + this.label7 = new System.Windows.Forms.Label(); + this.label8 = new System.Windows.Forms.Label(); + this.JobStatusComboBox = new System.Windows.Forms.ComboBox(); + this.label9 = new System.Windows.Forms.Label(); + this.label10 = new System.Windows.Forms.Label(); + this.HazardFactorsComboBox = new DevExpress.XtraEditors.CheckedComboBoxEdit(); + this.label11 = new System.Windows.Forms.Label(); + this.WorkYears = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.Photo)).BeginInit(); this.SexGroupBox.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.HazardFactorsComboBox.Properties)).BeginInit(); this.SuspendLayout(); // // label4 @@ -101,7 +112,7 @@ // CancelBtn // this.CancelBtn.Image = ((System.Drawing.Image)(resources.GetObject("CancelBtn.Image"))); - this.CancelBtn.Location = new System.Drawing.Point(304, 553); + this.CancelBtn.Location = new System.Drawing.Point(475, 674); this.CancelBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.CancelBtn.Name = "CancelBtn"; this.CancelBtn.Size = new System.Drawing.Size(78, 34); @@ -114,7 +125,7 @@ // ConfirmBtn // this.ConfirmBtn.Image = ((System.Drawing.Image)(resources.GetObject("ConfirmBtn.Image"))); - this.ConfirmBtn.Location = new System.Drawing.Point(148, 553); + this.ConfirmBtn.Location = new System.Drawing.Point(319, 674); this.ConfirmBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.ConfirmBtn.Name = "ConfirmBtn"; this.ConfirmBtn.Size = new System.Drawing.Size(77, 34); @@ -140,7 +151,7 @@ // Company // this.Company.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Company.Location = new System.Drawing.Point(85, 465); + this.Company.Location = new System.Drawing.Point(85, 591); this.Company.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Company.Name = "Company"; this.Company.Size = new System.Drawing.Size(437, 23); @@ -150,7 +161,7 @@ // this.label3.AutoSize = true; this.label3.Font = new System.Drawing.Font("微软雅黑", 9F); - this.label3.Location = new System.Drawing.Point(19, 468); + this.label3.Location = new System.Drawing.Point(19, 594); this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(48, 17); @@ -200,7 +211,7 @@ // Description // this.Description.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Description.Location = new System.Drawing.Point(85, 506); + this.Description.Location = new System.Drawing.Point(85, 629); this.Description.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Description.Name = "Description"; this.Description.Size = new System.Drawing.Size(437, 23); @@ -210,7 +221,7 @@ // this.RemarkLabel.AutoSize = true; this.RemarkLabel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.RemarkLabel.Location = new System.Drawing.Point(19, 510); + this.RemarkLabel.Location = new System.Drawing.Point(19, 633); this.RemarkLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.RemarkLabel.Name = "RemarkLabel"; this.RemarkLabel.Size = new System.Drawing.Size(48, 17); @@ -231,7 +242,7 @@ // Address1 // this.Address1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.Address1.Location = new System.Drawing.Point(85, 420); + this.Address1.Location = new System.Drawing.Point(84, 548); this.Address1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Address1.Name = "Address1"; this.Address1.Size = new System.Drawing.Size(437, 23); @@ -270,7 +281,7 @@ // this.AddressLabel.AutoSize = true; this.AddressLabel.Font = new System.Drawing.Font("微软雅黑", 9F); - this.AddressLabel.Location = new System.Drawing.Point(19, 425); + this.AddressLabel.Location = new System.Drawing.Point(19, 551); this.AddressLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); this.AddressLabel.Name = "AddressLabel"; this.AddressLabel.Size = new System.Drawing.Size(56, 17); @@ -501,7 +512,7 @@ // TakePhotoBtn // this.TakePhotoBtn.Image = ((System.Drawing.Image)(resources.GetObject("TakePhotoBtn.Image"))); - this.TakePhotoBtn.Location = new System.Drawing.Point(534, 513); + this.TakePhotoBtn.Location = new System.Drawing.Point(534, 503); this.TakePhotoBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.TakePhotoBtn.Name = "TakePhotoBtn"; this.TakePhotoBtn.Size = new System.Drawing.Size(418, 34); @@ -559,6 +570,119 @@ this.CardTypeComboBox.Size = new System.Drawing.Size(172, 25); this.CardTypeComboBox.TabIndex = 119; // + // HazardYears + // + this.HazardYears.Enabled = false; + this.HazardYears.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HazardYears.Location = new System.Drawing.Point(349, 463); + this.HazardYears.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.HazardYears.Name = "HazardYears"; + this.HazardYears.Size = new System.Drawing.Size(172, 23); + this.HazardYears.TabIndex = 123; + // + // JobTypes + // + this.JobTypes.Enabled = false; + this.JobTypes.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.JobTypes.Location = new System.Drawing.Point(349, 421); + this.JobTypes.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.JobTypes.Name = "JobTypes"; + this.JobTypes.Size = new System.Drawing.Size(172, 23); + this.JobTypes.TabIndex = 122; + // + // label7 + // + this.label7.AutoSize = true; + this.label7.Font = new System.Drawing.Font("微软雅黑", 9F); + this.label7.Location = new System.Drawing.Point(276, 468); + this.label7.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label7.Name = "label7"; + this.label7.Size = new System.Drawing.Size(56, 17); + this.label7.TabIndex = 127; + this.label7.Text = "接害工龄"; + // + // label8 + // + this.label8.AutoSize = true; + this.label8.Font = new System.Drawing.Font("微软雅黑", 9F); + this.label8.Location = new System.Drawing.Point(276, 425); + this.label8.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(48, 17); + this.label8.TabIndex = 126; + this.label8.Text = "工 种"; + // + // JobStatusComboBox + // + this.JobStatusComboBox.Enabled = false; + this.JobStatusComboBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.JobStatusComboBox.FormattingEnabled = true; + this.JobStatusComboBox.Location = new System.Drawing.Point(84, 420); + this.JobStatusComboBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.JobStatusComboBox.Name = "JobStatusComboBox"; + this.JobStatusComboBox.Size = new System.Drawing.Size(176, 25); + this.JobStatusComboBox.TabIndex = 120; + // + // label9 + // + this.label9.AutoSize = true; + this.label9.Font = new System.Drawing.Font("微软雅黑", 9F); + this.label9.Location = new System.Drawing.Point(19, 512); + this.label9.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(56, 17); + this.label9.TabIndex = 125; + this.label9.Text = "接害因素"; + // + // label10 + // + this.label10.AutoSize = true; + this.label10.Font = new System.Drawing.Font("微软雅黑", 9F); + this.label10.Location = new System.Drawing.Point(18, 425); + this.label10.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(56, 17); + this.label10.TabIndex = 124; + this.label10.Text = "在岗情况"; + // + // HazardFactorsComboBox + // + this.HazardFactorsComboBox.EditValue = ((object)(resources.GetObject("HazardFactorsComboBox.EditValue"))); + this.HazardFactorsComboBox.Enabled = false; + this.HazardFactorsComboBox.Location = new System.Drawing.Point(85, 509); + this.HazardFactorsComboBox.Name = "HazardFactorsComboBox"; + this.HazardFactorsComboBox.Properties.Appearance.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.HazardFactorsComboBox.Properties.Appearance.Options.UseFont = true; + this.HazardFactorsComboBox.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { + new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); + this.HazardFactorsComboBox.Properties.EditValueType = DevExpress.XtraEditors.Repository.EditValueTypeCollection.List; + this.HazardFactorsComboBox.Properties.IncrementalSearch = true; + this.HazardFactorsComboBox.Properties.SelectAllItemCaption = "（全选）"; + this.HazardFactorsComboBox.Properties.SeparatorChar = ';'; + this.HazardFactorsComboBox.Size = new System.Drawing.Size(437, 24); + this.HazardFactorsComboBox.TabIndex = 128; + // + // label11 + // + this.label11.AutoSize = true; + this.label11.Font = new System.Drawing.Font("微软雅黑", 9F); + this.label11.Location = new System.Drawing.Point(19, 468); + this.label11.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(48, 17); + this.label11.TabIndex = 129; + this.label11.Text = "工 龄"; + // + // WorkYears + // + this.WorkYears.Enabled = false; + this.WorkYears.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.WorkYears.Location = new System.Drawing.Point(84, 465); + this.WorkYears.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); + this.WorkYears.Name = "WorkYears"; + this.WorkYears.Size = new System.Drawing.Size(176, 23); + this.WorkYears.TabIndex = 130; + // // NewEnrollmentPersonForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -566,7 +690,17 @@ this.AutoScroll = true; this.AutoSize = true; this.BackColor = System.Drawing.Color.White; - this.ClientSize = new System.Drawing.Size(972, 603); + this.ClientSize = new System.Drawing.Size(972, 723); + this.Controls.Add(this.WorkYears); + this.Controls.Add(this.label11); + this.Controls.Add(this.HazardFactorsComboBox); + this.Controls.Add(this.HazardYears); + this.Controls.Add(this.JobTypes); + this.Controls.Add(this.label7); + this.Controls.Add(this.label8); + this.Controls.Add(this.JobStatusComboBox); + this.Controls.Add(this.label9); + this.Controls.Add(this.label10); this.Controls.Add(this.CardTypeComboBox); this.Controls.Add(this.ExamDate); this.Controls.Add(this.label6); @@ -618,6 +752,7 @@ ((System.ComponentModel.ISupportInitialize)(this.Photo)).EndInit(); this.SexGroupBox.ResumeLayout(false); this.SexGroupBox.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.HazardFactorsComboBox.Properties)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -669,5 +804,15 @@ private System.Windows.Forms.Label label6; private System.Windows.Forms.DateTimePicker ExamDate; private System.Windows.Forms.ComboBox CardTypeComboBox; + private System.Windows.Forms.TextBox HazardYears; + private System.Windows.Forms.TextBox JobTypes; + private System.Windows.Forms.Label label7; + private System.Windows.Forms.Label label8; + private System.Windows.Forms.ComboBox JobStatusComboBox; + private System.Windows.Forms.Label label9; + private System.Windows.Forms.Label label10; + private DevExpress.XtraEditors.CheckedComboBoxEdit HazardFactorsComboBox; + private System.Windows.Forms.Label label11; + private System.Windows.Forms.TextBox WorkYears; } } \ No newline at end of file diff --git a/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs b/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs index af630ae..498e4e1 100644 --- a/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs @@ -56,6 +56,9 @@ namespace PEIS.View.Enrollment CancelBtn.Click += CancelBtn_Click; // 手机号校验 Tel1.Leave += Tel1_Leave; + // 职业病判断 + ExamTypeComboBox.SelectedValueChanged += ExamTypeComboBox_SelectedValueChanged; + if (editStatus && Global.currentUser.Code == Global._hospital.DoctCode) { @@ -67,6 +70,27 @@ namespace PEIS.View.Enrollment } } + private void ExamTypeComboBox_SelectedValueChanged(object sender, EventArgs e) + { + var type = ExamTypeComboBox.SelectedValue?.ToString(); + if (type.Contains("职业")) + { + JobTypes.Enabled = true; + WorkYears.Enabled = true; + HazardYears.Enabled = true; + JobStatusComboBox.Enabled = true; + HazardFactorsComboBox.Enabled = true; + } + else + { + JobTypes.Enabled = false; + WorkYears.Enabled = false; + HazardYears.Enabled = false; + JobStatusComboBox.Enabled = false; + HazardFactorsComboBox.Enabled = false; + } + } + private void CameraPlayer_NewFrame(object sender, ref Bitmap image) { @@ -166,7 +190,7 @@ namespace PEIS.View.Enrollment MaritalComboBox.SelectedValue = item?.Marriage ?? "未知"; OccupationComboBox.SelectedValue = item?.Occupation ?? "其它劳动者"; EducationComboBox.SelectedValue = item?.Education ?? "其它"; - Contactor1.Text = item?.Contactor1; + Contactor1.Text = item?.Name; Contactor2.Text = item?.Contactor2; Tel1.Text = item?.Tel1; Tel2.Text = item?.Tel2; @@ -174,6 +198,12 @@ namespace PEIS.View.Enrollment Company.Text = item?.Company; Description.Text = item?.Description; Photo.Image = Base64ToImage(item?.Photo); + JobTypes.Text = item?.JobTypes; + JobStatusComboBox.SelectedValue = item?.JobStatus ?? "岗前"; + WorkYears.Text = item?.WorkYears; + HazardYears.Text = item?.HazardYears; + HazardFactorsComboBox.SetEditValue(item?.HazardFactors.Split(';').Select(s => (object)s.Trim()).ToList()); + OnGetPid(); } @@ -267,7 +297,7 @@ namespace PEIS.View.Enrollment Education = EducationComboBox.SelectedValue?.ToString(), ExamDate = ExamDate.Value.Date, Type = ExamTypeComboBox.SelectedValue?.ToString(), - Contactor1 = Contactor1.Text.Trim(), + Contactor1 = NameTextBox.Text.Trim(), Contactor2 = Contactor2.Text.Trim(), Tel1 = Tel1.Text.Trim(), Tel2 = Tel2.Text.Trim(), @@ -278,20 +308,133 @@ namespace PEIS.View.Enrollment SpellCode = PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin[0] }; - if (_editStatus) + var ExamType = ExamTypeComboBox.SelectedValue?.ToString(); + if (ExamType.Contains("职业")) + { + item.JobTypes = JobTypes.Text.Trim(); + item.WorkYears = WorkYears.Text.Trim(); + item.HazardYears = HazardYears.Text.Trim(); + item.JobStatus = JobStatusComboBox.SelectedValue?.ToString(); + item.HazardFactors = HazardFactorsComboBox.Text; + } + + + var _hazardListeee = HazardFactorsComboBox.EditValue as List; + + if (_editStatus) // 编辑 { item.ID = _regInfo.ID; item.PID = _regInfo?.PID; OnUpdateRegItem(item); + + // 判断是否更改为职业体检 + if (ExamType.Contains("职业")) + { + // 避免重复开设，删除个人所有项目 + DAOHelp.ExecuteSql($@"UPDATE Enrollment_FeeItem SET EID = -{_regInfo?.ID}, CreateTime = GETDATE(), CreatorCode = '{Global.currentUser.Code}', Creator = '{Global.currentUser.Name}', IsSend = 0 WHERE EID = {_regInfo?.ID}"); + + List _feeItemsList = new List(); + + // 接害类型 + var _hazardList = HazardFactorsComboBox.EditValue as List; + + foreach (var hItem in _hazardList?.Select(s => s?.ToString()).ToList()) + { + var feeItem = DAOHelp.GetDataBySQL($@"EXEC sp_HazardFactors_FeeItem '{item.JobStatus.Trim()}', '{hItem.Trim()}' "); + _feeItemsList.AddRange(feeItem); + } + + // 去除重复项 + var _distFeeItem = _feeItemsList.GroupBy(g => g.KeyNo).Select(s => s.First()).ToList(); + + foreach (var dItem in _distFeeItem) + { + EnrollmentFeeItem eItem = new EnrollmentFeeItem(); + Int32 index = 0; + + eItem.EID = _regInfo?.ID; + eItem.FID = dItem.ID; + eItem.FeeItemCode = dItem.FeeItemCode; + eItem.FeeItemName = dItem.FeeItemName; + eItem.Quantity = 1; + eItem.Unit = dItem.Unit; + eItem.Price = dItem.Price; + eItem.SettlePrice = dItem.SettlePrice; + eItem.ItemClass = dItem.ItemClass; + eItem.CreateTime = DateTime.Now; + eItem.CreatorCode = Global.currentUser.Code; + eItem.Creator = Global.currentUser.Name; + eItem.DeptCode = dItem.DeptCode; + eItem.DeptName = dItem.DeptName; + eItem.Seq = index; + eItem.KeyNo = dItem.KeyNo; + eItem.IsOccupational = true; + + eItem.Save(); + } + + } } - else + else //新增 { item.PID = _baseInfo?.ID; item.CreateTime = DateTime.Now; item.CreatorCode = Global.currentUser.Code; item.Creator = Global.currentUser.Name; if (item.Save()) + { + // 新增成功后判断是否职业体检 + if (ExamType.Contains("职业")) + { + List _feeItemsList = new List(); + + // 获取新增的体检ID + var _list = DAOHelp.GetDataBySQL($@"SELECT TOP 1 ID FROM Enrollment_Patient WHERE CardNo = '{item.CardNo}' AND Name = '{item.Name}' ORDER BY ID DESC"); + if (_list == null) return; + + var EPItem = _list[0]; + + // 接害类型 + var _hazardList = HazardFactorsComboBox.EditValue as List; + + foreach (var hItem in _hazardList?.Select(s => s?.ToString()).ToList()) + { + var feeItem = DAOHelp.GetDataBySQL($@"EXEC sp_HazardFactors_FeeItem '{item.JobStatus.Trim()}', '{hItem.Trim()}' "); + _feeItemsList.AddRange(feeItem); + } + + // 去除重复项 + var _distFeeItem = _feeItemsList.GroupBy(g => g.KeyNo).Select(s => s.First()).ToList(); + + foreach (var dItem in _distFeeItem) + { + EnrollmentFeeItem eItem = new EnrollmentFeeItem(); + Int32 index = 0; + + eItem.EID = EPItem.ID; + eItem.FID = dItem.ID; + eItem.FeeItemCode = dItem.FeeItemCode; + eItem.FeeItemName = dItem.FeeItemName; + eItem.Quantity = 1; + eItem.Unit = dItem.Unit; + eItem.Price = dItem.Price; + eItem.SettlePrice = dItem.SettlePrice; + eItem.ItemClass = dItem.ItemClass; + eItem.CreateTime = DateTime.Now; + eItem.CreatorCode = Global.currentUser.Code; + eItem.Creator = Global.currentUser.Name; + eItem.DeptCode = dItem.DeptCode; + eItem.DeptName = dItem.DeptName; + eItem.Seq = index; + eItem.KeyNo = dItem.KeyNo; + eItem.IsOccupational = true; + + eItem.Save(); + } + + } Global.Msg("info", "保存成功！"); + } } Close(); @@ -321,6 +464,18 @@ namespace PEIS.View.Enrollment CardTypeComboBox.DisplayMember = "Value"; CardTypeComboBox.ValueMember = "Value"; + JobStatusComboBox.DataSource = Global._lstDictHazardTypes.Where(a => a.ParentID == null).ToList(); + JobStatusComboBox.DisplayMember = "Name"; + JobStatusComboBox.ValueMember = "Name"; + + + foreach (var item in Global._lstDictHazardTypes.Where(a => a.ParentID != null).ToList()) + { + HazardFactorsComboBox.Properties.Items.Add(item.Name); + } + HazardFactorsComboBox.Properties.DisplayMember = "Name"; + HazardFactorsComboBox.Properties.ValueMember = "Name"; + SelectPerson(new BasePatient(_regInfo)); })); } diff --git a/PEIS/View/Enrollment/NewEnrollmentPersonForm.resx b/PEIS/View/Enrollment/NewEnrollmentPersonForm.resx index 0f82f12..8646221 100644 --- a/PEIS/View/Enrollment/NewEnrollmentPersonForm.resx +++ b/PEIS/View/Enrollment/NewEnrollmentPersonForm.resx @@ -166,6 +166,15 @@ 2uMI1idyv1CsFr7EFW8cszYGRW6IOZ0Oft0ihUNzkoU/zKxdpERuiimuNxOlQdLBMM0vJuGHD8j8H+nw NfBCLEEWTtBN450282oeiNwU+iqmcG2woViCcGFHG3hTLkUKhbdq3+zeO4H3O6TBlzFCSIrhO6/ZaPzw Wp7QrI8eGmI3SINKpAZ/jFjsE9vLiZmE0xwHAAAAAElFTkSuQmCC + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u + ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u + PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB + AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLk9iamVjdAMAAAAGX2l0 + ZW1zBV9zaXplCF92ZXJzaW9uBQAACAgCAAAACQMAAAAAAAAAAAAAABADAAAAAAAAAAs= \ No newline at end of file diff --git a/PEIS/View/Exam/PartForm.Designer.cs b/PEIS/View/Exam/PartForm.Designer.cs index 2edfa97..a040cff 100644 --- a/PEIS/View/Exam/PartForm.Designer.cs +++ b/PEIS/View/Exam/PartForm.Designer.cs @@ -28,6 +28,7 @@ /// private void InitializeComponent() { + this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PartForm)); this.splitContainerBase = new System.Windows.Forms.SplitContainer(); this.panelPatients = new System.Windows.Forms.Panel(); @@ -76,7 +77,7 @@ this.dgvSign = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.dgcExamResult = new DevExpress.XtraGrid.GridControl(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); this.menuGiveUp1 = new System.Windows.Forms.ToolStripMenuItem(); this.menuGiveUp2 = new System.Windows.Forms.ToolStripMenuItem(); this.menuGiveUp3 = new System.Windows.Forms.ToolStripMenuItem(); @@ -239,6 +240,7 @@ this.colRptExtTime = new DevExpress.XtraGrid.Columns.GridColumn(); this.colRptExtDesc = new DevExpress.XtraGrid.Columns.GridColumn(); this.superTabControl1 = new FastReport.DevComponents.DotNetBar.SuperTabControl(); + this.tsmiOccupation = new System.Windows.Forms.ToolStripMenuItem(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerBase)).BeginInit(); this.splitContainerBase.Panel1.SuspendLayout(); this.splitContainerBase.Panel2.SuspendLayout(); @@ -972,34 +974,34 @@ this.menuGiveUp3, this.menuGiveUp4}); this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(149, 92); + this.contextMenuStrip1.Size = new System.Drawing.Size(157, 100); // // menuGiveUp1 // this.menuGiveUp1.Image = global::PEIS.Properties.Resources.弃检; this.menuGiveUp1.Name = "menuGiveUp1"; - this.menuGiveUp1.Size = new System.Drawing.Size(148, 22); + this.menuGiveUp1.Size = new System.Drawing.Size(156, 24); this.menuGiveUp1.Text = "项目弃检"; // // menuGiveUp2 // this.menuGiveUp2.Image = global::PEIS.Properties.Resources.取消弃检; this.menuGiveUp2.Name = "menuGiveUp2"; - this.menuGiveUp2.Size = new System.Drawing.Size(148, 22); + this.menuGiveUp2.Size = new System.Drawing.Size(156, 24); this.menuGiveUp2.Text = "取消项目弃检"; // // menuGiveUp3 // this.menuGiveUp3.Image = global::PEIS.Properties.Resources.弃检; this.menuGiveUp3.Name = "menuGiveUp3"; - this.menuGiveUp3.Size = new System.Drawing.Size(148, 22); + this.menuGiveUp3.Size = new System.Drawing.Size(156, 24); this.menuGiveUp3.Text = "科室弃检"; // // menuGiveUp4 // this.menuGiveUp4.Image = global::PEIS.Properties.Resources.取消弃检; this.menuGiveUp4.Name = "menuGiveUp4"; - this.menuGiveUp4.Size = new System.Drawing.Size(148, 22); + this.menuGiveUp4.Size = new System.Drawing.Size(156, 24); this.menuGiveUp4.Text = "取消科室弃检"; // // DgvExamResult @@ -2850,6 +2852,7 @@ this.tsmiReview, this.tsmiConclusion, this.tsmiSave, + this.tsmiOccupation, this.tsmiPick, this.strip1, this.stripTxtEid, @@ -3012,6 +3015,16 @@ this.superTabControl1.SelectedTabIndex = -1; this.superTabControl1.TabIndex = 0; // + // tsmiOccupation + // + this.tsmiOccupation.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.tsmiOccupation.Image = global::PEIS.Properties.Resources.个人信息__1_; + this.tsmiOccupation.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tsmiOccupation.Name = "tsmiOccupation"; + this.tsmiOccupation.Size = new System.Drawing.Size(105, 40); + this.tsmiOccupation.Text = "职业问诊"; + this.tsmiOccupation.Visible = false; + // // PartForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -3331,5 +3344,6 @@ private System.Windows.Forms.Label label19; private DevExpress.XtraGrid.Views.Grid.GridView gridView1; private System.Windows.Forms.ToolStripMenuItem tsmiPick; + private System.Windows.Forms.ToolStripMenuItem tsmiOccupation; } } \ No newline at end of file diff --git a/PEIS/View/Exam/PartForm.cs b/PEIS/View/Exam/PartForm.cs index ef27d86..fd56dad 100644 --- a/PEIS/View/Exam/PartForm.cs +++ b/PEIS/View/Exam/PartForm.cs @@ -116,6 +116,8 @@ namespace PEIS.View.Exam btnRefresh.Click += (s, e) => { OnGetPatients(); }; // 菜单-重新提取检查结果 tsmiPick.Click += TsmiPick_Click; + // 菜单-职业问诊 + tsmiOccupation.Click += TsmiOccupation_Click; //菜单-保存 tsmiSave.Click += TsmiSave_Click; //菜单-生成小结结论 @@ -1082,6 +1084,18 @@ namespace PEIS.View.Exam } } + /// + /// 职业问诊 + /// + /// + /// + private void TsmiOccupation_Click(object sender, EventArgs e) + { + CareerHisInqForm form = new CareerHisInqForm(Convert.ToInt16(_patient.ID)); + form.ShowDialog(); + } + + /// /// 重新提取检查结果 /// @@ -1192,6 +1206,7 @@ namespace PEIS.View.Exam var one = item.FeeItemName.Split('，'); foreach (var o in one) { + if (o.Contains("两对半")) continue; feeItem.Add(new EnrollmentFeeItem() { FeeItemName = o} ); } }else if (item.FeeItemName.Contains(",")) @@ -1199,9 +1214,14 @@ namespace PEIS.View.Exam var two = item.FeeItemName.Split(','); foreach (var t in two) { + if (t.Contains("两对半")) continue; feeItem.Add(new EnrollmentFeeItem() { FeeItemName = t }); } } + else if (item.FeeItemName.Contains("补充项目")) + { + continue; + } else { feeItem.Add(new EnrollmentFeeItem() { FeeItemName = item.FeeItemName }); @@ -1568,6 +1588,8 @@ namespace PEIS.View.Exam Invoke(new Action(() => stripTxtEid.Text = _patient?.ID.ToString())); // Invoke(new Action(() => patientInfo.Values = item ?? _patient)); SetPatientInfo(item ?? _patient); + // 是否显示职业问诊按钮 + tsmiOccupation.Visible = item == null ? _patient.Type.Contains("职业") : item.Type.Contains("职业"); OnGetDeptList(); } diff --git a/PEIS/View/Exam/PartForm.resx b/PEIS/View/Exam/PartForm.resx index d4a7bda..1ce0b01 100644 --- a/PEIS/View/Exam/PartForm.resx +++ b/PEIS/View/Exam/PartForm.resx @@ -117,63 +117,62 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 485, 17 + + + 184, 17 + - 340, 17 + 359, 17 - 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 + sxJcPFYAAAAASUVORK5CYII= - iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAPtJREFUWEft - kb0KwjAQgBsKOugiiNhFQahDH6BOLn0BFVrXPpuLi0/g7CO0Ts6+hOBPEi+gMY3XkgyFfHBwd9xdv7ae - w6EiTss7jWfdWGTnI5xoTpwWD0J8qN6w45BqCcJ8CTJXaNVH9TCsgCBKdmsukpUHaOExISDgEjTG8zyB - 1n90AqPZZiCOysEHJUSf/tZ91cwPqkH0ssTXHvEJrW9QVWNNgIK6oxPo9ic9lutiOF1FfInCakg5cq1E - NYRaVOAEDAoUJevXjSDcduAEh/UgrQY11BAngBW4QGocmy+Hoh0CdOgEqXGwAtY+kxNohwCDDdoIOO9w - fOB5L+flMi1KC1D4AAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAASZJREFUWEft + kTFuwkAURFkhkQIaJIRCQyQkU/gAS0XDBUikhZaz0dDkBKk5gpcqdS6BBESO2MLjMYxXUETyk37xZ+fP + /7JbrYYGgnX+ZJ2/1K3Z6vCFWbWxLjsb0wbNXwpCBaNkM78e84NvMmwZ026RLrbvf4es/Ce+3YUtY5pC + +DWv080C3yphy4I2nHz08b+HwpmcoFuX7ao8JZiRaQqFOdM21vljwcBgy5imgHPYU5gpaC+9cRc/Pdbg + bZniXFVPYSamKeAc9hRmYpoCzmFPYSamKeAc9hRmsi7zuV63Rsm6U8wpZ5eQTJFI2ZIpEilbMkUiZVvn + v1F7FNIBz+R/HGCd36P2KNQD7psikbIlUyRStmSKRMqWTJHI2bnxGYV7GhpyfgHn5TItNb88UQAAAABJ + RU5ErkJggg== - - 460, 17 - - - 460, 17 - - - 175, 17 - 70