套餐增加项目报错问题解决，订单统计增加退费订单的排出条件

PEIS/Model/StatisticalReportModel.cs

@@ -536,16 +536,16 @@ namespace PEIS.Model
                 switch (dateType)
                 {
                     case "OrderCreateDate":
-                        sql = sql  + $@" WHERE a.CreateTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NOT NULL";
+                        sql = sql  + $@" WHERE a.CreateTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NOT NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderChargeDate":
-                        sql = sql + $@" WHERE a.ChargeTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NOT NULL";
+                        sql = sql + $@" WHERE a.ChargeTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NOT NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderCostDate":
-                        sql = sql + $@" WHERE a.CostTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NOT NULL";
+                        sql = sql + $@" WHERE a.CostTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NOT NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderSendDate":
-                        sql = sql + $@" WHERE a.SendTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NOT NULL";
+                        sql = sql + $@" WHERE a.SendTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NOT NULL AND a.CancelTime IS NULL";
                         break;
                 }
             }
@@ -554,16 +554,16 @@ namespace PEIS.Model
                 switch (dateType)
                 {
                     case "OrderCreateDate":
-                        sql = sql + $@" WHERE a.CreateTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NULL";
+                        sql = sql + $@" WHERE a.CreateTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderChargeDate":
-                        sql = sql + $@" WHERE a.ChargeTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NULL";
+                        sql = sql + $@" WHERE a.ChargeTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderCostDate":
-                        sql = sql + $@" WHERE a.CostTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NULL";
+                        sql = sql + $@" WHERE a.CostTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderSendDate":
-                        sql = sql + $@" WHERE a.SendTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NULL";
+                        sql = sql + $@" WHERE a.SendTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.OEID IS NULL AND a.CancelTime IS NULL";
                         break;
                 }
             }
@@ -572,16 +572,16 @@ namespace PEIS.Model
                 switch (dateType)
                 {
                     case "OrderCreateDate":
-                        sql = sql + $@" WHERE a.CreateTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL ";
+                        sql = sql + $@" WHERE a.CreateTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderChargeDate":
-                        sql = sql + $@" WHERE a.ChargeTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL ";
+                        sql = sql + $@" WHERE a.ChargeTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderCostDate":
-                        sql = sql + $@" WHERE a.CostTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL ";
+                        sql = sql + $@" WHERE a.CostTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.CancelTime IS NULL";
                         break;
                     case "OrderSendDate":
-                        sql = sql + $@" WHERE a.SendTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL ";
+                        sql = sql + $@" WHERE a.SendTime Between '{begTime:yyyy-MM-dd}' and  DateAdd(day, 1,'{endTime:yyyy-MM-dd}') AND a.DeleteTime IS NULL AND a.CancelTime IS NULL";
                         break;
                 }
             }

PEIS/View/MainForm.Designer.cs

@@ -53,15 +53,15 @@ namespace PEIS.View
             this.lblStep = new System.Windows.Forms.Label();
             this.lblHospital = new System.Windows.Forms.Label();
             this.NbcMain = new DevExpress.XtraNavBar.NavBarControl();
-            this.NbgReport = new DevExpress.XtraNavBar.NavBarGroup();
-            this.NbiPReport = new DevExpress.XtraNavBar.NavBarItem();
-            this.NbiTReport = new DevExpress.XtraNavBar.NavBarItem();
             this.NbgReg = new DevExpress.XtraNavBar.NavBarGroup();
             this.NbiEnrollmentSearch = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiEnrollmentPerson = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiEnrollmentOrg = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiBasePerson = new DevExpress.XtraNavBar.NavBarItem();
             this.NbiBaseOrg = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbgReport = new DevExpress.XtraNavBar.NavBarGroup();
+            this.NbiPReport = new DevExpress.XtraNavBar.NavBarItem();
+            this.NbiTReport = new DevExpress.XtraNavBar.NavBarItem();
             this.NbgQuery = new DevExpress.XtraNavBar.NavBarGroup();
             this.NbiPeopleCount = new DevExpress.XtraNavBar.NavBarItem();
             this.navBarItem10 = new DevExpress.XtraNavBar.NavBarItem();
@@ -392,7 +392,7 @@ namespace PEIS.View
             // 
             // NbcMain
             // 
-            this.NbcMain.ActiveGroup = this.NbgReg;
+            this.NbcMain.ActiveGroup = this.NbgQuery;
             this.NbcMain.AllowDrop = false;
             this.NbcMain.Appearance.Background.Options.UseBackColor = true;
             this.NbcMain.Appearance.GroupBackground.BackColor = System.Drawing.Color.White;
@@ -447,30 +447,9 @@ namespace PEIS.View
             this.NbcMain.Text = "navBarControl1";
             this.NbcMain.View = new DevExpress.XtraNavBar.ViewInfo.Office3ViewInfoRegistrator();
             // 
-            // NbgReport
-            // 
-            this.NbgReport.Caption = "体检报告";
-            this.NbgReport.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPReport),
-            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiTReport)});
-            this.NbgReport.Name = "NbgReport";
-            // 
-            // NbiPReport
-            // 
-            this.NbiPReport.Caption = "个人报告";
-            this.NbiPReport.LargeImage = global::PEIS.Properties.Resources.预览;
-            this.NbiPReport.Name = "NbiPReport";
-            // 
-            // NbiTReport
-            // 
-            this.NbiTReport.Caption = "团体报告";
-            this.NbiTReport.LargeImage = global::PEIS.Properties.Resources.团队报告;
-            this.NbiTReport.Name = "NbiTReport";
-            // 
             // NbgReg
             // 
             this.NbgReg.Caption = "检前登记";
-            this.NbgReg.Expanded = true;
             this.NbgReg.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
             new DevExpress.XtraNavBar.NavBarItemLink(this.NbiEnrollmentSearch),
             new DevExpress.XtraNavBar.NavBarItemLink(this.NbiEnrollmentPerson),
@@ -511,9 +490,30 @@ namespace PEIS.View
             this.NbiBaseOrg.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiBaseOrg.LargeImage")));
             this.NbiBaseOrg.Name = "NbiBaseOrg";
             // 
+            // NbgReport
+            // 
+            this.NbgReport.Caption = "体检报告";
+            this.NbgReport.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPReport),
+            new DevExpress.XtraNavBar.NavBarItemLink(this.NbiTReport)});
+            this.NbgReport.Name = "NbgReport";
+            // 
+            // NbiPReport
+            // 
+            this.NbiPReport.Caption = "个人报告";
+            this.NbiPReport.LargeImage = global::PEIS.Properties.Resources.预览;
+            this.NbiPReport.Name = "NbiPReport";
+            // 
+            // NbiTReport
+            // 
+            this.NbiTReport.Caption = "团体报告";
+            this.NbiTReport.LargeImage = global::PEIS.Properties.Resources.团队报告;
+            this.NbiTReport.Name = "NbiTReport";
+            // 
             // NbgQuery
             // 
             this.NbgQuery.Caption = "查询统计";
+            this.NbgQuery.Expanded = true;
             this.NbgQuery.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] {
             new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPeopleCount),
             new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem10),

PEIS/View/MainForm.resx

