From a8202e0d358db36b94ae869d0d2de33d4b8abdf0 Mon Sep 17 00:00:00 2001 From: leomon Date: Mon, 27 Mar 2023 17:19:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=89=88=E5=99=A8=E6=A2=B0=E6=B8=85?= =?UTF-8?q?=E7=82=B9=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AIMS/AIMS.csproj | 10 +- .../frmInstrumentRecord2.cs | 200 +++++++++--------- .../OremrUserControl/EventCodeCompilerBill.cs | 148 +++++++++++++ .../ucAnasRecordBillLeftMenu.Designer.cs | 81 ------- .../ucAnasRecordBillLeftMenu.cs | 52 ----- .../ucAnasRecordBillLeftMenu.resx | 120 ----------- DocumentManagement/UI/frmTemplate.resx | 10 +- 7 files changed, 255 insertions(+), 366 deletions(-) create mode 100644 AIMS/OremrUserControl/EventCodeCompilerBill.cs delete mode 100644 AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.Designer.cs delete mode 100644 AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.cs delete mode 100644 AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.resx diff --git a/AIMS/AIMS.csproj b/AIMS/AIMS.csproj index a4deb9b..1ec2e10 100644 --- a/AIMS/AIMS.csproj +++ b/AIMS/AIMS.csproj @@ -449,6 +449,7 @@ frmPersonSchedulKeep.cs + @@ -657,12 +658,6 @@ - - UserControl - - - ucAnasRecordBillLeftMenu.cs - UserControl @@ -1116,9 +1111,6 @@ frmStopOperation.cs - - ucAnasRecordBillLeftMenu.cs - ucDocument.cs diff --git a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs index 11392a6..f1f4b8e 100644 --- a/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs +++ b/AIMS/OperationAanesthesia/frmInstrumentRecord2.cs @@ -13,6 +13,7 @@ using DocumentManagement; using DrawGraph; using Newtonsoft.Json; using System; +using System.CodeDom.Compiler; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -52,7 +53,7 @@ namespace AIMS.OperationAanesthesia //容器tab //public TabItem Tb; //文档事件 - private EventCodeCompiler codeCompiler; + private EventCodeCompilerBill codeCompiler; private string strClick, strContentChanged; public frmInstrumentRecord2() @@ -511,6 +512,7 @@ namespace AIMS.OperationAanesthesia { FirstbtnEnter(); } + codeCompiler.IsLoad = true; plRefresh_Click(null, null); if (_record.MedicalRecord != null && _record.MedicalRecord != "") @@ -1452,12 +1454,12 @@ namespace AIMS.OperationAanesthesia ReviewEvent(); new frmMessageBox().Show(); } - else - { - SaveInstrument2(sender); - ReviewEvent(); - new frmMessageBox().Show(); - } + //else + //{ + // SaveInstrument2(sender); + // ReviewEvent(); + // new frmMessageBox().Show(); + //} } private void SaveInstrument(object sender) @@ -1571,50 +1573,50 @@ namespace AIMS.OperationAanesthesia PublicMethod.WriteLog(ex); } } - private void SaveInstrument2(object sender) - { - try - { - btnSelectPatient.Focus(); - if (_record.InstrumentList2 == null) - { - _record.InstrumentList2 = new OperationRecordInstrumentList(); - } - _record.InstrumentList2.OperationRecordId = this._record.Id; - if (_applianceUseType2 != null) - { - List list = new List(); - foreach (ApplianceUseType item in _applianceUseType2) - { - list.Add(item.Id.Value); - } - _record.InstrumentList2.ApplianceUseType = string.Join(",", list.ToArray()); - } - _record.InstrumentList2.TagPicture = ""; - _record.InstrumentList2.JsonTextData = ""; - //_record.InstrumentList2.InstrumentNurse = txtInstrumentNurse2.Text; - //_record.InstrumentList2.TourNurse = txtTourNurse2.Text; - //_record.InstrumentList2.Remark = txtRemark2.Text; - _record.InstrumentList2.OperatorNo = PublicMethod.OperatorNo; - _record.InstrumentList2.OperatorName = PublicMethod.OperatorName; - _record.InstrumentList2.OperateDate = DateTime.Now; - if (_record.InstrumentList2.Id == null || _record.InstrumentList2.Id == 0) - { - _record.InstrumentList2.Id = BOperationRecordInstrumentList.Insert(_record.InstrumentList2); - } - else - { - BOperationRecordInstrumentList.Update(_record.InstrumentList2); - } - _record.InstrumentList2.ApplianceRecordList = GetApplianceRecord2(); - BApplianceRecord.InsertListData(_record.InstrumentList2.ApplianceRecordList); + //private void SaveInstrument2(object sender) + //{ + // try + // { + // btnSelectPatient.Focus(); + // if (_record.InstrumentList2 == null) + // { + // _record.InstrumentList2 = new OperationRecordInstrumentList(); + // } + // _record.InstrumentList2.OperationRecordId = this._record.Id; + // if (_applianceUseType2 != null) + // { + // List list = new List(); + // foreach (ApplianceUseType item in _applianceUseType2) + // { + // list.Add(item.Id.Value); + // } + // _record.InstrumentList2.ApplianceUseType = string.Join(",", list.ToArray()); + // } + // _record.InstrumentList2.TagPicture = ""; + // _record.InstrumentList2.JsonTextData = ""; + // //_record.InstrumentList2.InstrumentNurse = txtInstrumentNurse2.Text; + // //_record.InstrumentList2.TourNurse = txtTourNurse2.Text; + // //_record.InstrumentList2.Remark = txtRemark2.Text; + // _record.InstrumentList2.OperatorNo = PublicMethod.OperatorNo; + // _record.InstrumentList2.OperatorName = PublicMethod.OperatorName; + // _record.InstrumentList2.OperateDate = DateTime.Now; + // if (_record.InstrumentList2.Id == null || _record.InstrumentList2.Id == 0) + // { + // _record.InstrumentList2.Id = BOperationRecordInstrumentList.Insert(_record.InstrumentList2); + // } + // else + // { + // BOperationRecordInstrumentList.Update(_record.InstrumentList2); + // } + // _record.InstrumentList2.ApplianceRecordList = GetApplianceRecord2(); + // BApplianceRecord.InsertListData(_record.InstrumentList2.ApplianceRecordList); - } - catch (Exception ex) - { - PublicMethod.WriteLog(ex); - } - } + // } + // catch (Exception ex) + // { + // PublicMethod.WriteLog(ex); + // } + //} private void superTabMain_SelectedTabChanged(object sender, DevComponents.DotNetBar.SuperTabStripSelectedTabChangedEventArgs e) { @@ -1664,46 +1666,46 @@ namespace AIMS.OperationAanesthesia } return applianceRecordList; } - private List GetApplianceRecord2() - { - List applianceRecordList = new List(); - //foreach (Control ctl in panelQXList2.Controls) - //{ - // ApplianceRecord applianceRecord = new ApplianceRecord(); - // if (ctl is UCOperationGoodsBill5) - // { - // UCOperationGoodsBill5 UCOperationGoodsBill5 = ctl as UCOperationGoodsBill5; - // if (UCOperationGoodsBill5.Id != null) - // { - // applianceRecord.Id = UCOperationGoodsBill5.Id; - // } - // applianceRecord.OperationRecordId = this._record.Id; - // applianceRecord.ApplianceId = UCOperationGoodsBill5.GoodsId; - // applianceRecord.ApplianceName = UCOperationGoodsBill5.GoodsName; - // if (_record.InstrumentList2 != null && _record.InstrumentList2.Id != null) - // { - // applianceRecord.OperationGoodsBillRecord = _record.InstrumentList2.Id; - // } - // if (UCOperationGoodsBill5.txtFront.Text != "") - // applianceRecord.OpeFront = UCOperationGoodsBill5.OpeFront; - // else applianceRecord.OpeFront = null; - // if (UCOperationGoodsBill5.txtDoing.Text != "") - // applianceRecord.OpeDoing = UCOperationGoodsBill5.OpeDoing; - // else applianceRecord.OpeDoing = null; - // if (UCOperationGoodsBill5.txtCloseFront.Text != "") - // applianceRecord.CloseFront = UCOperationGoodsBill5.CloseFront; - // else applianceRecord.CloseFront = null; - // if (UCOperationGoodsBill5.txtCloseLast.Text != "") - // applianceRecord.CloseLast = UCOperationGoodsBill5.CloseLast; - // else applianceRecord.CloseLast = null; - // if (UCOperationGoodsBill5.txtSkinCloseLast.Text != "") - // applianceRecord.SkinCloseLast = UCOperationGoodsBill5.SkinCloseLast; - // else applianceRecord.SkinCloseLast = null; - // applianceRecordList.Add(applianceRecord); - // } - //} - return applianceRecordList; - } + //private List GetApplianceRecord2() + //{ + // List applianceRecordList = new List(); + // //foreach (Control ctl in panelQXList2.Controls) + // //{ + // // ApplianceRecord applianceRecord = new ApplianceRecord(); + // // if (ctl is UCOperationGoodsBill5) + // // { + // // UCOperationGoodsBill5 UCOperationGoodsBill5 = ctl as UCOperationGoodsBill5; + // // if (UCOperationGoodsBill5.Id != null) + // // { + // // applianceRecord.Id = UCOperationGoodsBill5.Id; + // // } + // // applianceRecord.OperationRecordId = this._record.Id; + // // applianceRecord.ApplianceId = UCOperationGoodsBill5.GoodsId; + // // applianceRecord.ApplianceName = UCOperationGoodsBill5.GoodsName; + // // if (_record.InstrumentList2 != null && _record.InstrumentList2.Id != null) + // // { + // // applianceRecord.OperationGoodsBillRecord = _record.InstrumentList2.Id; + // // } + // // if (UCOperationGoodsBill5.txtFront.Text != "") + // // applianceRecord.OpeFront = UCOperationGoodsBill5.OpeFront; + // // else applianceRecord.OpeFront = null; + // // if (UCOperationGoodsBill5.txtDoing.Text != "") + // // applianceRecord.OpeDoing = UCOperationGoodsBill5.OpeDoing; + // // else applianceRecord.OpeDoing = null; + // // if (UCOperationGoodsBill5.txtCloseFront.Text != "") + // // applianceRecord.CloseFront = UCOperationGoodsBill5.CloseFront; + // // else applianceRecord.CloseFront = null; + // // if (UCOperationGoodsBill5.txtCloseLast.Text != "") + // // applianceRecord.CloseLast = UCOperationGoodsBill5.CloseLast; + // // else applianceRecord.CloseLast = null; + // // if (UCOperationGoodsBill5.txtSkinCloseLast.Text != "") + // // applianceRecord.SkinCloseLast = UCOperationGoodsBill5.SkinCloseLast; + // // else applianceRecord.SkinCloseLast = null; + // // applianceRecordList.Add(applianceRecord); + // // } + // //} + // return applianceRecordList; + //} #endregion #endregion @@ -1717,10 +1719,10 @@ namespace AIMS.OperationAanesthesia { SaveInstrument(sender); } - else - { - SaveInstrument2(sender); - } + //else + //{ + // SaveInstrument2(sender); + //} myEditControl.ExecuteCommand("FilePrintPreview", true, null); plRefresh_Click(null, null); @@ -1801,10 +1803,10 @@ namespace AIMS.OperationAanesthesia { SaveInstrument(sender); } - else - { - SaveInstrument2(sender); - } + //else + //{ + // SaveInstrument2(sender); + //} try { myEditControl.ExecuteCommand("FilePrint", true, null); @@ -1909,7 +1911,7 @@ namespace AIMS.OperationAanesthesia strClick = doc.GetElementsByTagName("ClickEvent")[0].InnerText; strContentChanged = doc.GetElementsByTagName("ContentChangedEnvent")[0].InnerText; } - codeCompiler = new EventCodeCompiler(ref this.myEditControl, strClick, strContentChanged); + codeCompiler = new EventCodeCompilerBill(ref this.myEditControl, strClick, strContentChanged, QXList); //文档用户信息 myEditControl.UserLoginByParameter( diff --git a/AIMS/OremrUserControl/EventCodeCompilerBill.cs b/AIMS/OremrUserControl/EventCodeCompilerBill.cs new file mode 100644 index 0000000..ac846b8 --- /dev/null +++ b/AIMS/OremrUserControl/EventCodeCompilerBill.cs @@ -0,0 +1,148 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.CodeDom.Compiler; +using Microsoft.CSharp; +using System.Reflection; +using DCSoft.Writer.Controls; +using DCSoft.Writer; +using DCSoft.Writer.Dom; +using System.Windows.Forms; +using AIMSBLL; +using DataDictionary.UI; +using DrawGraph; +using System.Xml; + +namespace AIMS +{ + public class EventCodeCompilerBill + { + public CompilerResults cr; + + public Type type; + + private ElementEventTemplate eet; + + private XTextInputFieldElement SelElement; + private string SelElementName; + private string SelElementValue; + List QXList; + public bool IsLoad = false; + + public EventCodeCompilerBill(ref WriterControl myEditControl, string strMouseClickEvent, string strContentChangedEvent, List _QXList) + { + eet = new ElementEventTemplate(); + eet.MouseClick += new ElementMouseEventHandler(eetChk_MouseClick); + eet.MouseDblClick += Eet_MouseDblClick; + eet.ContentChanged += new ContentChangedEventHandler(eet_ContentChanged); + myEditControl.GlobalEventTemplate_Element = eet; + QXList = _QXList; + + } + + private void Eet_MouseDblClick(object eventSender, ElementMouseEventArgs args) + { + if (args.Button == System.Windows.Forms.MouseButtons.Left && args.Clicks == 2) + { + if (args.Element.Parent is XTextInputFieldElement && IsLoad == true) + { + var element = args.Element.Parent as XTextInputFieldElement; + if (element != null && element.ClientID == "KB20180604142340471") + { + SelElement = element; + PublicUI.UI.frmSelectOperation frmOperation = new PublicUI.UI.frmSelectOperation(); + frmOperation.FormClosed += new FormClosedEventHandler(frmOperation_FormClosed); + frmOperation.SelectRightData = new List(); + frmOperation.ShowDialog(); + + } + else if (element != null && element.ClientID == "KB20180604142254986") + { + SelElement = element; + PublicUI.UI.frmSelectDisease frmOperation = new PublicUI.UI.frmSelectDisease(); + frmOperation.FormClosed += new FormClosedEventHandler(frmSelectDisease_FormClosed); + frmOperation.SelectRightData = new List(); + frmOperation.ShowDialog(); + + } + } + } + } + + public CompilerErrorCollection Errors { get { return cr.Errors; } } + + void eet_ContentChanged(object eventSender, ContentChangedEventArgs args) + { + if (args.Element is XTextInputFieldElement && IsLoad == true) + { + var element = args.Element as XTextInputFieldElement; + if (SelElementName != null && SelElementName == element.Name && SelElementValue == element.Text) + return; + for (int i = 0; i < QXList.Count; i++) + { + if (element.Name == QXList[i] + "A" || element.Name == QXList[i] + "B") + { + try + { + SelElement = element; + SelElementName = element.Name; + SelElementValue = element.Text; + var hf3 = args.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).Name == QXList[i] + "C").FirstOrDefault(); + if (hf3 != null) hf3.Text = SelElementValue; + var hf2 = args.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).Name == QXList[i] + "D").FirstOrDefault(); + if (hf2 != null) hf2.Text = SelElementValue; + } + catch (Exception) + { + var hf = args.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).Name == QXList[i] + "C").FirstOrDefault(); + if (hf != null) hf.Text = SelElementValue; + var hf2 = args.Document.Fields.ToArray().Where(x => x is XTextInputFieldElement + && (x as XTextInputFieldElement).Name == QXList[i] + "D").FirstOrDefault(); + if (hf2 != null) hf2.Text = SelElementValue; + } + break; + } + } + } + } + + void eetChk_MouseClick(object eventSender, ElementMouseEventArgs args) + { + } + + void frmOperation_FormClosed(object sender, FormClosedEventArgs e) + { + PublicUI.UI.frmSelectOperation frmOperation = sender as PublicUI.UI.frmSelectOperation; + if (frmOperation.SelectRightData.Count > 0) + { + string OpeStr = ""; + foreach (int RowId in frmOperation.SelectRightData) + { + OpeStr += BOperation.SelectSingle(RowId).Name + " ,"; + } + int idxStart = OpeStr.LastIndexOf(" ,"); + OpeStr = OpeStr.Substring(0, idxStart); + SelElement.Text = OpeStr; + } + } + void frmSelectDisease_FormClosed(object sender, FormClosedEventArgs e) + { + PublicUI.UI.frmSelectDisease frmOperation = sender as PublicUI.UI.frmSelectDisease; + if (frmOperation.SelectRightData.Count > 0) + { + string OpeStr = ""; + foreach (int RowId in frmOperation.SelectRightData) + { + OpeStr += BDisease.SelectSingle(RowId).Name + " ,"; + } + int idxStart = OpeStr.LastIndexOf(" ,"); + OpeStr = OpeStr.Substring(0, idxStart); + SelElement.Text = OpeStr; + } + } + } +} diff --git a/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.Designer.cs b/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.Designer.cs deleted file mode 100644 index c56afaa..0000000 --- a/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.Designer.cs +++ /dev/null @@ -1,81 +0,0 @@ -namespace AIMS.OremrUserControl -{ - partial class ucAnasRecordBillLeftMenu - { - /// - /// 必需的设计器变量。 - /// - private System.ComponentModel.IContainer components = null; - - /// - /// 清理所有正在使用的资源。 - /// - /// 如果应释放托管资源，为 true；否则为 false。 - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region 组件设计器生成的代码 - - /// - /// 设计器支持所需的方法 - 不要 - /// 使用代码编辑器修改此方法的内容。 - /// - private void InitializeComponent() - { - this.pictureBox1 = new System.Windows.Forms.PictureBox(); - this.label1 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); - this.SuspendLayout(); - // - // pictureBox1 - // - this.pictureBox1.Location = new System.Drawing.Point(9, 6); - this.pictureBox1.Name = "pictureBox1"; - this.pictureBox1.Size = new System.Drawing.Size(40, 36); - this.pictureBox1.TabIndex = 0; - this.pictureBox1.TabStop = false; - this.pictureBox1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseDown); - this.pictureBox1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.pictureBox1_MouseMove); - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Font = new System.Drawing.Font("宋体", 10.5F); - this.label1.ForeColor = System.Drawing.Color.White; - this.label1.Location = new System.Drawing.Point(56, 19); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(49, 14); - this.label1.TabIndex = 1; - this.label1.Text = "label1"; - this.label1.MouseDown += new System.Windows.Forms.MouseEventHandler(this.label1_MouseDown); - this.label1.MouseMove += new System.Windows.Forms.MouseEventHandler(this.label1_MouseMove); - // - // ucAnasRecordBillLeftMenu - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.SlateGray; - this.Controls.Add(this.label1); - this.Controls.Add(this.pictureBox1); - this.Name = "ucAnasRecordBillLeftMenu"; - this.Size = new System.Drawing.Size(171, 47); - this.Load += new System.EventHandler(this.ucAnasRecordBillLeftMenu_Load); - this.MouseDown += new System.Windows.Forms.MouseEventHandler(this.ucAnasRecordBillLeftMenu_MouseDown); - ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); - this.ResumeLayout(false); - this.PerformLayout(); - - } - - #endregion - - private System.Windows.Forms.PictureBox pictureBox1; - private System.Windows.Forms.Label label1; - } -} diff --git a/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.cs b/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.cs deleted file mode 100644 index 9776175..0000000 --- a/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Drawing; -using System.Data; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace AIMS.OremrUserControl -{ - public partial class ucAnasRecordBillLeftMenu : UserControl - { - public Image ImageObj; - public string MenuName = ""; - public ucAnasRecordBillLeftMenu() - { - InitializeComponent(); - } - - private void ucAnasRecordBillLeftMenu_Load(object sender, EventArgs e) - { - pictureBox1.Image = ImageObj; - label1.Text = MenuName; - } - - private void label1_MouseMove(object sender, MouseEventArgs e) - { - BackColor = Color.FromArgb(100, 115, 129); - } - private void pictureBox1_MouseMove(object sender, MouseEventArgs e) - { - BackColor = Color.FromArgb(100, 115, 129); - } - private void ucAnasRecordBillLeftMenu_MouseDown(object sender, MouseEventArgs e) - { - // MessageBox.Show(MenuName); - } - - private void label1_MouseDown(object sender, MouseEventArgs e) - { - // MessageBox.Show(MenuName); - } - - private void pictureBox1_MouseDown(object sender, MouseEventArgs e) - { - // MessageBox.Show(MenuName); - } - - - } -} diff --git a/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.resx b/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.resx deleted file mode 100644 index 1af7de1..0000000 --- a/AIMS/OremrUserControl/ucAnasRecordBillLeftMenu.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/DocumentManagement/UI/frmTemplate.resx b/DocumentManagement/UI/frmTemplate.resx index 0a235a1..df00f0f 100644 --- a/DocumentManagement/UI/frmTemplate.resx +++ b/DocumentManagement/UI/frmTemplate.resx @@ -992,7 +992,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACO - GAAAAk1TRnQBSQFMAgEBIQEAAZgBCQGYAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + GAAAAk1TRnQBSQFMAgEBIQEAAaABCQGgAQkBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAAZADAAEBAQABCAYAASQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -3367,7 +3367,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAVZJREFUOE+tkMFLAkEUxv2DBO952EMX8TLnPS2B4EKHOQpdtsvacZcgvAgSSpAY + vQAADr0BR/uQrQAAAVZJREFUOE+tkMFLAkEUxv2DBO952EMX8TLnPS2B4EKHOQpdtsvacZcgvAgSSpAY 22KIB0EYqCQqsUsgiMNCm0W0UHTq8LVvCqGDq4IfDMO8+b7fezOpjWs0GqPpd/F3VJJS4qTl/6st1Mtb BKdSw3v0MQ94Xh9icL8agORUPHTFrQrI5wgGt0BTqMtV1G4LOE4NYRiifz0EM/h6gJ54UM9onnfALQe6 bq4eJgVBqII0OnXf27fXA5DMUlmFWdFCT6zxgXL2Dbf1CWZNYR9PwEpD6NYI7qmEGL4mgyhsHkXQyxL5 @@ -3385,7 +3385,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAT5JREFUOE+9kSFPxEAQhftT+hPuJ1RWViIrkSuRK5ErK1eeXFm5ssmZNYSSQNgL + vQAADr0BR/uQrQAAAT5JREFUOE+9kSFPxEAQhftT+hPuJ1RWViIrkSuRK5ErK1eeXFm5ssmZNYSSQNgL CSFBsA7cY2b27not5CpIeMkzzc733kyLP8v5iOyQ3QdYF/D4/IrDk8vi4aWs82i1xfi0X4dw6lJm6+GH gFaZdQhXZvkRoOYIMcFYBzckWinb9vTNZd+/fM6BXPekLyAlIL7RIAGW0tuEzbXH7uFjgliqy7IDVack 7SKUjbCUvJTqMnhz5bC7e88Q3peVJD1JOq9h+3xc47LDmNCaKMPssrEHAO3Lw8dkcRfokPO/w28Y7gPB @@ -3402,7 +3402,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - vgAADr4B6kKxwAAAAZRJREFUOE+1kqFuHDEURecP9hP2ExYWGgYaLjQMNAw0CFgVGQ40XGi40HBQZThS + vQAADr0BR/uQrQAAAZRJREFUOE+1kqFuHDEURecP9hP2ExYWGgYaLjQMNAw0CFgVGQ40XGi40HBQZThS qtRRChYals3tfXYm2aQbVapUS0eWZuae5/c8w39ZKToIMTj8fHrEy+Pr6/v8DfHoXwneoJ5Do8we9lbB HyxxbX9+engvlFCtEQupNSCMtu1f7y3y5OCshjM71ETxaQtr9J8CCQv+YBii8OxZ3aFMBnHUMHuF4LbI foDdfxSEVRDgnWFFQfPoL7CipcDbLjA36r0grALpu7B65tHD5o2RMLiivuw+CEbXh1a4z+w/a9S4gQ9s @@ -3678,7 +3678,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACW - BQAAAk1TRnQBSQFMAwEBAAFYAQQBWAEEARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA + BQAAAk1TRnQBSQFMAwEBAAFgAQQBYAEEARABAAEQAQAE/wEZAQAI/wFCAU0BNgcAATYDAAEoAwABQAMA ARADAAEBAQABGAYAAQwVAAGcAZABigF7AWwBYwFyAWEBWAFxAWABVwFxAWABVwFxAWABVwFxAWABVwFx AWABVwFxAWABVwFyAWEBWAF7AWwBYwGcAZABigHOAckBxpYAAa4BfAFvAdkBrQGdAdYBqAGaAdMBpgGY AdIBpAGXAcwBoQGZAckBngGXAcYBnAGWAcQBmQGVAcEBlgGTAbYBkQGLAbgBjgGLAXwBbQFkAb8BtwG0