1、团体登记gird调整，2、头像空值判断调整

PEIS/Utils/ReportHelper.cs

@@ -274,7 +274,7 @@ namespace PEIS.Utils
             rpt.SetParameterValue("HospitalName", Global._hospital.Name);
             rpt.SetParameterValue("DeptName", patient.DeptName);
 
-            if(patient.Photo == null)
+            if(string.IsNullOrEmpty(patient.Photo))
             {
                 rpt.SetParameterValue("Avatar", patient.Photo);
             }
@@ -669,7 +669,7 @@ namespace PEIS.Utils
                     rpt.SetParameterValue("CardNo", patient.CardNo);
                     rpt.SetParameterValue("HospitalName", Global._hospital?.Name);
 
-                    if (patient.Photo == null)
+                    if (string.IsNullOrEmpty(patient.Photo))
                     {
                         rpt.SetParameterValue("Avatar", patient.Photo);
                     }
@@ -834,7 +834,7 @@ namespace PEIS.Utils
                         rpt.SetParameterValue("FinishPerson", patient.Finisher);
                         rpt.SetParameterValue("FinishDate", patient.FinishTime?.ToShortDateString());
                         rpt.SetParameterValue("HospitalName", Global._hospital.Name);
-                        if (patient.Photo == null)
+                        if (string.IsNullOrEmpty(patient.Photo))
                         {
                             rpt.SetParameterValue("Avatar", patient.Photo);
                         }

PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs

@@ -345,6 +345,7 @@
             this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PatientSearch = new System.Windows.Forms.TextBox();
@@ -378,7 +379,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.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
@@ -532,7 +532,7 @@
             // DgcOrg
             // 
             this.DgcOrg.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.DgcOrg.Location = new System.Drawing.Point(0, 163);
             this.DgcOrg.MainView = this.DgvOrg;
             this.DgcOrg.Name = "DgcOrg";
@@ -564,7 +564,7 @@
             this.gridColumn21});
             this.DgvOrg.FixedLineWidth = 1;
             this.DgvOrg.GridControl = this.DgcOrg;
-            this.DgvOrg.IndicatorWidth = 70;
+            this.DgvOrg.IndicatorWidth = 65;
             this.DgvOrg.Name = "DgvOrg";
             this.DgvOrg.OptionsMenu.EnableColumnMenu = false;
             this.DgvOrg.OptionsSelection.MultiSelect = true;
@@ -868,7 +868,7 @@
             // 
             this.splitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
             this.splitter1.Location = new System.Drawing.Point(236, 0);
-            this.splitter1.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
+            this.splitter1.Margin = new System.Windows.Forms.Padding(1);
             this.splitter1.Name = "splitter1";
             this.splitter1.Size = new System.Drawing.Size(4, 779);
             this.splitter1.TabIndex = 1;
@@ -1259,7 +1259,7 @@
             this.splitter3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
             this.splitter3.Dock = System.Windows.Forms.DockStyle.Right;
             this.splitter3.Location = new System.Drawing.Point(658, 189);
-            this.splitter3.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
+            this.splitter3.Margin = new System.Windows.Forms.Padding(1);
             this.splitter3.Name = "splitter3";
             this.splitter3.Size = new System.Drawing.Size(4, 547);
             this.splitter3.TabIndex = 135;
@@ -1667,7 +1667,7 @@
             this.splitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
             this.splitter2.Dock = System.Windows.Forms.DockStyle.Top;
             this.splitter2.Location = new System.Drawing.Point(0, 184);
-            this.splitter2.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
+            this.splitter2.Margin = new System.Windows.Forms.Padding(1);
             this.splitter2.Name = "splitter2";
             this.splitter2.Size = new System.Drawing.Size(1196, 5);
             this.splitter2.TabIndex = 132;
@@ -1909,7 +1909,7 @@
             this.TpGroupFeeItem.Controls.Add(this.panel4);
             this.TpGroupFeeItem.Image = global::PEIS.Properties.Resources.收费项目;
             this.TpGroupFeeItem.Name = "TpGroupFeeItem";
-            this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 922);
+            this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 736);
             this.TpGroupFeeItem.Text = "分组项目";
             // 
             // panel5
@@ -1922,7 +1922,7 @@
             this.panel5.Location = new System.Drawing.Point(0, 192);
             this.panel5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(1196, 730);
+            this.panel5.Size = new System.Drawing.Size(1196, 544);
             this.panel5.TabIndex = 139;
             // 
             // DgcGroupFeeItem
@@ -1933,7 +1933,7 @@
             this.DgcGroupFeeItem.Name = "DgcGroupFeeItem";
             this.DgcGroupFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemMemoEdit1});
-            this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 725);
+            this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 539);
             this.DgcGroupFeeItem.TabIndex = 137;
             this.DgcGroupFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvGroupFeeItem});