@@ -120,133 +120,128 @@
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="BtnSetting.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAlpJREFUWEe1
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        JPlyZeUA6AOYA9hbpn8BeIvziBxoE2VJ5KIhhZib4TJWifmV+jIs0QZS56dKCHNWouwFwBOARwA9GZ8n
-        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
+        1nl1UDdtnDeSaCxOrtToYhfouCJr+2GcJRqhzY7Gm39Zq8zYQrJYnEkvyhzzCkl5gZccdesFt852HRdE
-        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
+        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
-        fkgd5GNI4DWkXiIufYkHcHdQ4EbWniSBtI8OAauB3NTwyyxxMDZ+iJpdT0JqrnZHGjImyR8ZTLkMvRGR
+        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
-        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
+        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
-        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
+        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
-        5sJwLypg/VhOslxMv3SvH2TTsZx1ngvod/0DR/H+9V9DoIzV0BkvNBmM/WNCPLnGfQO2QSIZlP+CunaX
+        MdYiAAAAAElFTkSuQmCC
-        T7ZyBlGheoxN+a+4c1SMIarHt72xjGY2+wsBLjV9zVCdlAAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="BtnStatistics.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAABGdBTUEAALGPC/xhBQAAAVJJREFUWEft
+        iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAABGdBTUEAALGPC/xhBQAAAShJREFUWEft
-        lj1OAzEQhfcARKKlS00LHU1ugeioECUSByA3oKKg4ii0iA6JDnEN2uWbyUtk1vtjZYHdYj7pyR7PjP2y
+        ljFKBEEQRfcACqZmxqZrZrK3EDMjMRT2AO4NjAyMPIqpmAlm4jVMn1RTSvG3e3aZdegV6kEl9auqPz3d
-        WUepgiCYO3Vdr9GdwmLouVBvqqXS42GzZ5PCIqi/R218qGQ8bLaPMesxVonsidUqGQ977W1MoUMYxjpR
+        zcxmSZLsOcAKuNP8JoBL741xonWjAZ4tND8EcE+dD60dzUhj1mMsQtiOobWj2cWY5NJYk22MATc/s0M8
-        T68xptfI9070qPQw2yaFRain0xjD0uYdXHnDEBT+hTG7DMbKk0Jra4X9UJgZIz5E6Y1zKb3tmcSYH9yC
+        xp5BpjBmt9PPYI3r2NdkImN2GYyF1BirmGtSMwYcyY0rIT1djJWFK5SHuKexMkB27LeuuzHJpbFCGmvM
-        /xAzTmbMsIPSJ7ar03w6Ywod4jDmUBjGtBbGHMIwZgelyoxBs6ZpLMvbaDWDUNhm7MF2aOFG+ctNmPHi
+        bZLGGnOb/EtjEmvGKjVqbE3f1diDD1FuXb9SwXkJM15VdOZxrSbAE/BWycdXv4Toxxv0A9W3NmX4f9MX
-        GwDz181SxolK+qHwCb0p3MGafeofUsohPhrIHzTzqMyUQbH9b/pCx1qaBxg6Rca7luYDpuzrNOx9O0ML
+        cKpaV4Az3+J31brjn9Ow83YOHGpNN4AL4DMc0knR9QexnfJDuqxc9T8NXTtJkn3jG58oOZCgHxUuAAAA
-        paYHM+foE/0LOrYM6hfIXtJb1LzqvyodGQTBTKmqb58oOZAU5qlsAAAAAElFTkSuQmCC
+        AElFTkSuQmCC
 </value>
   </data>
   <data name="BtnReport.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAcRJREFUWEft
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAapJREFUWEft
-        lzFLA0EQha+0sEipZcDK1j+Qn6CFhZ2djQoi2Iji70kXCwsLg4VBgoWgYGkVsFds1zc777zdu727bFyL
+        l6FOQ0EQRSsRiEqQTVBYfoBPAIHA4TBAQkgwBML31BWBQNAgaAhBkECCRDXBQ7CHbDvTbG/ftI+ydRzT
-        wH0wyL43s/uMmzPJyhhjhqgP1KJ8oh5Q29xyfux4Wi65dTtoHumMGaMGlKPB7DrqSjYiZ7SaQeNM+xc/
+        dM7u3mm7b/teoyEAbeCD+fkE7oEtXXsmulIBLjQjBOjYpC6wqb4uwCpwmTVxqmMqAfo2Ye7wHGAna+JI
-        3AX77Op2lmPK9bDRcJkEbOeGOKAchk2tAdCyiZI/05BSI+hzQ5xQrsKGxgCw5fBX26js0GoEfW6IC8o+
+        /QQ+Uut/QZrYVz9G3QaAdfuZ2uqqkCaO1Y+o04CFv2YLbuuYKqSJc/UD3GrdkfBve73RcRHSxOTGdKP1
-        NGsDwHIP/+bPW9qtoNcNUb2YNIIBILuHz6g969Ls2aY5QO+RjpgppQIaXgAsn1T95QXVo3doFWPubTPB
+        hIT3rfZs73d1fARwaHMe1VU2ADx53XgBmuYOrHYnc1oyryc+8ZXXcqENpFPRSRuvlbkl4M3cntWa1mTO
-        uo9y5ya0LNS+uCygUQ4gT8UcuXh9WuKtoN7EAPvUeigJ6eJdVmrVV5p67R0IgfZTnTKPXOfPkmvbEIB+
+        2Gb1Yl6bLqYAnNi0B3vvZ8mVjnXCnFBMwT7xu031jXkLLOtYJ8wJxQyAM5+bNhewomNywpxQzMDO/nSF
-        sgDyG7/bweJi3qFW2VJBWxIFEDByrpOWKWqNVhBtSxtAnv3yDpE7skG5FvRYuCygHh0gFh6zZAEgy8sb
+        pD2ypl4Jc0JRmDAnFIUJc0IxdOnr/S2V/xUutR6LoeuNlq1PV9dJuNR6LAoT5oSiMGFOKAoT5oSiMGFO
-        S/B/Bb3oABN1oxhz3INeXICU8JguwJIFgNy9C5LBY7oAwQD5h4ktSsnB3gM9Qj9XekDMv5rdoJKHwJ5y
+        KP6vgsKEOaEoTJgTisKEOdnNxIa6UqSHHssY3Feq9Eez60U0YeF+NXXUDzC5cDR3jAKP5xFpzYmz4QdU
-        eP5uGlH2ofnv8Lgw8P/69bwO2bP0bMiyH1TKVOha/K1BAAAAAElFTkSuQmCC
+        ylTownJf9AAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="BtnTotal.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAABGdBTUEAALGPC/xhBQAAA+9JREFUWEft
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        v+bqGXSe6I2xAeFCVVSq30TPDfp/mTf6oPehdodjNQaB49a3pvp7A8wELgO/JlpqcJpvqD+PdIhpjonc
-        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
+        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
-        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
+        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
-        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
 </value>
   </data>
   <data name="BtnPart.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        tR6N/xcAi4FDQBF4C/wEXgBX7FMZ0JpMAEMmEstd+wx2u76PwBM5hb4DZ1UvNSnN1ZgE+qx2SMZbBewF
-        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
+        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
-        YmFmwRGVoy30WykMjM/VH8Rls3vyM26UcM5U9eZD7yok1+Y7tMbKjYPpIQrllNk9sYDOyhH0n1Nb9dFt
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        RU5ErkJggg==
-        QmCC
 </value>
   </data>
   <data name="BtnReg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        64l87glss5Iw7qFUyGv3FC89lAr53BMYsJIw5KGKeN2Md1Mhn3sCq6wk/f5HyHdYWRj1UCrk801AkP+I
+        xXFPlQAWmE3q/ieouJjdjah5SgcggPfAT6Azagmu0vVFzVM1gONm90SvZIquY1p8UC5E3VMpAGHlU/xS
-        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
+        pturtxt4ZOMi17kYSwBrgK/Ad5uj6x92LQZb1QBROgB9UABXgd/AH7OX46fAJ+CuEk/ZD4wCr2tlNoMq
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
-        PwUBBEAWAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="PbMin.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAEpJREFUWEft
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAEhJREFUWEft
-        zDENwDAMRFFTL4BiCIBKJVAiRVCFQGb3LDkAvHn4T/rjnQEAgNbc/VZLhafQNtWZd3UaD/XFk1zFwquO
+        zLENgCAAAEFWdwBmcAASFmARJzAsQP3EKA2VdBR/ybcfgiRJ2hmQgcarLDRUIM7f34ATuL9ZWuxxAcf8
-        vAMAAB2Z/avvhpP16jlgAAAAAElFTkSuQmCC
+        lSRJW+mr74aT/cNOOQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="PbSmall.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAJZJREFUWEft
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAIVJREFUWEft
-        lVEKhDAQQ3sJ/zyMN9ObeJQ9Wk0kLLMg0qlFWMiDUMdOhlCFFmOM+QtqrRO0DNCskTlgHIZG5pB3UdkF
+        lVEKgCAQRLtEfx3Gm+VNOkpHmxA2WaaiVfwR5sGArbo8QnRZhBBiBgCsANKAbNw7BAbCvUPY3sT1FgDk
-        /BuHqMxBI3gvgJo/QSTWrdo1Mh3galiPyHlyWNMBNpVdwM+/njiAAzjAD9q+B31DTyCo7TJC4/BPkAKm
+        eQRs8elS8N/RHNQzLMCNelP/XI9A5noLduolIAEJPOB1rwwWaH+MRgvw3C+3QCC7xY99rVugbOZrtSf1
-        M0CDVik+x3ekKwDNDPFU37vAGHNNKQcaabW7KXKmgQAAAABJRU5ErkJggg==
+        LRBCfHEBGmm1u66AX8wAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="PbMax.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAIJJREFUSEtj
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAIJJREFUSEvt
-        GAWjACt4/vx5AhWxAxArQI1GgGfPnt0H4v/UxiiWgVwAEnz69GkD1CXUwGAzQTTUGoRFUAUKVMK4LaIF
+        lcEJwCAMRR3FUTpKR+kmHaWj9JSfMVq+SMGqF5tCoXnwEaLkBQ8aguO0UNXZMJOqxrsjANgBHNYpZJyA
-        xmoRMOjmg4KPSng+TouAtANUiGIAMmvUIrLAqEVkg5FjEVgQiPdTEYNrAwzHQ4sMkCTVMMhMqPGjYNAD
+        RRFZ8iQWST25VqJ8IBqlL3ojTZGIrLw+o6xdEa/uKj6EvVw0hIuG+Y8oFQFshkm/QTV8fjK4aRb2LCTO
-        BgYA3VMYOGhI6BAAAAAASUVORK5CYII=
+        pzkB3VMYOLtrO/AAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="PbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAJtJREFUWEft
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAHFJREFUWEft
-        kdEKgCAMRf3z+vPV8So+SIjglGAHIt3GPYtSEATBLzCzm6dch8zODymBMAxlRqMLFwAClfsdTE8ji+UV
+        0eEKwCAIBODefHtzh1Ag4UxZJoP7YH9U7oK1BgDwB0R08zfP30Tvl3ogW4ZGbkM8wZ6bT6wCa7eVVqTN
-        gpXfC6ip5SSvIJCniTir5CyvIJIvv/fKKwjlzeyVA1K5M8e+fv8vQCRfE3JWyXkJBPL0ImpqOS1BsPLt
+        UsnC4+WDKD5fzkofUPoLtEJtlsIqsnZbiIJr3g1pj4gER27deqg7MHoPAFDqASQgFRP4/Ts0AAAAAElF
-        KqWOt+ezBIHKHQczo9GFSxA2Ezg7HwRBcJCUHiQgFRPpcuP5AAAAAElFTkSuQmCC
+        TkSuQmCC
 </value>
   </data>
   <metadata name="XtmmMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
@@ -255,229 +250,221 @@
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>86</value>
   </metadata>
-  <data name="NbiEnrollmentSearch.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NbiPeopleCount.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAh1JREFUSEu9
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAg9JREFUSEu9
-        lbFLHEEUxrcVQpRAsLGwCiQQSSfq7rAQQZIqQa6Iuzs5UUSsxC6kSLp0+gekTGeZIiRYpIhKikBC8D8I
+        lb9rFUEQx18rSBRB0likEhQMdhLdXQ4MiFZKeIW5nfWJIQQrsROL2NnpH2Bpl9JCDCks8gOLgCL5D4KY
-        QXdm9kQEsdP3Zr7d2+NyeHvR/cFwc9/37s3OvLdzXr8EsjURJKppB80hXx8zUj0JYv0jSPRFxyCNPYT9
+        29l7EgSxS5jb3Xu3E4n3/HEfWN4x35m53Z25eb1eS6QZTkuwg2qZ4TTX/5prxt6UGrcl4EGyNG6Txv3/
-        H36iGqXkZ0FiDtzgudM5BuGD8fhFOpono7EZLJ7eheXx3GrwORZWddqJzHdIXbCHxTYhVYeS7CPJKqQu
+        CAG230j+Q4Lb8YuevZ18eNxYXL9bTDZe8kLe/342avRc2YJOvmn0GIwSuQ9ci5AWN8K11khwWyHJEtci
-        2HMxZh9SdbDIhR/rEFIX7OVxkKpT547qqVFtXcfU8h7l1HIzlLnxu64WfGlmfZmu0VFtUW12RKKPaH7C
+        pIXNbHGtNXUNNGZci5AW/bjWmi5P1E2NOus6opPvKNLJZGjy32ddJwjjZoUpHkrAlxLcmgLck4D7VCcF
-        daL5R1/qewgdHKrBh46a/GP4cfoW4V4YZWO2eeL0Wdg8HoHcG9dp6ryd0OwEUr8n/XUQZ/N8G+QDP/FE
+        +EYYPM9jxkZqfH2kLmwJXTyL/llenquaRxe3s8G302m2X+A7zf4cJXRr0uArAfap1OUcTYO4YozS+DbZ
-        rD+VH4Di/5L/BnY3dFTPi+BY/RaRegmrJ7wrJN/FnG+Lry6PeoWwNiIx953pjiRsqFuwehI2D8c5nusF
+        hMEvQuNymrmBMO7OqKvsZ5Xbe9yHQ6cKyTfCM02L9z6PfcL9ewrcheaVZH17kvtwssHXKfKnenFNglsh
-        qYBOYpu9jmOcjLLbZOzZhaT5AvlKXLvbi3cFUkH+sk8vqEeQ+AfuOvG5q6LsAeQrodpE9uESvQ6pgDX2
+        LbnGK3k5IcFt+p251STiGHy7V4N3kWvxY786by/XxjhOBHVVXl5MIo5BaczDLTziGtmOnChOamHwceL9
-        OnZEu7E3NbXrBqS+mFo6ucOFF1L/hFTAGuX8hq/5sbnaiAUlIPdN0Qz8oNRp9FlqBrONMN5NOmdFabKp
+        G2Ye7J+hwiuDH7lGNgm4Xhv8tfnaqHmrEu8W1M3gr3A5bQa3UjtKKG6E2pQz/d0TSZaWCLDP48vC+jTa
-        xp8hyJWgerxziYvxq/0AWKwkfLbCgMw2WsMiOnpY/jvBDnnhdfd3LPWySFpP4V8r3DCe53mXH/DlADk1
+        QHhZw/COJxiH2f7wlMr3LjX/TsIJfQ2rv2ODCwqGt9LQfwM1DP0eAh/w5QADI3SwAAAAAElFTkSuQmCC
-        axoAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="NbiEnrollmentPerson.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="navBarItem10.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAlRJREFUSEvl
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAcFJREFUSEvt
-        lj+I1EAUxrcSBLWzU7GysBA70c2EBTsRCyEIJpO7tbAQtDtBbK7VwgP/FFbXC6LXCYLbaCfY2Fucem5m
+        Vb9Lw1AQdhGcXHRTERxE3LRDQd6FoGA3wUFQk3utIqVu7g52ExedBaF70cVB3ToKLi4ugtCpxeReQf0H
-        coeIVwnr9ybf7pBN1vV2c6DcDx7Z+fLevJk3f7KtvU1nceO40nZVadNr1uyq9M00ZcLExHAa7KYFC3mX
+        Ki9pfr2U0iTd9IOPJJe778sl917Gxv4U2OHXAjNJT8NcuTuu6sUASLuA9i0gddNTNAHpUtWOAJAeZTJD
-        6TyBzp6r1HwJUnsjSEynUUvNRaWzDDN/zXQejqrHZuNI35KDTc8/kxilj6jNbCjzdXb3HyRumr9O3L5m
+        umGmVU1DQPHkaJikq/o+ek/VUONJIA1cI6vqBzf4zxQgnQDSe/wVDEcN6R5MWh1oBGiX1MJU5NTSS82J
-        DpZ25gSj+1SCpL8s55lNz3hibP9FalPMvmDIiE6UHZBBRdFgH6XJsKNR4lBvXpD2NJOZMKRVnFf7Dvpw
+        AUbC+fB+IAU8YUCrEr5WjKgxKiNPWL124Bn1jkkYGV934uhsGKOkHDiZsdHO+urWuZhhaN8B0jegeANO
-        YNu4G9bCbn6ULlXoOPMaF6UsEgbafJa+ikuDg0g3T9G1DB1GiYs17C/XGnY83Rwqzk8i9nuRwN6k7EDy
+        R2qOgyxGutGZDToUtdB5Xc3NZAQoLmQtw8+8H+PUkjF9rz2tJGcxcgcjHAsGYYTfyO+oSLkg5uqNtiOj
-        h6JjMN9k31D2VBP7GdQZ3RxorxS6vUepBMq9xLgVSh6+mGnGYWo+SPykL9C5q9lpeS9+lDzjiXcC4lBm
+        syx3ao3TKyBdeVoM7XM1N5MRM6kcDECYoq5xeyWSnNbI/R24ixLQKuSNzqR20JljXGwD0oe8t7bfnvcL
-        +5HNCmfi/FDRf5ZR8syX2L6S+HDBXKJUItT2snufZE8oeRD8SSXmPZs7AnH33cBT85ZSCe5ylDq7QsmD
+        pHsaI42LZ/nPUuMS/tgbwvSDDO2deOt9+cI4LTpCJbHkdIP2KSBVXA2rICdNK9IWmOJYM+khtp6cBKTr
-        dbvrglEyPCvntcYeMNQhg4bmkgfa3pI9onT/NrR1p9dcNA5xlFKUzt6frbIs0H6O+Qxtiy7N09Zfj0kS
+        0D7Wh6IWroku0H4UTc2wNsM1/0iMX9LAaJg5rWLyAAAAAElFTkSuQmCC
-        lPVNqM1T/O7hTD/C85foE/9zzQuW6rEkUHG/TcmBCt5xet0HYl5UvCE31wDrvEZpxNlofT/ebe3KrLGZ
-        OFt7nlIJzFY2WbOz7sT5kaJT85JSBdX9cXh4pCg1A2byDJ/EE2zWMryC2dxztFq/AeyqBenl+b8bAAAA
-        AElFTkSuQmCC
 </value>
   </data>