@@ -2133,7 +2133,7 @@
             this.splitter4.Dock = System.Windows.Forms.DockStyle.Right;
             this.splitter4.Location = new System.Drawing.Point(732, 5);
             this.splitter4.Name = "splitter4";
-            this.splitter4.Size = new System.Drawing.Size(4, 725);
+            this.splitter4.Size = new System.Drawing.Size(4, 539);
             this.splitter4.TabIndex = 142;
             this.splitter4.TabStop = false;
             // 
@@ -2144,7 +2144,7 @@
             this.panel9.Location = new System.Drawing.Point(736, 5);
             this.panel9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.panel9.Name = "panel9";
-            this.panel9.Size = new System.Drawing.Size(460, 725);
+            this.panel9.Size = new System.Drawing.Size(460, 539);
             this.panel9.TabIndex = 141;
             // 
             // tabControl1
@@ -2156,17 +2156,17 @@
             this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
-            this.tabControl1.Size = new System.Drawing.Size(460, 725);
+            this.tabControl1.Size = new System.Drawing.Size(460, 539);
             this.tabControl1.TabIndex = 139;
             // 
             // TpPack
             // 
             this.TpPack.Controls.Add(this.DgcPack);
-            this.TpPack.Location = new System.Drawing.Point(4, 24);
+            this.TpPack.Location = new System.Drawing.Point(4, 23);
             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, 708);
+            this.TpPack.Size = new System.Drawing.Size(452, 512);
             this.TpPack.TabIndex = 1;
             this.TpPack.Text = "套餐";
             this.TpPack.UseVisualStyleBackColor = true;
@@ -2177,7 +2177,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, 702);
+            this.DgcPack.Size = new System.Drawing.Size(448, 506);
             this.DgcPack.TabIndex = 122;
             this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvPack,
@@ -2338,11 +2338,11 @@
             // 
             this.TpFeeItem.Controls.Add(this.DgcFeeItem);
             this.TpFeeItem.Controls.Add(this.FeeItemSearch);
-            this.TpFeeItem.Location = new System.Drawing.Point(4, 24);
+            this.TpFeeItem.Location = new System.Drawing.Point(4, 23);
             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, 708);
+            this.TpFeeItem.Size = new System.Drawing.Size(452, 512);
             this.TpFeeItem.TabIndex = 0;
             this.TpFeeItem.Text = "收费项目";
             this.TpFeeItem.UseVisualStyleBackColor = true;
@@ -2355,7 +2355,7 @@
             this.DgcFeeItem.Name = "DgcFeeItem";
             this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit1});
-            this.DgcFeeItem.Size = new System.Drawing.Size(448, 680);
+            this.DgcFeeItem.Size = new System.Drawing.Size(448, 484);
             this.DgcFeeItem.TabIndex = 137;
             this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.DgvFeeItem,
@@ -4721,8 +4721,6 @@
             this.gridColumn97.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn97.OptionsColumn.ReadOnly = true;
             this.gridColumn97.OptionsFilter.AllowFilter = false;
-            this.gridColumn97.Visible = true;
-            this.gridColumn97.VisibleIndex = 0;
             // 
             // repositoryItemCheckEdit3
             // 
@@ -4765,7 +4763,7 @@
             this.gridColumn103.OptionsColumn.ReadOnly = true;
             this.gridColumn103.OptionsFilter.AllowFilter = false;
             this.gridColumn103.Visible = true;
-            this.gridColumn103.VisibleIndex = 1;
+            this.gridColumn103.VisibleIndex = 0;
             this.gridColumn103.Width = 82;
             // 
             // gridColumn89
@@ -4785,7 +4783,7 @@
             this.gridColumn89.OptionsColumn.ReadOnly = true;
             this.gridColumn89.OptionsFilter.AllowFilter = false;
             this.gridColumn89.Visible = true;
-            this.gridColumn89.VisibleIndex = 2;
+            this.gridColumn89.VisibleIndex = 1;
             this.gridColumn89.Width = 60;
             // 
             // gridColumn90
@@ -4805,7 +4803,7 @@
             this.gridColumn90.OptionsColumn.ReadOnly = true;
             this.gridColumn90.OptionsFilter.AllowFilter = false;
             this.gridColumn90.Visible = true;
-            this.gridColumn90.VisibleIndex = 3;
+            this.gridColumn90.VisibleIndex = 2;
             this.gridColumn90.Width = 40;
             // 
             // gridColumn108
@@ -4825,7 +4823,7 @@
             this.gridColumn108.OptionsColumn.ReadOnly = true;
             this.gridColumn108.OptionsFilter.AllowFilter = false;
             this.gridColumn108.Visible = true;