-  <data name="NbiEnrollmentOrg.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="navBarItem11.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAz1JREFUSEvF
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAe1JREFUSEvd
-        Vj1oFEEUvkpPUNDKRkEQUVKkUMGfm10WFPEnhQpX6O1uLgEthHQqlhZCwFJBEQ2WSgpBy1gEUoiFYhPR
+        lT1oFEEUx1NYWsXSysLGIk0KEecNhxFEBItAKuc/G0wt2KRMIiSVWFgpiiJooQhWgoVNmiAIqcL1Ktjc
-        LpAg3u7MoWnE7nzf2zdze7t7hpiAHzxu3vd98+ZvZ29r68HJ8WS/H+k3Xqy/IdAGJ/K/wWt1RxBBu1cX
+        vLl8QErh5N3Gvdl3d+Nekio/eCz7n48f+3bZmZo681z34bZxnUejyhZ8V8+fGBGQ420C7xF4c7him8A9
-        isF8pHsIFaXTCJtDExvjRHNlmxcno41QHxSqGl5kZl0RWoEKdQA+aC/VSVsk/hcbcwAHDR7OeWLszeqE
+        i/j1ho8X9frGyGbWx0LnKXSve4XA3w3CJz3WCGkLOX5nHLealDyZztK6tnQwrR19CPxHFp9mWfCLISGB
-        +gMbi4AAAwZBUHueO/BqzSG0/chcFrsDOGjwqHF9hPtQX64Tpc0sN7Niz4ClQ4BBqJoM2lOxuWELBe3v
+        d6V1tfAEkI8PSmH8WB8A/zxNkWAKnhVZ7akIYScn6n91vrui81Zr85yMGXSgxwRC/GYQrw4Cx1s5kcX+
-        +0R2AMc+8qg4nbRtkV2dgW235wNRqL4xNlPq6s9d3I7Mc5EdwHFf8lCf68Xi/TrJqFCYZa/OT55sBTqo
+        JXK8T56X05wQ3xD4eZqlGIQN4+PNKrCOv+REgkWcl1ZU9z4UBP7VWgjn6zMHkOPH5PjOIAB/+J9IMAjr
-        MLkLo99KzsBDT+QT7hilD1TUOYZAmz2kwUO7cRo5+qKO7AwdjVnEgwSPg5tJLtBRZIadxHo9A9uZB68M
+        Ipvzvy/0v9R0kxEYF59adOargMAvc6L0N0TgzyIzCK/LjNfkqtcI5PmZQVioAgt+0lR0JOsZxPU002sE
-        Z0Zbg9kKPQCsGNuMsKsvwnpwpvnzHAAOn7chF0Gru0fk2rmp3la/vXqg6AEHTWyVdfyJ7l6RM1Rugwvz
+        A35VExF4NSfSpO8qB4HfKlH3YU408omq+0zrwO9V68LS8UXjWzckkpucSDNB6+oiQufWhKJGc4dF5TnT
-        TrX0GLWXy5qL5UaUnifv+wqNA28lHsw+DPkrYYHZeaH5mnVKf2O7RXIAB4095K2qYx8uPm+a1RJd+qei
+        s4sHl2szTwiBD8nvzqgwtsf1+jgQwiKB2zovD7+js0S/6EmLEH/820d7+siv3fhwv1xQfrbjr5mSPQqe
-        laAiMwezpEORTdrMSVoC3YJb5FnJjLQS4UtQke7QpG5LOhTwwCtpCbxbmPhaA66lW7iCQ/B/B6R4EbR/
+        1fufLf4CcBDnPL5t9HgAAAAASUVORK5CYII=
-        7BRtAJsxYNBMt5P2mHUvTC76sf6EZKT5eYt4HDY6IGqCx5VRsR5jstHqHAeZv+gWGx0Qlx48xhAq+3Tg
-        WYT6sFAOzMf6Nb2qHp66kuwW2gEcNPZUDNiI9FHwA58ijUm9A6QK07NCOeCy0p/sDOnz9HtPaAdwos0U
-        X+QALeICamMMoTJQB+OHJpa0BD9MX9EqHknqAA6apCXQIiZQW9I+6NJ+8UN9U9ISSH9GM30pqQM4aJKW
-        gDcMakvaB5ELWHox7LvRi7v3KX/L5hzAQUO7/w1TrKEX2JyH/ZcvhsjY8jvU+aOkDuCgScpnXoyhf8B/
-        AxW+hhe9pA788idN0s0D/Q1dosKruG/5YI40sW0e7KdiVQz9jCihVvsDqosL/ee7tuMAAAAASUVORK5C
-        YII=
 </value>
   </data>
-  <data name="NbiBasePerson.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="navBarItem12.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAjJJREFUSEvl
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAM9JREFUSEvF
-        lr9rFEEUx6/SJjZpJGgpFinE0mR3jkMr28AVujNLiJAuwUrsYmUrKhaCYAIBwc5GUYsrDClCIE3yJwju
+        lkEOgjAQRbkGe1eegSZcgpXtXbiZ54GJC0+AmSqI+KKpU+pPfjr8Ju+TENJWVWm50+XYeGlzWpkvJa2/
-        zgY8sI/f7+w7LvvDzdxeBMEPPHbmzbz5zns7t3Od/wdlsvfK2CHsxNdCYw8lfDJUbL9D8G3XZEuhtj0f
+        HlyQaQ8reymK7UGmJozd9q1+dhi7yPTSvhetQ6OQiaFRyMTQKGSuQ+eljh9S13lOtZf6a9H9eeife0Of
-        C6Jks2vsr9CkW7KMHwjoY7c/petNqJMnENzDRg+R6Wtxnw0DadL1hjHY6EBFx/MURfuZDDUzrSDbY9Hs
+        amJiUQ4hE0OjkImhUcjchi7Ied7TOdXE/G9RDiETQ6OQiaFRyNyGRX5YPax0jus8p/pxiH4sWkKjkImh
-        qRtsYkrB6kHSdlWm1NNWkJQPEuyATxmuZxrBMshw8O8Lsn36nZxl/FlJqDs8i/fTm1yDT3EXKQsSeR9e
+        UcjE0ChkLuHeR3mxy4mqyHWrhG6BWr9DCM1Q1gAAAABJRU5ErkJggg==
-        JiEObGAgGxk934WxvS7DOXWCbVAmfZGvlW9CxckNtDcofnft5KKbRM4jw9txdsVlhJK6BU5Bf1fbSLpV
-        QfnUsSR+BhEKsy1LFKgkVHG0YJRhEP24JS7HnXvJZfobM2wL11DaflAmecS+irM1CH2E4LabMKIsmJco
-        9xXNboxt7JcwB07kN2Y0Mlx3uwsPhrMynFMOrAoWBcrGmJ4eXkN2+xAZKJ2+DCL7kKcW7c+8a8+1pL3o
-        +GqeTbIkrgKBSUM3rpNF55hGcL5/dAFl+8KsxFULqrTK66vXT2dQ93Slq9NXMjYRKNsydv9Vuo1g3ifO
-        76D2c+gkocnWsZPaH/efDNk9x9+LN7JmI5j7mPNdh0cZL3eHtfY33PDa7vm+Dm4QcbUfB2+4wKQmoe0I
-        VuylcpmbrO5b+5fpdH4DC0JwoKsouC4AAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="NbiBaseOrg.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="navBarItem13.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAzdJREFUSEvF
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
 </value>
   </data>
-  <data name="NbiPeopleCount.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="navBarItem14.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAh1JREFUSEu9
+        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAjdJREFUSEvl
-        lbFLHEEUxrcVQpRAsLGwCiQQSSfq7rAQQZIqQa6Iuzs5UUSsxC6kSLp0+gekTGeZIiRYpIhKikBC8D8I
+        VT2I1UAQTiUIamenYmVhIXaibyc8sBOxEIJgMnv3LCwE7RTE5lotPPCnsLpeEL3uQPAa7QSb6y1OPd/O
-        QXdm9kQEsdP3Zr7d2+NyeHvR/cFwc9/37s3OvLdzXr8EsjURJKppB80hXx8zUj0JYv0jSPRFxyCNPYT9
+        5EREKyEy2Y0mkzx5j5eDg/tgmvl25puZzG6iaE9juLh1HJBXAGm9X+MVya31SsQZpYBU7KSZhXykdSOD
-        H36iGqXkZ0FiDtzgudM5BuGD8fhFOpono7EZLJ7eheXx3GrwORZWddqJzHdIXbCHxTYhVYeS7CPJKqQu
+        7gVY+mws3zAZDXs1SxcBnQPk11o3ClWta39fCGMvtH/3CBt0if5Gs5rJ6Hot/y4X7htTCw+u0cHWdnZY
-        2HMxZh9SdbDIhR/rEFIX7OVxkKpT547qqVFtXcfU8h7l1HIzlLnxu64WfGlmfZmu0VFtUW12RKKPaH7C
+        M8tkmGy8JPdZ+1vCgG5Rj67b+GUzUxQNE3dAikqSYp/mWtDCMW5faL4+3SadVDH+vvK7WmG/wNJqPMqP
-        daL5R1/qewgdHKrBh46a/GP4cfoW4V4YZWO2eeL0Wdg8HoHcG9dp6ryd0OwEUr8n/XUQZ/N8G+QDP/FE
+        /hXS0MKzwo/SCxqkT74weTRCEXb7lI4poYX9NxwvdRq6pBGb5icB6bsX4JsNDt2jUMxX2Zs6Fw5o4X8d
-        rD+VH4Di/5L/BnY3dFTPi+BY/RaRegmrJ7wrJN/FnG+Lry6PeoWwNiIx953pjiRsqFuwehI2D8c5nusF
+        dJmKXfZ+vl/3VwBLt0PcsuY6hKfvOLb0QeIn/YHOXXWnhZdzmmsJzwI/Zt7Q/gpn0vyQz++c5uYU5rWy
-        qYBOYpu9jmOcjLLbZOzZhaT5AvlKXLvbi3cFUkH+sk8vqEeQ+AfuOvG5q6LsAeQrodpE9uESvQ6pgDX2
+        owW6pDlBjHy55DP3VHMS/BEyeq/90wAyelAWbumt5gRhy4vYuiuak7f5XliQDX1XJ9jDerwUXYkb5Fuy
-        OnZEu7E3NbXrBqS+mFo6ucOFF1L/hFTAGuX8hq/5sbnaiAUlIPdN0Qz8oNRp9FlqBrONMN5NOmdFabKp
+        I4DjO4C0GfK2HpoSclBG0bh7/7fWZwGknx3nxL7ps71hgF+OiYhBehMjPSunYvkxIP0W/6SNnxsG3ZOy
-        xp8hyJWgerxziYvxq/0AWKwkfLbCgMw2WsMiOnpY/jvBDnnhdfd3LPWySFpP4V8r3DCe53mXH/DlADk1
+        u3Q8qPsB3V3fdccPYl5AuiUvVwEZrWrubLK5X0a9I10b5NAtn9ecAJBlyfrtepjmR8ICvdJcBRj9OFxd
-        axoAAAAASUVORK5CYII=
+        Kc3NBUB+biyd0P46qidY+/cO/gDsqgXpfzH+ZAAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="navBarItem10.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NbiEnrollmentSearch.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAdlJREFUSEvt
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAg9JREFUSEu9
-        Vb9Lw0AUziI4ueimIjiIuGmHglxCULCb4CCoyaVVpNTN3cFu4qKzILgXXRzUraPg4uIiCJ0sJncB9R+o
+        lb9rFUEQx18rSBRB0likEhQMdhLdXQ4MiFZKeIW5nfWJIQQrsROL2NnpH2Bpl9JCDCks8gOLgCL5D4KY
-        7+Ve2qa/pNdu+sHH3b177/vucq/U+Ftge5+zzBW2DlP52gjJdIfJxZbJg2sYa/qUFRjPSLIzIOEekxkX
+        29l7EgSxS5jb3Xu3E4n3/HEfWN4x35m53Z25eb1eS6QZTkuwg2qZ4TTX/5prxt6UGrcl4EGyNG6Txv3/
-        l8z1izoEo4dIA25Hsu1QJxJlWmoBDZSRX6SQYax63+MQPAS+kknftLi4NV2xRJKdjeA9cq2FWvTEu52r
+        CAG230j+Q4Lb8YuevZ18eNxYXL9bTDZe8kLe/342avRc2YJOvmn0GIwSuQ9ci5AWN8K11khwWyHJEtci
-        jKJmFyMZPTwttRALm9wvNK9bjER5WEaxcE8jGvthon1RFAyO1by3Ub/s2ZloRlMFLMBCWvaNFU9OMh7c
+        pIXNbHGtNXUNNGZci5AW/bjWmi5P1E2NOus6opPvKNLJZGjy32ddJwjjZoUpHkrAlxLcmgLck4D7VCcF
-        gMYXvPcLNMU+bSUxiJHthFNYqyivmuYlSmkANrSNQPAUaxn/SFPIwDbHmL1dnaCQwmBGUW3irRqNMMQ3
+        +EYYPM9jxkZqfH2kLmwJXTyL/llenquaRxe3s8G302m2X+A7zf4cJXRr0uArAfap1OUcTYO4YozS+DbZ
-        qt8oK1IUqusN90ZOuABmFcsTz6BxHmtBc5xQSgODGMHnyWNtO2XJ8oJFSlOADS0j/DFinRr9TNoJx6zd
+        hMEvQuNymrmBMO7OqKvsZ5Xbe9yHQ6cKyTfCM02L9z6PfcL9ewrcheaVZH17kvtwssHXKfKnenFNglsh
-        cJp5cgPib7i3vFOdoXQ0kiUdI8uTj/ifRcsE6m3vSJdCcDIebEbB3/nEPDGHNXZOzmMMao9gLCgNP4Od
+        LbnGK3k5IcFt+p251STiGHy7V4N3kWvxY786by/XxjhOBHVVXl5MIo5BaczDLTziGtmOnChOamHwceL9
-        ZmXFuunKA8sVd3iJyCRGlMDFBRThZ+xCeUXpEXAN8U4HIkKTOP4apf9DB4bxA9LAaJhcMCZMAAAAAElF
+        G2Ye7J+hwiuDH7lGNgm4Xhv8tfnaqHmrEu8W1M3gr3A5bQa3UjtKKG6E2pQz/d0TSZaWCLDP48vC+jTa
-        TkSuQmCC
+        QHhZw/COJxiH2f7wlMr3LjX/TsIJfQ2rv2ODCwqGt9LQfwM1DP0eAh/w5QADI3SwAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="navBarItem11.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NbiEnrollmentPerson.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAgFJREFUSEvd
+        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAjdJREFUSEvl
-        lTFIW0EYxzN0dGpHJweXDl06FPHuEWxBitBBcPLdRcwsdOmoFewkHTpVFEtBB0VwEhxcsoggOIm7Lbi8
+        VT2I1UAQTiUIamenYmVhIXaibyc8sBOxEIJgMnv3LCwE7RTE5lotPPCnsLpeEL3uQPAa7QSb6y1OPd/O
-        d5eYgKOQ/r/clyaXF88kZvIPH/f+3/vu+91dXt7LPX9N6vSjiJPVbhEVzCcuG1wEkLG5kMrcIkrZsFcY
+        5EREKyEy2Y0mkzx5j5eDg/tgmvl25puZzG6iaE9juLh1HJBXAGm9X+MVya31SsQZpYBU7KSZhXykdSOD
-        65GyJ1PajvK0/kXNIm0LbLtKzpdfo+5cqPSQU/2JjgW72RWxyfcStLNu+WZMFGsvubUvTLynycOMSJnN
+        7gVY+mws3zAZDXs1SxcBnQPk11o3ClWta39fCGMvtH/3CBt0if5Gs5rJ6Hot/y4X7htTCw+u0cHWdnZY
-        DBA3KogS2ydLarvkgPaAU05I/hkmiCQK5i3BvF1JlV6GQHRP6vIy2//K50sv6J5QieKUJ+zoTCj7ji0S
+        M8tkmGy8JPdZ+1vCgG5Rj67b+GUzUxQNE3dAikqSYp/mWtDCMW5faL4+3SadVDH+vvK7WmG/wNJqPMqP
-        sTkNgSJVHUNNVWrzhVMNodFvzNtgmxGezm9C2w9s0Sg2xyEQCf+fWdTU2eYinRbg/+bn0hFOZYTFrSNm
+        /hXS0MKzwo/SCxqkT74weTRCEXb7lI4poYX9NxwvdRq6pBGb5icB6bsX4JsNDt2jUMxX2Zs6Fw5o4X8d
-        2DaOZv8xEAkrXCPYe33zCuO916SLRGx/RCqZZdsAbYVA7a8h1B0RDNBfLme+0silnnDUP1E3x5aOxXzv
+        dJmKXfZ+vl/3VwBLt0PcsuY6hKfvOLb0QeIn/YHOXXWnhZdzmmsJzwI/Zt7Q/gpn0vyQz++c5uYU5rWy
-        FUThQHatPcelnoQy2x4IE1dCoE4RiC+DQt1OB6j8OQRqXzkFgVo+cHTK7HUcXVocHOSCSz1lQGRCoE4R
+        owW6pDlBjHy55DP3VHMS/BEyeq/90wAyelAWbumt5gRhy4vYuiuak7f5XliQDX1XJ9jDerwUXYkb5Fuy
-        iC+DyoCkSqb7BPVUmwW570w9WqiNc2ooQs87qStv2DrRF/Shsx5EeH8uAHTFtiWC0K4o2n/kQQKLvm72
+        I4DjO4C0GfK2HpoSclBG0bh7/7fWZwGknx3nxL7ps71hgF+OiYhBehMjPSunYvkxIP0W/6SNnxsG3ZOy
-        4fa+6NUudLroJrjH9uExENQDvbjts1Qu9w9wEOc8eD0LTgAAAABJRU5ErkJggg==
+        u3Q8qPsB3V3fdccPYl5AuiUvVwEZrWrubLK5X0a9I10b5NAtn9ecAJBlyfrtepjmR8ICvdJcBRj9OFxd
+        Kc3NBUB+biyd0P46qidY+/cO/gDsqgXpfzH+ZAAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="navBarItem12.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NbiEnrollmentOrg.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAzdJREFUSEvF
-        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
+        Vk1IFVEUdlUGCblqUyBEFC5cZNDPmzsMFNGPiwzeIt8916eQC8FdRUsXQdCyoJCSloWLoJa2EFyEi6RN
-        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
+        kTtBEZ0595FupN2L787ccea8pyIGfXBg5jvf+bm/Mx0dB8DV4fhMSPxZGV6D4Rmc1B0IqtbohUX1ZmcL
-        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
+        T9yEBZQ8g/l3+IraK9XVY8rEfRXN54p8CxTZmTyJ4bVAcwQ+qi93KrI/FPF2awxvwweNe3eNOW2aR/M3
-        gVq/Q20bmn0AAAAASUVORK5CYII=
+        GeMAh+tecwRTxHO++6huz+M5JHtPxoGDD5pgmPuzQnMuDyXV9N3OlIIw9Gyqqp7LijYDY8d9oqi+3lMK
+        dKNf73G6Ye4PTDLqn73f5ylNu18fP4UlobETwdBmd9bpuzwoAzgXO7TZHWgek8l38sR9eRA2iNt52VQg
+        INDxpJvGWnwDmpB4Ki2avAho4xIMz05DPOWSG3s9bTyedFOazswc1hQbKS/oxL6TgiGwrEmbOKhG7uIc
+        bmRYM81j6Fb6AYwY0wzzo5fwGqxpcT1LwOL7HeotqjVOef+tiebRsL51VmrAwbdXnnCkcTovBLSdhtzs
+        16DGA4p4pdWX20qFktuK7EIbnzPcSq6Y3wzFI7HTCEdK26U0KPmD6W7RGDsOn9Nou9Quj99cbr0V2WWl
+        +Y0UeQRkZyGWvETatJ2VvIcy/EgRr6bCwvmTCIg3FNnHkpeABlrJe/hTsG/B/fweecJd8H8LKuL3Uf33
+        CSkC/kXBqJocV8Sv04I6vhsa/o6X3urPI1J82ILImQ7KLgSGBxxZqW1cBlk86B6HLYhDDx41chK/Ca4L
+        zRdK6qygMvxJGfvy2v34pPSDg89p2hSsEF8EX/oVqYxyVzqS5GZJnd1CIdlp3Poh2afSDy7zTcuLHFCa
+        77gRjnJXyRGStaG2pkQWEOrkozL8SvLg4JO8R6CTEeSWPA74r1DzQ8l7BMRvFfEHyYODT/IeuGGQW/JI
+        OJ/uprL5u1GZxnNF/EXGgYMvzeH/YWQOnpdx6bfQfanL5v0h2SeKeLEc5QouwuffZbz7Eu32Ad4LivgB
+        LvpW3i7DJ/lDIzB2UBFv4bwVzXHGDkr9oVH452yxXX8j2uAvqosL/Qo1pkUAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="navBarItem13.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NbiBasePerson.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAz1JREFUSEvF
+        iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAiVJREFUSEvl
-        Vj1oFEEUvkpPUNDKRkEQUVKkUMGfm10WFPEnhQpX6O1uLgEthHQqlhZCwFJBEQ2WSgpBy1gEUoiFYhPR
+        lb9rFEEUx69KGtPYhKClWFwhKWN23nBoZRu4Itl5iyRgF0kV7GJlKyoWghADAcHOJqIWFgaLIKQ5/wQh
-        LpAg3u7MoWnE7nzf2zdze7t7hpiAHzxu3vd98+ZvZ29r68HJ8WS/H+k3Xqy/IdAGJ/K/wWt1RxBBu1cX
+        O28OcpA+8na9u9m3e3uTO4VAPvBld9++ed+dn9toXBkA3QdA6gHSeagUUkfWCQIS+g3odjW6FWWoFaIo
-        isF8pHsIFaXTCJtDExvjRHNlmxcno41QHxSqGl5kZl0RWoEKdQA+aC/VSVsk/hcbcwAHDR7OeWLszeqE
+        Tt9ppDOFdk/Wq0WhbQPSqYyPQ5n0qUY6AnQdhfRGvh8JN2TJ+Di4DSB9g7jbZFNAei5zKpnWkO+Hpu6Z
-        +gMbi4AAAwZBUHueO/BqzSG0/chcFrsDOGjwqHF9hPtQX64Tpc0sN7Niz4ClQ4BBqJoM2lOxuWELBe3v
+        zCsxpWF5IRl6JHMLTGrIyIWkDB3zVeYVmMZQwkN8+Q1Hzc0o8bbqt+XFs7xmF7kGXwcmPtIwj5XmZqT8
-        +0R2AMc+8qg4nbRtkV2dgW235wNRqL4xNlPq6s9d3I7Mc5EdwHFf8lCf68Xi/TrJqFCYZa/OT55sBTqo
+        dtk2yT+kf32vErrt51QaTgKgfZnXyj8CkvSOMrTD5g82z2cHiVWGshd14vx7ibuR9SjuNv06DMe1oXgQ
-        MLkLo99KzsBDT+QT7hilD1TUOYZAmz2kwUO7cRo5+qKO7AwdjVnEgwSPg5tJLtBRZIadxHo9A9uZB68M
+        kIZ/jzoekjDF3SYb8/2gqIesXw5MQL+HUXyy5Mfvr6bzY3s4KVwDDH0ETLf5GRK3qQ0dANJ+KdE3zIco
-        Z0Zbg9kKPQCsGNuMsKsvwnpwpvnzHAAOn7chF0Gru0fk2rmp3la/vXqg6AEHTWyVdfyJ7l6RM1Rugwvz
+        jxVFO0MN44VaCX33t4xG9+PuRu+6nxNgWDSQ4jYt07sFhn5mc2rsqyimLV61YOxn/tf+0yFtxd2beW/S
-        TrX0GLWXy5qL5UaUnifv+wqNA28lHsw+DPkrYYHZeaH5mnVKf2O7RXIAB4095K2qYx8uPm+a1RJd+qei
+        FfmOidCqfB7T5SwwjWGz/WtGo/vCvZLvfPgPwr+vVttea6jErmtjX8ukEADtQ0D6KuNVANInzm+AoQVA
-        laAiMwezpEORTdrMSVoC3YJb5FnJjLQS4UtQke7QpG5LOhTwwCtpCbxbmPhaA66lW7iCQ/B/B6R4EbR/
+        ShW6x3JTj5NG90IhvZXFq9DonnB+9sBLGRI6lAdzvVwHDB2FTkfd4RBM6dQJkKxxIaJ1mpPDXKeqs/a/
-        7BRtAJsxYNBMt5P2mHUvTC76sf6EZKT5eYt4HDY6IGqCx5VRsR5jstHqHAeZv+gWGx0Qlx48xhAq+3Tg
+        8wcLQnCgDbX9AgAAAABJRU5ErkJggg==
-        WYT6sFAOzMf6Nb2qHp66kuwW2gEcNPZUDNiI9FHwA58ijUm9A6QK07NCOeCy0p/sDOnz9HtPaAdwos0U
-        X+QALeICamMMoTJQB+OHJpa0BD9MX9EqHknqAA6apCXQIiZQW9I+6NJ+8UN9U9ISSH9GM30pqQM4aJKW
-        gDcMakvaB5ELWHox7LvRi7v3KX/L5hzAQUO7/w1TrKEX2JyH/ZcvhsjY8jvU+aOkDuCgScpnXoyhf8B/
-        AxW+hhe9pA788idN0s0D/Q1dosKruG/5YI40sW0e7KdiVQz9jCihVvsDqosL/ee7tuMAAAAASUVORK5C
-        YII=
 </value>
   </data>