-            this.gridColumn108.VisibleIndex = 4;
+            this.gridColumn108.VisibleIndex = 3;
             this.gridColumn108.Width = 30;
             // 
             // gridColumn91
@@ -4842,7 +4840,7 @@
             this.gridColumn91.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
             this.gridColumn91.OptionsColumn.ReadOnly = true;
             this.gridColumn91.Visible = true;
-            this.gridColumn91.VisibleIndex = 5;
+            this.gridColumn91.VisibleIndex = 4;
             // 
             // gridColumn93
             // 
@@ -4862,7 +4860,7 @@
             this.gridColumn93.OptionsColumn.ReadOnly = true;
             this.gridColumn93.OptionsFilter.AllowFilter = false;
             this.gridColumn93.Visible = true;
-            this.gridColumn93.VisibleIndex = 6;
+            this.gridColumn93.VisibleIndex = 5;
             this.gridColumn93.Width = 60;
             // 
             // gridColumn94
@@ -4885,7 +4883,7 @@
             this.gridColumn94.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")});
             this.gridColumn94.Visible = true;
-            this.gridColumn94.VisibleIndex = 7;
+            this.gridColumn94.VisibleIndex = 6;
             this.gridColumn94.Width = 100;
             // 
             // gridColumn95
@@ -4906,7 +4904,7 @@
             this.gridColumn95.OptionsColumn.ReadOnly = true;
             this.gridColumn95.OptionsFilter.AllowFilter = false;
             this.gridColumn95.Visible = true;
-            this.gridColumn95.VisibleIndex = 8;
+            this.gridColumn95.VisibleIndex = 7;
             this.gridColumn95.Width = 80;
             // 
             // gridColumn96
@@ -4926,9 +4924,26 @@
             this.gridColumn96.OptionsColumn.ReadOnly = true;
             this.gridColumn96.OptionsFilter.AllowFilter = false;
             this.gridColumn96.Visible = true;
-            this.gridColumn96.VisibleIndex = 9;
+            this.gridColumn96.VisibleIndex = 8;
             this.gridColumn96.Width = 160;
             // 
+            // gridColumn105
+            // 
+            this.gridColumn105.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
+            this.gridColumn105.AppearanceCell.Options.UseFont = true;
+            this.gridColumn105.Caption = "联系方式";
+            this.gridColumn105.FieldName = "Tel1";
+            this.gridColumn105.Name = "gridColumn105";
+            this.gridColumn105.OptionsColumn.AllowEdit = false;
+            this.gridColumn105.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn105.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn105.OptionsColumn.AllowMove = false;
+            this.gridColumn105.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+            this.gridColumn105.OptionsColumn.ReadOnly = true;
+            this.gridColumn105.OptionsFilter.AllowFilter = false;
+            this.gridColumn105.Visible = true;
+            this.gridColumn105.VisibleIndex = 10;
+            // 
             // gridColumn104
             // 
             this.gridColumn104.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@@ -4946,7 +4961,7 @@
             this.gridColumn104.OptionsColumn.ReadOnly = true;
             this.gridColumn104.OptionsFilter.AllowFilter = false;
             this.gridColumn104.Visible = true;
-            this.gridColumn104.VisibleIndex = 12;
+            this.gridColumn104.VisibleIndex = 11;
             // 
             // gridColumn92
             // 
@@ -4963,7 +4978,7 @@
             this.gridColumn92.OptionsColumn.ReadOnly = true;
             this.gridColumn92.OptionsFilter.AllowFilter = false;
             this.gridColumn92.Visible = true;
-            this.gridColumn92.VisibleIndex = 10;
+            this.gridColumn92.VisibleIndex = 9;
             // 
             // PatientSearch
             // 
@@ -5184,23 +5199,6 @@
             // 
             this.gridView8.Name = "gridView8";
             // 
-            // gridColumn105
-            // 
-            this.gridColumn105.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
-            this.gridColumn105.AppearanceCell.Options.UseFont = true;
-            this.gridColumn105.Caption = "联系方式";
-            this.gridColumn105.FieldName = "Tel1";
-            this.gridColumn105.Name = "gridColumn105";
-            this.gridColumn105.OptionsColumn.AllowEdit = false;
-            this.gridColumn105.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn105.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn105.OptionsColumn.AllowMove = false;
-            this.gridColumn105.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
-            this.gridColumn105.OptionsColumn.ReadOnly = true;
-            this.gridColumn105.OptionsFilter.AllowFilter = false;
-            this.gridColumn105.Visible = true;
-            this.gridColumn105.VisibleIndex = 11;
-            // 
             // EnrollmentOrgForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);

PEIS/View/Enrollment/EnrollmentOrgForm.resx

@@ -566,6 +566,6 @@
 </value>
   </data>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>79</value>
+    <value>48</value>
   </metadata>
 </root>