-  <data name="navBarItem14.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="NbiBaseOrg.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAYAAAA7MK6iAAAABGdBTUEAALGPC/xhBQAAAlRJREFUSEvl
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAWVJREFUSEvN
-        lj+I1EAUxrcSBLWzU7GysBA70c2EBTsRCyEIJpO7tbAQtDtBbK7VwgP/FFbXC6LXCYLbaCfY2Fucem5m
+        lLFOwzAQhrsj3qESWyekbq1jdWJAfQEa26kYmJF4ANj7JgxszH0aBPWldOiIUNE5dnBs08ZuKnHSP9j3
-        coeIVwnr9ybf7pBN1vV2c6DcDx7Z+fLevJk3f7KtvU1nceO40nZVadNr1uyq9M00ZcLExHAa7KYFC3mX
+        +z7ZZ12PsNVTxmF3rLBOb19kAt7cQ2mSr27tRhgjYTBJla6xdGs3wgapdb4e2EWM74p/nDWK5+sB7ieB
-        6TyBzp6r1HwJUnsjSEynUUvNRaWzDDN/zXQejqrHZuNI35KDTc8/kxilj6jNbCjzdXb3HyRumr9O3L5m
+        SAFD90kILzn6CIcHL1fAMAmk1gIWeKhS+Wx8o2J1QZl8qXMCFrifDIqNZBBhcIdf1cj2/u7DI/q0Px40
-        DpZ25gSj+1SCpL8s55lNz3hibP9FalPMvmDIiE6UHZBBRdFgH6XJsKNR4lBvXpD2NJOZMKRVnFf7Dvpw
+        mslLtw8Zl3Ptu3dz6B/n/n5I3o1ie5QMig0DogI2bg7jT1Bsj5JAVmNrGVhoJqK/fjoB3zjOiIDpQZBK
-        YNu4G9bCbn6ULlXoOPMaF6UsEgbafJa+ikuDg0g3T9G1DB1GiYs17C/XGnY83Rwqzk8i9nuRwN6k7EDy
+        HNkjyiBvBYoNC7QN1egcFNUjTJheHdJk/t5Hv3sjHL6tQGbdQmoSuD3C4RsL0h8iqCaIyR3l8IV7lH9e
-        h6JjMN9k31D2VBP7GdQZ3RxorxS6vUepBMq9xLgVSh6+mGnGYWo+SPykL9C5q9lpeS9+lDzjiXcC4lBm
+        R4Fssx3o80ApPfrfIAH105ECbmx/tyB9plI17U2cAqS+9/gWzm2/Bzq1AsOy9Exd6Ae6sezDS9IDogAA
-        +5HNCmfi/FDRf5ZR8syX2L6S+HDBXKJUItT2snufZE8oeRD8SSXmPZs7AnH33cBT85ZSCe5ylDq7QsmD
+        AABJRU5ErkJggg==
-        dbvrglEyPCvntcYeMNQhg4bmkgfa3pI9onT/NrR1p9dcNA5xlFKUzt6frbIs0H6O+Qxtiy7N09Zfj0kS
-        lPVNqM1T/O7hTD/C85foE/9zzQuW6rEkUHG/TcmBCt5xet0HYl5UvCE31wDrvEZpxNlofT/ebe3KrLGZ
-        OFt7nlIJzFY2WbOz7sT5kaJT85JSBdX9cXh4pCg1A2byDJ/EE2zWMryC2dxztFq/AeyqBenl+b8bAAAA
-        AElFTkSuQmCC
 </value>
   </data>
   <data name="NbiConclusion.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAM9JREFUSEvF
-        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
+        lkEOgjAQRbkGe1eegSZcgpXtXbiZ54GJC0+AmSqI+KKpU+pPfjr8Ju+TENJWVWm50+XYeGlzWpkvJa2/
-        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
+        HlyQaQ8reymK7UGmJozd9q1+dhi7yPTSvhetQ6OQiaFRyMTQKGSuQ+eljh9S13lOtZf6a9H9eeife0Of
-        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
+        amJiUQ4hE0OjkImhUcjchi7Ied7TOdXE/G9RDiETQ6OQiaFRyNyGRX5YPax0jus8p/pxiH4sWkKjkImh
-        gVq/Q20bmn0AAAAASUVORK5CYII=
+        UcjE0ChkLuHeR3mxy4mqyHWrhG6BWr9DCM1Q1gAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="NbiDept.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABsAAAAaCAYAAABGiCfwAAAABGdBTUEAALGPC/xhBQAAAWdJREFUSEtj
+        iVBORw0KGgoAAAANSUhEUgAAABsAAAAaCAYAAABGiCfwAAAABGdBTUEAALGPC/xhBQAAAV1JREFUSEvt
-        sE56zWsb82q1bezr/7TENnGvfRhsYl5HggViXjYB6UY4jnk9DUgfsI19dcAu7nUDNgzUW4+E94Nx7KtV
+        lr1KA0EUhbfRzqewSyGKlcnc1QdIa6GZO6KFlaBvkGhnEzvByj4+gGXSCoKNNiJYieycFV9AUGaSDcvd
-        aOL1IPPtYl/PZAABIKcfiPcjY6Bh70EYyP4PpM+jy2PBIHVg9WjiQPxmFdgiXACkCOYqIO0AFcYJQOqA
+        NQmLG3/wwMcy99yZM7MM7Aa1HcyRthfEeC8TZVAPlMaGL+joiBiHQzROidEjtr3QoJWH0mim6HrYdkS9
-        2B5EQ4WIB3S3DIg7QZrpZNmb+UPbMtu4l3ogA5ExNAVuB2m2jn5dgC6PjkHqbGJe5UNoTHmIRbGv+2zj
+        6dYPGWeBEzFOiNFNExq8OnyjwY30c3B9vj/rxR0f9JlcU7IrpbEmfalByKp7Sm+sph5GjOMphsXnvzuM
-        Xj8F0tBkCsE2sa/vgJNy3JtXQPmT6PJY8CuIekyzYBjsfbCtNAajlmEAYMGdY5x2hhXKJQqQb1ns6+dW
+        TLTgFkwzuIGXbnKtgQPpS/qbsvvJ5iT9IEabDJ7kdVWMB3+VTWzJ4Er6Odh+f3atBH98edIy9B+WEWm7
-        8S+VoVyiwOC1zCrqlQEMA6udN5bA+gnG1wq9ygZVhhMQbZld3CtDYP12C45jX/+xjXt1H8YHZuZEqFKc
+        t7x7PSPro1Q8jPFc3YrmZX2Ufm5YddMuJhDbeMWgnowr63ezsl9q4rDQ2CXSuB/CeCNjH5Ox0nZbzpGa
-        gCSfIQOgnmEUZ8iAvpZFv9WCMokGZFtGDhgIy95cgfJpCkBVD7Dd+LIBWgeBaloa4td9APBZNaRicy5v
+        OEyq9NeY1h8Oa7xUZG2cCocV0XeExbfSKEPu0xMoHbUG36DMj+UX0/4A8Fk1pEkQvMYAAAAASUVORK5C
-        AAAAAElFTkSuQmCC
+        YII=
 </value>
   </data>
   <data name="NbiPermission.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        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
-        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
+        +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
-        RK5CYII=
 </value>
   </data>
   <data name="NbiDictionary.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAM9JREFUSEvF
-        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
+        lkEOgjAQRbkGe1eegSZcgpXtXbiZ54GJC0+AmSqI+KKpU+pPfjr8Ju+TENJWVWm50+XYeGlzWpkvJa2/
-        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
+        HlyQaQ8reymK7UGmJozd9q1+dhi7yPTSvhetQ6OQiaFRyMTQKGSuQ+eljh9S13lOtZf6a9H9eeife0Of
-        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
+        amJiUQ4hE0OjkImhUcjchi7Ied7TOdXE/G9RDiETQ6OQiaFRyNyGRX5YPax0jus8p/pxiH4sWkKjkImh
-        gVq/Q20bmn0AAAAASUVORK5CYII=
+        UcjE0ChkLuHeR3mxy4mqyHWrhG6BWr9DCM1Q1gAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="NbiHazardType.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAALtJREFUSEtj
+        iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAM9JREFUSEvF
-        oDuwjX6rZRPz2oGaGGQm1HgIcIj5qGIb+/o/LTDIbKg1DAxg24GCNrGvQtFdRTYGmgU2E8iGWoNkEbIg
+        lkEOgjAQRbkGe1eegSZcgpXtXbiZ54GJC0+AmSqI+KKpU+pPfjr8Ju+TENJWVWm50+XYeGlzWpkvJa2/
-        hQCrmcPbItuY15IgNpiGsUnFQH0ELYLwXzaAJYAAxCYVQ/QRYRE1wAi1CMjeD5YAAhCbVAzSN7gsogYY
+        HlyQaQ8reymK7UGmJozd9q1+dhi7yPTSvhetQ6OQiaFRyMTQKGSuQ+eljh9S13lOtZf6a9H9eeife0Of
-        oRbBMh0IoGdGYjBEHwGLQJUViA2mYWxSMbQSBbFxWgQVohiMNItoXZXTrXECArCUQk0MMhNqPL0AAwMA
+        amJiUQ4hE0OjkImhUcjchi7Ied7TOdXE/G9RDiETQ6OQiaFRyNyGRX5YPax0jus8p/pxiH4sWkKjkImh
-        gVq/Q20bmn0AAAAASUVORK5CYII=
+        UcjE0ChkLuHeR3mxy4mqyHWrhG6BWr9DCM1Q1gAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

PEIS/View/Setting/PackForm.cs

@@ -9,7 +9,6 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
 using DevExpress.XtraGrid.Views.Grid.ViewInfo;
-using DevExpress.XtraGrid.Views.Grid;
 
 namespace PEIS.View.Setting
 {
@@ -22,6 +21,8 @@ namespace PEIS.View.Setting
         List<FeeItem> _lstPackFeeItem = new List<FeeItem>();
         GridHitInfo _hitInfo = new GridHitInfo();
 
+        private Pack _currentPack = new Pack();
+
         public PackForm()
         {
             InitializeComponent();
@@ -161,6 +162,7 @@ namespace PEIS.View.Setting
         {
             if (DgvPack.GetFocusedRow() is Pack pack && pack.ID > 0)
             {
+                _currentPack = pack;
                 PackNameTxt.Text = pack.Name;
                 OnGetFeeItemByPack(pack.ID);
             }
@@ -188,10 +190,9 @@ namespace PEIS.View.Setting
         /// <param name="e"></param>
         private void DgvPack_Click(object sender, EventArgs e)
         {
-            /*int index = DgvPack.GetFocusedDataSourceRowIndex();
-            DgvPack.SelectRow(index);*/
             if (DgvPack.GetFocusedRow() is Pack pack && pack.ID > 0)
             {
+                _currentPack = pack;
                 PackNameTxt.Text = pack.Name;
                 OnGetFeeItemByPack(pack.ID);
             }
@@ -233,7 +234,7 @@ namespace PEIS.View.Setting
         }
         private void DgvFeeItem_DoubleClick(object sender, EventArgs e)
         {
-            if (DgvFeeItem.FocusedRowHandle < 0) return;
+            if (DgvFeeItem.FocusedRowHandle < 0 || _currentPack.ID <= 0) return;
             if (_hitInfo.InRowCell)
             {
                 var currentTime = CacheDataModel.GetServerTime();
@@ -244,7 +245,7 @@ namespace PEIS.View.Setting
                 }
                 var item = new PackToFeeItem()
                 {
-                    PID = Convert.ToInt64(DgvPack.GetRowCellValue(DgvPack.GetSelectedRows()[0], "ID").ToString()),
+                    PID = _currentPack.ID,
                     FID = Convert.ToInt64(DgvFeeItem.GetRowCellValue(DgvFeeItem.GetSelectedRows()[0], "ID").ToString()),
                     CreateTime = currentTime,
                     CreatorCode = Global.currentUser.Code,
@@ -252,7 +253,7 @@ namespace PEIS.View.Setting
                     Seq = DgvPack.RowCount + 1
                 };
                 item.Save();
-                OnGetFeeItemByPack(Convert.ToInt64(DgvPack.GetRowCellValue(DgvPack.GetSelectedRows()[0], "ID").ToString()));
+                OnGetFeeItemByPack(_currentPack.ID);
             }
         }