diff --git a/PEIS/Properties/Resources.Designer.cs b/PEIS/Properties/Resources.Designer.cs
index a86da42..797f1ab 100644
--- a/PEIS/Properties/Resources.Designer.cs
+++ b/PEIS/Properties/Resources.Designer.cs
@@ -140,6 +140,16 @@ namespace PEIS.Properties {
}
}
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap shang {
+ get {
+ object obj = ResourceManager.GetObject("shang", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
@@ -170,6 +180,16 @@ namespace PEIS.Properties {
}
}
+ ///
+ /// 查找 System.Drawing.Bitmap 类型的本地化资源。
+ ///
+ internal static System.Drawing.Bitmap xia {
+ get {
+ object obj = ResourceManager.GetObject("xia", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
///
/// 查找 System.Drawing.Bitmap 类型的本地化资源。
///
diff --git a/PEIS/Properties/Resources.resx b/PEIS/Properties/Resources.resx
index 5bebda9..6bd5584 100644
--- a/PEIS/Properties/Resources.resx
+++ b/PEIS/Properties/Resources.resx
@@ -130,6 +130,9 @@
..\Resources\审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\menu.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -157,9 +160,6 @@
..\Resources\Report.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\查找.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -172,6 +172,9 @@
..\Resources\刷新.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\添加.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -184,6 +187,9 @@
..\Resources\结论.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
..\Resources\添加1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
@@ -199,25 +205,25 @@
..\Resources\WeChat.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
..\Resources\取消.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\分检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\left.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\取消审核.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
..\Resources\总检页面.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\个人信息 (1).png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\预览报告.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
-
- ..\Resources\wechatlogo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+ ..\Resources\shang.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ ..\Resources\xia.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
\ No newline at end of file
diff --git a/PEIS/Resources/shang.png b/PEIS/Resources/shang.png
new file mode 100644
index 0000000..1c9abf2
Binary files /dev/null and b/PEIS/Resources/shang.png differ
diff --git a/PEIS/Resources/xia.png b/PEIS/Resources/xia.png
new file mode 100644
index 0000000..087b6f7
Binary files /dev/null and b/PEIS/Resources/xia.png differ
diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs
index 2c3e967..a872252 100644
--- a/PEIS/View/Exam/TotalForm.Designer.cs
+++ b/PEIS/View/Exam/TotalForm.Designer.cs
@@ -345,9 +345,8 @@
// splitContainerBase.Panel2
//
this.splitContainerBase.Panel2.Controls.Add(this.panelRightBase);
- this.splitContainerBase.Size = new System.Drawing.Size(2888, 1504);
+ this.splitContainerBase.Size = new System.Drawing.Size(1904, 1041);
this.splitContainerBase.SplitterDistance = 235;
- this.splitContainerBase.SplitterWidth = 8;
this.splitContainerBase.TabIndex = 0;
//
// panelLeftBase
@@ -359,20 +358,19 @@
this.panelLeftBase.Location = new System.Drawing.Point(0, 0);
this.panelLeftBase.Margin = new System.Windows.Forms.Padding(0);
this.panelLeftBase.Name = "panelLeftBase";
- this.panelLeftBase.Size = new System.Drawing.Size(235, 1504);
+ this.panelLeftBase.Size = new System.Drawing.Size(235, 1041);
this.panelLeftBase.TabIndex = 0;
//
// DgcPatient
//
this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
- this.DgcPatient.Location = new System.Drawing.Point(0, 456);
+ this.DgcPatient.Location = new System.Drawing.Point(0, 250);
this.DgcPatient.MainView = this.DgvPatient;
this.DgcPatient.Margin = new System.Windows.Forms.Padding(0);
this.DgcPatient.Name = "DgcPatient";
this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemCheckEdit2});
- this.DgcPatient.Size = new System.Drawing.Size(235, 1048);
+ this.DgcPatient.Size = new System.Drawing.Size(235, 791);
this.DgcPatient.TabIndex = 127;
this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvPatient});
@@ -621,17 +619,17 @@
this.panelQuery.Location = new System.Drawing.Point(0, 0);
this.panelQuery.Margin = new System.Windows.Forms.Padding(0);
this.panelQuery.Name = "panelQuery";
- this.panelQuery.Size = new System.Drawing.Size(235, 456);
+ this.panelQuery.Size = new System.Drawing.Size(235, 250);
this.panelQuery.TabIndex = 126;
//
// panel1
//
this.panel1.Controls.Add(this.menuStrip1);
this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.panel1.Location = new System.Drawing.Point(0, 383);
+ this.panel1.Location = new System.Drawing.Point(0, 210);
this.panel1.Margin = new System.Windows.Forms.Padding(0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(235, 73);
+ this.panel1.Size = new System.Drawing.Size(235, 40);
this.panel1.TabIndex = 156;
//
// menuStrip1
@@ -647,9 +645,9 @@
this.toolStripTextBox1});
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
- this.menuStrip1.Padding = new System.Windows.Forms.Padding(4, 0, 10, 0);
+ this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 5, 0);
this.menuStrip1.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.menuStrip1.Size = new System.Drawing.Size(235, 73);
+ this.menuStrip1.Size = new System.Drawing.Size(235, 40);
this.menuStrip1.TabIndex = 59;
this.menuStrip1.Text = "menuStrip2";
//
@@ -658,7 +656,7 @@
this.BtnRefresh.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.BtnRefresh.Image = global::PEIS.Properties.Resources.刷新;
this.BtnRefresh.Name = "BtnRefresh";
- this.BtnRefresh.Size = new System.Drawing.Size(107, 73);
+ this.BtnRefresh.Size = new System.Drawing.Size(73, 40);
this.BtnRefresh.Text = "刷新";
//
// toolStripTextBox1
@@ -667,17 +665,16 @@
this.toolStripTextBox1.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.toolStripTextBox1.Name = "toolStripTextBox1";
this.toolStripTextBox1.ReadOnly = true;
- this.toolStripTextBox1.Size = new System.Drawing.Size(356, 73);
+ this.toolStripTextBox1.Size = new System.Drawing.Size(180, 40);
this.toolStripTextBox1.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.toolStripTextBox1.Visible = false;
//
// RbStatus4
//
this.RbStatus4.AutoSize = true;
- this.RbStatus4.Location = new System.Drawing.Point(336, 233);
- this.RbStatus4.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.RbStatus4.Location = new System.Drawing.Point(168, 128);
this.RbStatus4.Name = "RbStatus4";
- this.RbStatus4.Size = new System.Drawing.Size(93, 35);
+ this.RbStatus4.Size = new System.Drawing.Size(50, 21);
this.RbStatus4.TabIndex = 155;
this.RbStatus4.TabStop = true;
this.RbStatus4.Text = "全部";
@@ -687,10 +684,9 @@
//
this.RbStatus3.AutoSize = true;
this.RbStatus3.BackColor = System.Drawing.Color.Transparent;
- this.RbStatus3.Location = new System.Drawing.Point(146, 233);
- this.RbStatus3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.RbStatus3.Location = new System.Drawing.Point(73, 128);
this.RbStatus3.Name = "RbStatus3";
- this.RbStatus3.Size = new System.Drawing.Size(141, 35);
+ this.RbStatus3.Size = new System.Drawing.Size(74, 21);
this.RbStatus3.TabIndex = 154;
this.RbStatus3.TabStop = true;
this.RbStatus3.Text = "科室分检";
@@ -699,10 +695,9 @@
// txtInfo
//
this.txtInfo.ForeColor = System.Drawing.Color.Gray;
- this.txtInfo.Location = new System.Drawing.Point(146, 332);
- this.txtInfo.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.txtInfo.Location = new System.Drawing.Point(73, 182);
this.txtInfo.Name = "txtInfo";
- this.txtInfo.Size = new System.Drawing.Size(316, 39);
+ this.txtInfo.Size = new System.Drawing.Size(160, 23);
this.txtInfo.TabIndex = 10;
this.txtInfo.WatermarkColor = System.Drawing.Color.Gray;
this.txtInfo.WatermarkText = null;
@@ -710,30 +705,29 @@
// txtTeam
//
this.txtTeam.ForeColor = System.Drawing.Color.Gray;
- this.txtTeam.Location = new System.Drawing.Point(146, 283);
- this.txtTeam.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.txtTeam.Location = new System.Drawing.Point(73, 155);
this.txtTeam.Name = "txtTeam";
- this.txtTeam.Size = new System.Drawing.Size(316, 39);
+ this.txtTeam.Size = new System.Drawing.Size(160, 23);
this.txtTeam.TabIndex = 9;
this.txtTeam.WatermarkColor = System.Drawing.Color.Gray;
this.txtTeam.WatermarkText = null;
//
// lbl7
//
- this.lbl7.Location = new System.Drawing.Point(6, 332);
+ this.lbl7.Location = new System.Drawing.Point(3, 182);
this.lbl7.Margin = new System.Windows.Forms.Padding(0);
this.lbl7.Name = "lbl7";
- this.lbl7.Size = new System.Drawing.Size(140, 55);
+ this.lbl7.Size = new System.Drawing.Size(70, 30);
this.lbl7.TabIndex = 153;
this.lbl7.Text = "体检者：";
this.lbl7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lbl6
//
- this.lbl6.Location = new System.Drawing.Point(6, 274);
+ this.lbl6.Location = new System.Drawing.Point(3, 150);
this.lbl6.Margin = new System.Windows.Forms.Padding(0);
this.lbl6.Name = "lbl6";
- this.lbl6.Size = new System.Drawing.Size(140, 55);
+ this.lbl6.Size = new System.Drawing.Size(70, 30);
this.lbl6.TabIndex = 151;
this.lbl6.Text = "体检团队：";
this.lbl6.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -746,18 +740,18 @@
this.comboDate.FormattingEnabled = true;
this.comboDate.Items.AddRange(new object[] {
"一般检查"});
- this.comboDate.Location = new System.Drawing.Point(146, 18);
- this.comboDate.Margin = new System.Windows.Forms.Padding(0, 4, 0, 0);
+ this.comboDate.Location = new System.Drawing.Point(73, 10);
+ this.comboDate.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
this.comboDate.Name = "comboDate";
- this.comboDate.Size = new System.Drawing.Size(316, 39);
+ this.comboDate.Size = new System.Drawing.Size(160, 25);
this.comboDate.TabIndex = 2;
//
// lbl3
//
- this.lbl3.Location = new System.Drawing.Point(6, 67);
+ this.lbl3.Location = new System.Drawing.Point(3, 37);
this.lbl3.Margin = new System.Windows.Forms.Padding(0);
this.lbl3.Name = "lbl3";
- this.lbl3.Size = new System.Drawing.Size(140, 55);
+ this.lbl3.Size = new System.Drawing.Size(70, 30);
this.lbl3.TabIndex = 149;
this.lbl3.Text = "开始日期：";
this.lbl3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -765,10 +759,9 @@
// RbStatus2
//
this.RbStatus2.AutoSize = true;
- this.RbStatus2.Location = new System.Drawing.Point(336, 184);
- this.RbStatus2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.RbStatus2.Location = new System.Drawing.Point(168, 101);
this.RbStatus2.Name = "RbStatus2";
- this.RbStatus2.Size = new System.Drawing.Size(93, 35);
+ this.RbStatus2.Size = new System.Drawing.Size(50, 21);
this.RbStatus2.TabIndex = 7;
this.RbStatus2.TabStop = true;
this.RbStatus2.Text = "打印";
@@ -778,10 +771,9 @@
//
this.RbStatus1.AutoSize = true;
this.RbStatus1.BackColor = System.Drawing.Color.Transparent;
- this.RbStatus1.Location = new System.Drawing.Point(146, 184);
- this.RbStatus1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.RbStatus1.Location = new System.Drawing.Point(73, 101);
this.RbStatus1.Name = "RbStatus1";
- this.RbStatus1.Size = new System.Drawing.Size(93, 35);
+ this.RbStatus1.Size = new System.Drawing.Size(50, 21);
this.RbStatus1.TabIndex = 5;
this.RbStatus1.TabStop = true;
this.RbStatus1.Text = "总检";
@@ -789,30 +781,30 @@
//
// lbl5
//
- this.lbl5.Location = new System.Drawing.Point(6, 177);
+ this.lbl5.Location = new System.Drawing.Point(3, 97);
this.lbl5.Margin = new System.Windows.Forms.Padding(0);
this.lbl5.Name = "lbl5";
- this.lbl5.Size = new System.Drawing.Size(140, 55);
+ this.lbl5.Size = new System.Drawing.Size(70, 30);
this.lbl5.TabIndex = 146;
this.lbl5.Text = "体检状态：";
this.lbl5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label2
//
- this.label2.Location = new System.Drawing.Point(6, 122);
+ this.label2.Location = new System.Drawing.Point(3, 67);
this.label2.Margin = new System.Windows.Forms.Padding(0);
this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(140, 55);
+ this.label2.Size = new System.Drawing.Size(70, 30);
this.label2.TabIndex = 139;
this.label2.Text = "结束日期：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lbl2
//
- this.lbl2.Location = new System.Drawing.Point(6, 13);
+ this.lbl2.Location = new System.Drawing.Point(3, 7);
this.lbl2.Margin = new System.Windows.Forms.Padding(0);
this.lbl2.Name = "lbl2";
- this.lbl2.Size = new System.Drawing.Size(140, 55);
+ this.lbl2.Size = new System.Drawing.Size(70, 30);
this.lbl2.TabIndex = 141;
this.lbl2.Text = "日期类型：";
this.lbl2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -822,10 +814,10 @@
this.dateEditEnd.CustomFormat = " yyyy 年 MM 月 dd 日";
this.dateEditEnd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dateEditEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
- this.dateEditEnd.Location = new System.Drawing.Point(146, 128);
+ this.dateEditEnd.Location = new System.Drawing.Point(73, 70);
this.dateEditEnd.Margin = new System.Windows.Forms.Padding(0);
this.dateEditEnd.Name = "dateEditEnd";
- this.dateEditEnd.Size = new System.Drawing.Size(316, 39);
+ this.dateEditEnd.Size = new System.Drawing.Size(160, 23);
this.dateEditEnd.TabIndex = 4;
//
// dateEditBeg
@@ -833,10 +825,10 @@
this.dateEditBeg.CustomFormat = " yyyy 年 MM 月 dd 日";
this.dateEditBeg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.dateEditBeg.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
- this.dateEditBeg.Location = new System.Drawing.Point(146, 73);
+ this.dateEditBeg.Location = new System.Drawing.Point(73, 40);
this.dateEditBeg.Margin = new System.Windows.Forms.Padding(0);
this.dateEditBeg.Name = "dateEditBeg";
- this.dateEditBeg.Size = new System.Drawing.Size(316, 39);
+ this.dateEditBeg.Size = new System.Drawing.Size(160, 23);
this.dateEditBeg.TabIndex = 3;
//
// panelRightBase
@@ -846,9 +838,8 @@
this.panelRightBase.Controls.Add(this.panelMenu);
this.panelRightBase.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelRightBase.Location = new System.Drawing.Point(0, 0);
- this.panelRightBase.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelRightBase.Name = "panelRightBase";
- this.panelRightBase.Size = new System.Drawing.Size(2645, 1504);
+ this.panelRightBase.Size = new System.Drawing.Size(1665, 1041);
this.panelRightBase.TabIndex = 2;
//
// panelExamInfoBase
@@ -856,10 +847,9 @@
this.panelExamInfoBase.BackColor = System.Drawing.Color.White;
this.panelExamInfoBase.Controls.Add(this.splitContainerExamInfo);
this.panelExamInfoBase.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panelExamInfoBase.Location = new System.Drawing.Point(0, 330);
- this.panelExamInfoBase.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panelExamInfoBase.Location = new System.Drawing.Point(0, 181);
this.panelExamInfoBase.Name = "panelExamInfoBase";
- this.panelExamInfoBase.Size = new System.Drawing.Size(2645, 1174);
+ this.panelExamInfoBase.Size = new System.Drawing.Size(1665, 860);
this.panelExamInfoBase.TabIndex = 60;
//
// splitContainerExamInfo
@@ -868,7 +858,6 @@
this.splitContainerExamInfo.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitContainerExamInfo.FixedPanel = System.Windows.Forms.FixedPanel.Panel2;
this.splitContainerExamInfo.Location = new System.Drawing.Point(0, 0);
- this.splitContainerExamInfo.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.splitContainerExamInfo.Name = "splitContainerExamInfo";
//
// splitContainerExamInfo.Panel1
@@ -878,9 +867,8 @@
// splitContainerExamInfo.Panel2
//
this.splitContainerExamInfo.Panel2.Controls.Add(this.panelExamInfoL);
- this.splitContainerExamInfo.Size = new System.Drawing.Size(2645, 1174);
- this.splitContainerExamInfo.SplitterDistance = 1747;
- this.splitContainerExamInfo.SplitterWidth = 8;
+ this.splitContainerExamInfo.Size = new System.Drawing.Size(1665, 860);
+ this.splitContainerExamInfo.SplitterDistance = 544;
this.splitContainerExamInfo.TabIndex = 0;
//
// panelTxtSummary
@@ -889,9 +877,8 @@
this.panelTxtSummary.Controls.Add(this.splitExamPart);
this.panelTxtSummary.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelTxtSummary.Location = new System.Drawing.Point(0, 0);
- this.panelTxtSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelTxtSummary.Name = "panelTxtSummary";
- this.panelTxtSummary.Size = new System.Drawing.Size(1747, 1174);
+ this.panelTxtSummary.Size = new System.Drawing.Size(544, 860);
this.panelTxtSummary.TabIndex = 2;
//
// splitExamPart
@@ -899,7 +886,6 @@
this.splitExamPart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
this.splitExamPart.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitExamPart.Location = new System.Drawing.Point(0, 0);
- this.splitExamPart.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.splitExamPart.Name = "splitExamPart";
//
// splitExamPart.Panel1
@@ -909,9 +895,8 @@
// splitExamPart.Panel2
//
this.splitExamPart.Panel2.Controls.Add(this.txtSummary);
- this.splitExamPart.Size = new System.Drawing.Size(1747, 1174);
- this.splitExamPart.SplitterDistance = 803;
- this.splitExamPart.SplitterWidth = 8;
+ this.splitExamPart.Size = new System.Drawing.Size(544, 860);
+ this.splitExamPart.SplitterDistance = 249;
this.splitExamPart.TabIndex = 0;
//
// panel5
@@ -921,9 +906,8 @@
this.panel5.Controls.Add(this.DgcExamResultData);
this.panel5.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel5.Location = new System.Drawing.Point(0, 0);
- this.panel5.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel5.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(803, 1174);
+ this.panel5.Size = new System.Drawing.Size(249, 860);
this.panel5.TabIndex = 0;
//
// DgcExamResultData
@@ -931,14 +915,12 @@
this.DgcExamResultData.Dock = System.Windows.Forms.DockStyle.Left;
this.DgcExamResultData.EmbeddedNavigator.Appearance.Options.UseTextOptions = true;
this.DgcExamResultData.EmbeddedNavigator.Appearance.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.DgcExamResultData.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcExamResultData.Location = new System.Drawing.Point(0, 0);
this.DgcExamResultData.MainView = this.DgvExamResultData;
- this.DgcExamResultData.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcExamResultData.Name = "DgcExamResultData";
this.DgcExamResultData.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemMemoEdit4});
- this.DgcExamResultData.Size = new System.Drawing.Size(1200, 1140);
+ this.DgcExamResultData.Size = new System.Drawing.Size(600, 843);
this.DgcExamResultData.TabIndex = 0;
this.DgcExamResultData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvExamResultData});
@@ -1096,12 +1078,11 @@
this.txtSummary.Dock = System.Windows.Forms.DockStyle.Fill;
this.txtSummary.Font = new System.Drawing.Font("微软雅黑", 9F);
this.txtSummary.Location = new System.Drawing.Point(0, 0);
- this.txtSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.txtSummary.Multiline = true;
this.txtSummary.Name = "txtSummary";
this.txtSummary.ReadOnly = true;
this.txtSummary.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
- this.txtSummary.Size = new System.Drawing.Size(936, 1174);
+ this.txtSummary.Size = new System.Drawing.Size(291, 860);
this.txtSummary.TabIndex = 4;
this.txtSummary.Text = "科室小结";
//
@@ -1110,9 +1091,8 @@
this.panelExamInfoL.Controls.Add(this.TabPart);
this.panelExamInfoL.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelExamInfoL.Location = new System.Drawing.Point(0, 0);
- this.panelExamInfoL.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelExamInfoL.Name = "panelExamInfoL";
- this.panelExamInfoL.Size = new System.Drawing.Size(890, 1174);
+ this.panelExamInfoL.Size = new System.Drawing.Size(1117, 860);
this.panelExamInfoL.TabIndex = 2;
//
// TabPart
@@ -1137,11 +1117,10 @@
this.TabPart.AppearancePage.PageClient.Options.UseFont = true;
this.TabPart.Dock = System.Windows.Forms.DockStyle.Fill;
this.TabPart.Location = new System.Drawing.Point(0, 0);
- this.TabPart.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.TabPart.Name = "TabPart";
this.TabPart.SelectedTabPage = this.tabPageConslusion;
this.TabPart.ShowTabHeader = DevExpress.Utils.DefaultBoolean.True;
- this.TabPart.Size = new System.Drawing.Size(890, 1174);
+ this.TabPart.Size = new System.Drawing.Size(1117, 860);
this.TabPart.TabIndex = 0;
this.TabPart.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabPageConslusion,
@@ -1158,9 +1137,9 @@
this.tabPageConslusion.Controls.Add(this.panelAllConclusion);
this.tabPageConslusion.Controls.Add(this.panelConclussionMenu);
this.tabPageConslusion.Image = global::PEIS.Properties.Resources.menu;
- this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(2);
this.tabPageConslusion.Name = "tabPageConslusion";
- this.tabPageConslusion.Size = new System.Drawing.Size(878, 1115);
+ this.tabPageConslusion.Size = new System.Drawing.Size(1111, 821);
this.tabPageConslusion.Text = "结论词";
//
// panelConclussion
@@ -1168,26 +1147,23 @@
this.panelConclussion.BackColor = System.Drawing.Color.White;
this.panelConclussion.Controls.Add(this.DgcExamConclusion);
this.panelConclussion.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panelConclussion.Location = new System.Drawing.Point(0, 73);
- this.panelConclussion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panelConclussion.Location = new System.Drawing.Point(0, 40);
this.panelConclussion.Name = "panelConclussion";
- this.panelConclussion.Size = new System.Drawing.Size(196, 1042);
+ this.panelConclussion.Size = new System.Drawing.Size(770, 781);
this.panelConclussion.TabIndex = 3;
//
// DgcExamConclusion
//
this.DgcExamConclusion.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcExamConclusion.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcExamConclusion.Font = new System.Drawing.Font("微软雅黑", 9F);
this.DgcExamConclusion.Location = new System.Drawing.Point(0, 0);
this.DgcExamConclusion.MainView = this.DgvExamConclusion;
- this.DgcExamConclusion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcExamConclusion.Name = "DgcExamConclusion";
this.DgcExamConclusion.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemRichTextEdit2,
this.repositoryItemMemoEdit2,
this.CmbSearchConclusion});
- this.DgcExamConclusion.Size = new System.Drawing.Size(196, 1042);
+ this.DgcExamConclusion.Size = new System.Drawing.Size(770, 781);
this.DgcExamConclusion.TabIndex = 5;
this.DgcExamConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvExamConclusion,
@@ -1340,22 +1316,19 @@
this.panelAllConclusion.Controls.Add(this.DgcAllConclusion);
this.panelAllConclusion.Controls.Add(this.panel2);
this.panelAllConclusion.Dock = System.Windows.Forms.DockStyle.Right;
- this.panelAllConclusion.Location = new System.Drawing.Point(196, 73);
- this.panelAllConclusion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panelAllConclusion.Location = new System.Drawing.Point(770, 40);
this.panelAllConclusion.Name = "panelAllConclusion";
- this.panelAllConclusion.Size = new System.Drawing.Size(682, 1042);
+ this.panelAllConclusion.Size = new System.Drawing.Size(341, 781);
this.panelAllConclusion.TabIndex = 2;
//
// DgcAllConclusion
//
this.DgcAllConclusion.Dock = System.Windows.Forms.DockStyle.Left;
- this.DgcAllConclusion.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcAllConclusion.Font = new System.Drawing.Font("微软雅黑", 9F);
- this.DgcAllConclusion.Location = new System.Drawing.Point(0, 66);
+ this.DgcAllConclusion.Location = new System.Drawing.Point(0, 36);
this.DgcAllConclusion.MainView = this.DgvAllConclusion;
- this.DgcAllConclusion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcAllConclusion.Name = "DgcAllConclusion";
- this.DgcAllConclusion.Size = new System.Drawing.Size(1000, 942);
+ this.DgcAllConclusion.Size = new System.Drawing.Size(500, 728);
this.DgcAllConclusion.TabIndex = 2;
this.DgcAllConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvAllConclusion});
@@ -1435,27 +1408,26 @@
this.panel2.Location = new System.Drawing.Point(0, 0);
this.panel2.Margin = new System.Windows.Forms.Padding(0);
this.panel2.Name = "panel2";
- this.panel2.Padding = new System.Windows.Forms.Padding(0, 7, 0, 0);
- this.panel2.Size = new System.Drawing.Size(1000, 66);
+ this.panel2.Padding = new System.Windows.Forms.Padding(0, 4, 0, 0);
+ this.panel2.Size = new System.Drawing.Size(500, 36);
this.panel2.TabIndex = 1;
//
// txtConclusionSerch
//
this.txtConclusionSerch.Dock = System.Windows.Forms.DockStyle.Left;
this.txtConclusionSerch.Font = new System.Drawing.Font("微软雅黑", 12F);
- this.txtConclusionSerch.Location = new System.Drawing.Point(86, 7);
+ this.txtConclusionSerch.Location = new System.Drawing.Point(43, 4);
this.txtConclusionSerch.Margin = new System.Windows.Forms.Padding(0);
this.txtConclusionSerch.Name = "txtConclusionSerch";
- this.txtConclusionSerch.Size = new System.Drawing.Size(578, 50);
+ this.txtConclusionSerch.Size = new System.Drawing.Size(291, 29);
this.txtConclusionSerch.TabIndex = 2;
//
// label4
//
this.label4.Dock = System.Windows.Forms.DockStyle.Left;
- this.label4.Location = new System.Drawing.Point(0, 7);
- this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label4.Location = new System.Drawing.Point(0, 4);
this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(86, 59);
+ this.label4.Size = new System.Drawing.Size(43, 32);
this.label4.TabIndex = 1;
this.label4.Text = "搜索：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -1465,18 +1437,17 @@
this.panelConclussionMenu.Controls.Add(this.OpsConclusion);
this.panelConclussionMenu.Dock = System.Windows.Forms.DockStyle.Top;
this.panelConclussionMenu.Location = new System.Drawing.Point(0, 0);
- this.panelConclussionMenu.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelConclussionMenu.Name = "panelConclussionMenu";
- this.panelConclussionMenu.Size = new System.Drawing.Size(878, 73);
+ this.panelConclussionMenu.Size = new System.Drawing.Size(1111, 40);
this.panelConclussionMenu.TabIndex = 0;
//
// OpsConclusion
//
this.OpsConclusion.Dock = System.Windows.Forms.DockStyle.Fill;
this.OpsConclusion.Location = new System.Drawing.Point(0, 0);
- this.OpsConclusion.Margin = new System.Windows.Forms.Padding(6, 13, 6, 13);
+ this.OpsConclusion.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7);
this.OpsConclusion.Name = "OpsConclusion";
- this.OpsConclusion.Size = new System.Drawing.Size(878, 73);
+ this.OpsConclusion.Size = new System.Drawing.Size(1111, 40);
this.OpsConclusion.TabIndex = 5;
//
// tabPageExam
@@ -1497,22 +1468,20 @@
this.tabPageExam.Appearance.PageClient.Options.UseForeColor = true;
this.tabPageExam.Controls.Add(this.DgcExamResult);
this.tabPageExam.Image = global::PEIS.Properties.Resources.menu;
- this.tabPageExam.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tabPageExam.Margin = new System.Windows.Forms.Padding(2);
this.tabPageExam.Name = "tabPageExam";
- this.tabPageExam.Size = new System.Drawing.Size(1768, 1115);
+ this.tabPageExam.Size = new System.Drawing.Size(1111, 821);
this.tabPageExam.Text = "一般项目";
//
// DgcExamResult
//
this.DgcExamResult.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcExamResult.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcExamResult.Location = new System.Drawing.Point(0, 0);
this.DgcExamResult.MainView = this.DgvExamResult;
- this.DgcExamResult.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcExamResult.Name = "DgcExamResult";
this.DgcExamResult.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemMemoEdit3});
- this.DgcExamResult.Size = new System.Drawing.Size(1768, 1115);
+ this.DgcExamResult.Size = new System.Drawing.Size(1111, 821);
this.DgcExamResult.TabIndex = 140;
this.DgcExamResult.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvExamResult});
@@ -1698,9 +1667,9 @@
//
this.tabPageSummary.Controls.Add(this.panelDeptSummary);
this.tabPageSummary.Image = global::PEIS.Properties.Resources.menu;
- this.tabPageSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tabPageSummary.Margin = new System.Windows.Forms.Padding(2);
this.tabPageSummary.Name = "tabPageSummary";
- this.tabPageSummary.Size = new System.Drawing.Size(1768, 1115);
+ this.tabPageSummary.Size = new System.Drawing.Size(1111, 821);
this.tabPageSummary.Text = "科室小结";
//
// panelDeptSummary
@@ -1709,24 +1678,21 @@
this.panelDeptSummary.Controls.Add(this.DgcSummary);
this.panelDeptSummary.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelDeptSummary.Location = new System.Drawing.Point(0, 0);
- this.panelDeptSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelDeptSummary.Name = "panelDeptSummary";
- this.panelDeptSummary.Size = new System.Drawing.Size(1768, 1115);
+ this.panelDeptSummary.Size = new System.Drawing.Size(1111, 821);
this.panelDeptSummary.TabIndex = 61;
//
// DgcSummary
//
this.DgcSummary.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcSummary.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcSummary.Location = new System.Drawing.Point(0, 0);
this.DgcSummary.MainView = this.DgvSummary;
- this.DgcSummary.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcSummary.Name = "DgcSummary";
this.DgcSummary.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemRichTextEdit1,
this.repositoryItemTextEdit1,
this.repositoryItemMemoEdit1});
- this.DgcSummary.Size = new System.Drawing.Size(1768, 1115);
+ this.DgcSummary.Size = new System.Drawing.Size(1111, 821);
this.DgcSummary.TabIndex = 0;
this.DgcSummary.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvSummary});
@@ -1788,20 +1754,18 @@
//
this.tabPageLis.Controls.Add(this.DgcLisReport);
this.tabPageLis.Image = global::PEIS.Properties.Resources.menu;
- this.tabPageLis.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tabPageLis.Margin = new System.Windows.Forms.Padding(2);
this.tabPageLis.Name = "tabPageLis";
- this.tabPageLis.Size = new System.Drawing.Size(1768, 1115);
+ this.tabPageLis.Size = new System.Drawing.Size(1111, 821);
this.tabPageLis.Text = "检验报告";
//
// DgcLisReport
//
this.DgcLisReport.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcLisReport.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcLisReport.Location = new System.Drawing.Point(0, 0);
this.DgcLisReport.MainView = this.DgvLisReport;
- this.DgcLisReport.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcLisReport.Name = "DgcLisReport";
- this.DgcLisReport.Size = new System.Drawing.Size(1768, 1115);
+ this.DgcLisReport.Size = new System.Drawing.Size(1111, 821);
this.DgcLisReport.TabIndex = 1;
this.DgcLisReport.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvLisReport});
@@ -1910,9 +1874,9 @@
//
this.tabPagePacs.Controls.Add(this.panelPacsBase);
this.tabPagePacs.Image = global::PEIS.Properties.Resources.menu;
- this.tabPagePacs.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tabPagePacs.Margin = new System.Windows.Forms.Padding(2);
this.tabPagePacs.Name = "tabPagePacs";
- this.tabPagePacs.Size = new System.Drawing.Size(1768, 1115);
+ this.tabPagePacs.Size = new System.Drawing.Size(1111, 821);
this.tabPagePacs.Text = "检查报告";
//
// panelPacsBase
@@ -1921,9 +1885,8 @@
this.panelPacsBase.Controls.Add(this.panelPacsRptList);
this.panelPacsBase.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelPacsBase.Location = new System.Drawing.Point(0, 0);
- this.panelPacsBase.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelPacsBase.Name = "panelPacsBase";
- this.panelPacsBase.Size = new System.Drawing.Size(1768, 1115);
+ this.panelPacsBase.Size = new System.Drawing.Size(1111, 821);
this.panelPacsBase.TabIndex = 1;
//
// xtraTabControl1
@@ -1931,11 +1894,10 @@
this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.xtraTabControl1.HeaderLocation = DevExpress.XtraTab.TabHeaderLocation.Left;
this.xtraTabControl1.HeaderOrientation = DevExpress.XtraTab.TabOrientation.Horizontal;
- this.xtraTabControl1.Location = new System.Drawing.Point(520, 0);
- this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.xtraTabControl1.Location = new System.Drawing.Point(260, 0);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.tabPacsRpt;
- this.xtraTabControl1.Size = new System.Drawing.Size(1248, 1115);
+ this.xtraTabControl1.Size = new System.Drawing.Size(851, 821);
this.xtraTabControl1.TabIndex = 1;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabPacsRpt,
@@ -1944,9 +1906,8 @@
// tabPacsRpt
//
this.tabPacsRpt.Controls.Add(this.panelPacsRpt);
- this.tabPacsRpt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.tabPacsRpt.Name = "tabPacsRpt";
- this.tabPacsRpt.Size = new System.Drawing.Size(1167, 1103);
+ this.tabPacsRpt.Size = new System.Drawing.Size(807, 815);
this.tabPacsRpt.Text = "报告";
//
// panelPacsRpt
@@ -1956,17 +1917,15 @@
this.panelPacsRpt.Controls.Add(this.pictureBoxPacsRpt);
this.panelPacsRpt.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelPacsRpt.Location = new System.Drawing.Point(0, 0);
- this.panelPacsRpt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelPacsRpt.Name = "panelPacsRpt";
- this.panelPacsRpt.Size = new System.Drawing.Size(1167, 1103);
+ this.panelPacsRpt.Size = new System.Drawing.Size(807, 815);
this.panelPacsRpt.TabIndex = 3;
//
// pictureBoxPacsRpt
//
this.pictureBoxPacsRpt.BackColor = System.Drawing.Color.White;
this.pictureBoxPacsRpt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.pictureBoxPacsRpt.Location = new System.Drawing.Point(16, 15);
- this.pictureBoxPacsRpt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.pictureBoxPacsRpt.Location = new System.Drawing.Point(8, 8);
this.pictureBoxPacsRpt.Name = "pictureBoxPacsRpt";
this.pictureBoxPacsRpt.Size = new System.Drawing.Size(10, 10);
this.pictureBoxPacsRpt.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -1976,9 +1935,8 @@
// tabPacsImg
//
this.tabPacsImg.Controls.Add(this.panel12);
- this.tabPacsImg.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.tabPacsImg.Name = "tabPacsImg";
- this.tabPacsImg.Size = new System.Drawing.Size(1167, 1091);
+ this.tabPacsImg.Size = new System.Drawing.Size(807, 815);
this.tabPacsImg.Text = "图片";
//
// panel12
@@ -1986,9 +1944,8 @@
this.panel12.Controls.Add(this.panel13);
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel12.Location = new System.Drawing.Point(0, 0);
- this.panel12.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(1167, 1091);
+ this.panel12.Size = new System.Drawing.Size(807, 815);
this.panel12.TabIndex = 3;
//
// panel13
@@ -1997,9 +1954,8 @@
this.panel13.Controls.Add(this.panel15);
this.panel13.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel13.Location = new System.Drawing.Point(0, 0);
- this.panel13.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(1167, 1091);
+ this.panel13.Size = new System.Drawing.Size(807, 815);
this.panel13.TabIndex = 6;
//
// panel15
@@ -2007,9 +1963,8 @@
this.panel15.Controls.Add(this.panelPacsImg);
this.panel15.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel15.Location = new System.Drawing.Point(0, 0);
- this.panel15.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(1167, 1091);
+ this.panel15.Size = new System.Drawing.Size(807, 815);
this.panel15.TabIndex = 4;
//
// panelPacsImg
@@ -2018,9 +1973,8 @@
this.panelPacsImg.Controls.Add(this.flowLayoutPanelPacsImg);
this.panelPacsImg.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelPacsImg.Location = new System.Drawing.Point(0, 0);
- this.panelPacsImg.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelPacsImg.Name = "panelPacsImg";
- this.panelPacsImg.Size = new System.Drawing.Size(1167, 1091);
+ this.panelPacsImg.Size = new System.Drawing.Size(807, 815);
this.panelPacsImg.TabIndex = 5;
//
// flowLayoutPanelPacsImg
@@ -2030,7 +1984,7 @@
this.flowLayoutPanelPacsImg.Location = new System.Drawing.Point(0, 0);
this.flowLayoutPanelPacsImg.Margin = new System.Windows.Forms.Padding(0);
this.flowLayoutPanelPacsImg.Name = "flowLayoutPanelPacsImg";
- this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(1167, 1091);
+ this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(807, 815);
this.flowLayoutPanelPacsImg.TabIndex = 0;
//
// panelPacsRptList
@@ -2038,20 +1992,17 @@
this.panelPacsRptList.Controls.Add(this.DgcRptPacs);
this.panelPacsRptList.Dock = System.Windows.Forms.DockStyle.Left;
this.panelPacsRptList.Location = new System.Drawing.Point(0, 0);
- this.panelPacsRptList.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelPacsRptList.Name = "panelPacsRptList";
- this.panelPacsRptList.Size = new System.Drawing.Size(520, 1115);
+ this.panelPacsRptList.Size = new System.Drawing.Size(260, 821);
this.panelPacsRptList.TabIndex = 0;
//
// DgcRptPacs
//
this.DgcRptPacs.Dock = System.Windows.Forms.DockStyle.Fill;
- this.DgcRptPacs.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcRptPacs.Location = new System.Drawing.Point(0, 0);
this.DgcRptPacs.MainView = this.DgvRptPacs;
- this.DgcRptPacs.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcRptPacs.Name = "DgcRptPacs";
- this.DgcRptPacs.Size = new System.Drawing.Size(520, 1115);
+ this.DgcRptPacs.Size = new System.Drawing.Size(260, 821);
this.DgcRptPacs.TabIndex = 1;
this.DgcRptPacs.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvRptPacs});
@@ -2116,9 +2067,9 @@
//
this.tabPageReport.Controls.Add(this.panelReportBase);
this.tabPageReport.Image = global::PEIS.Properties.Resources.menu;
- this.tabPageReport.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tabPageReport.Margin = new System.Windows.Forms.Padding(2);
this.tabPageReport.Name = "tabPageReport";
- this.tabPageReport.Size = new System.Drawing.Size(1768, 1115);
+ this.tabPageReport.Size = new System.Drawing.Size(1111, 821);
this.tabPageReport.Text = "其他报告";
//
// panelReportBase
@@ -2127,9 +2078,8 @@
this.panelReportBase.Controls.Add(this.DgcRptExt);
this.panelReportBase.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelReportBase.Location = new System.Drawing.Point(0, 0);
- this.panelReportBase.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelReportBase.Name = "panelReportBase";
- this.panelReportBase.Size = new System.Drawing.Size(1768, 1115);
+ this.panelReportBase.Size = new System.Drawing.Size(1111, 821);
this.panelReportBase.TabIndex = 0;
//
// panelReport
@@ -2138,18 +2088,16 @@
this.panelReport.BackColor = System.Drawing.Color.WhiteSmoke;
this.panelReport.Controls.Add(this.PictureBoxReportExt);
this.panelReport.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panelReport.Location = new System.Drawing.Point(520, 0);
- this.panelReport.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panelReport.Location = new System.Drawing.Point(260, 0);
this.panelReport.Name = "panelReport";
- this.panelReport.Size = new System.Drawing.Size(1248, 1115);
+ this.panelReport.Size = new System.Drawing.Size(851, 821);
this.panelReport.TabIndex = 2;
//
// PictureBoxReportExt
//
this.PictureBoxReportExt.BackColor = System.Drawing.Color.White;
this.PictureBoxReportExt.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- this.PictureBoxReportExt.Location = new System.Drawing.Point(16, 15);
- this.PictureBoxReportExt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.PictureBoxReportExt.Location = new System.Drawing.Point(8, 8);
this.PictureBoxReportExt.Name = "PictureBoxReportExt";
this.PictureBoxReportExt.Size = new System.Drawing.Size(10, 10);
this.PictureBoxReportExt.SizeMode = System.Windows.Forms.PictureBoxSizeMode.AutoSize;
@@ -2159,12 +2107,10 @@
// DgcRptExt
//
this.DgcRptExt.Dock = System.Windows.Forms.DockStyle.Left;
- this.DgcRptExt.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcRptExt.Location = new System.Drawing.Point(0, 0);
this.DgcRptExt.MainView = this.DgvRptExt;
- this.DgcRptExt.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.DgcRptExt.Name = "DgcRptExt";
- this.DgcRptExt.Size = new System.Drawing.Size(520, 1115);
+ this.DgcRptExt.Size = new System.Drawing.Size(260, 821);
this.DgcRptExt.TabIndex = 1;
this.DgcRptExt.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvRptExt});
@@ -2217,9 +2163,9 @@
//
// tabPageHistory
//
- this.tabPageHistory.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tabPageHistory.Margin = new System.Windows.Forms.Padding(2);
this.tabPageHistory.Name = "tabPageHistory";
- this.tabPageHistory.Size = new System.Drawing.Size(1768, 1115);
+ this.tabPageHistory.Size = new System.Drawing.Size(1111, 821);
this.tabPageHistory.Text = "历史结果";
//
// panelPatientInfo
@@ -2227,11 +2173,11 @@
this.panelPatientInfo.BackColor = System.Drawing.Color.White;
this.panelPatientInfo.Controls.Add(this.panel3);
this.panelPatientInfo.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelPatientInfo.Location = new System.Drawing.Point(0, 82);
+ this.panelPatientInfo.Location = new System.Drawing.Point(0, 45);
this.panelPatientInfo.Margin = new System.Windows.Forms.Padding(0);
this.panelPatientInfo.Name = "panelPatientInfo";
- this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(2, 2, 2, 2);
- this.panelPatientInfo.Size = new System.Drawing.Size(2645, 248);
+ this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(1);
+ this.panelPatientInfo.Size = new System.Drawing.Size(1665, 136);
this.panelPatientInfo.TabIndex = 59;
//
// panel3
@@ -2240,24 +2186,23 @@
this.panel3.Controls.Add(this.tableLayoutPanel1);
this.panel3.Controls.Add(this.panel4);
this.panel3.Dock = System.Windows.Forms.DockStyle.Fill;
- this.panel3.Location = new System.Drawing.Point(2, 2);
- this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.panel3.Location = new System.Drawing.Point(1, 1);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(2641, 244);
+ this.panel3.Size = new System.Drawing.Size(1663, 134);
this.panel3.TabIndex = 1;
//
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 10;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 90F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 270F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 136F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 320F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 136F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 320F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 136F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 320F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 136F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 45F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 135F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 160F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 68F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.label9, 0, 1);
@@ -2295,16 +2240,15 @@
this.tableLayoutPanel1.Controls.Add(this.lblCardNo, 9, 0);
this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.tableLayoutPanel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.tableLayoutPanel1.Location = new System.Drawing.Point(250, 0);
- this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(125, 0);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(10, 9, 10, 9);
+ this.tableLayoutPanel1.Padding = new System.Windows.Forms.Padding(5);
this.tableLayoutPanel1.RowCount = 4;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(2391, 244);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1538, 134);
this.tableLayoutPanel1.TabIndex = 69;
//
// label3
@@ -2312,10 +2256,10 @@
this.label3.BackColor = System.Drawing.Color.Transparent;
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label3.Location = new System.Drawing.Point(10, 9);
+ this.label3.Location = new System.Drawing.Point(5, 5);
this.label3.Margin = new System.Windows.Forms.Padding(0);
this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(90, 56);
+ this.label3.Size = new System.Drawing.Size(45, 31);
this.label3.TabIndex = 34;
this.label3.Text = "姓名：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2325,10 +2269,10 @@
this.label9.BackColor = System.Drawing.Color.Transparent;
this.label9.Dock = System.Windows.Forms.DockStyle.Fill;
this.label9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label9.Location = new System.Drawing.Point(10, 65);
+ this.label9.Location = new System.Drawing.Point(5, 36);
this.label9.Margin = new System.Windows.Forms.Padding(0);
this.label9.Name = "label9";
- this.label9.Size = new System.Drawing.Size(90, 56);
+ this.label9.Size = new System.Drawing.Size(45, 31);
this.label9.TabIndex = 42;
this.label9.Text = "性别：";
this.label9.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2339,10 +2283,10 @@
this.lblGroupName.BackColor = System.Drawing.Color.Transparent;
this.lblGroupName.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblGroupName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblGroupName.Location = new System.Drawing.Point(1418, 177);
+ this.lblGroupName.Location = new System.Drawing.Point(709, 98);
this.lblGroupName.Margin = new System.Windows.Forms.Padding(0);
this.lblGroupName.Name = "lblGroupName";
- this.lblGroupName.Size = new System.Drawing.Size(320, 58);
+ this.lblGroupName.Size = new System.Drawing.Size(160, 31);
this.lblGroupName.TabIndex = 65;
this.lblGroupName.Text = " ";
this.lblGroupName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2353,10 +2297,10 @@
this.lblOrgName.BackColor = System.Drawing.Color.Transparent;
this.lblOrgName.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblOrgName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblOrgName.Location = new System.Drawing.Point(1418, 121);
+ this.lblOrgName.Location = new System.Drawing.Point(709, 67);
this.lblOrgName.Margin = new System.Windows.Forms.Padding(0);
this.lblOrgName.Name = "lblOrgName";
- this.lblOrgName.Size = new System.Drawing.Size(320, 56);
+ this.lblOrgName.Size = new System.Drawing.Size(160, 31);
this.lblOrgName.TabIndex = 57;
this.lblOrgName.Text = " ";
this.lblOrgName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2367,10 +2311,10 @@
this.lblAddress.BackColor = System.Drawing.Color.Transparent;
this.lblAddress.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblAddress.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblAddress.Location = new System.Drawing.Point(1418, 9);
+ this.lblAddress.Location = new System.Drawing.Point(709, 5);
this.lblAddress.Margin = new System.Windows.Forms.Padding(0);
this.lblAddress.Name = "lblAddress";
- this.lblAddress.Size = new System.Drawing.Size(320, 56);
+ this.lblAddress.Size = new System.Drawing.Size(160, 31);
this.lblAddress.TabIndex = 41;
this.lblAddress.Text = " ";
this.lblAddress.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2380,10 +2324,10 @@
this.label7.BackColor = System.Drawing.Color.Transparent;
this.label7.Dock = System.Windows.Forms.DockStyle.Fill;
this.label7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label7.Location = new System.Drawing.Point(1282, 9);
+ this.label7.Location = new System.Drawing.Point(641, 5);
this.label7.Margin = new System.Windows.Forms.Padding(0);
this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(136, 56);
+ this.label7.Size = new System.Drawing.Size(68, 31);
this.label7.TabIndex = 40;
this.label7.Text = "联系地址：";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2393,10 +2337,10 @@
this.label15.BackColor = System.Drawing.Color.Transparent;
this.label15.Dock = System.Windows.Forms.DockStyle.Fill;
this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label15.Location = new System.Drawing.Point(1282, 65);
+ this.label15.Location = new System.Drawing.Point(641, 36);
this.label15.Margin = new System.Windows.Forms.Padding(0);
this.label15.Name = "label15";
- this.label15.Size = new System.Drawing.Size(136, 56);
+ this.label15.Size = new System.Drawing.Size(68, 31);
this.label15.TabIndex = 48;
this.label15.Text = "团体号：";
this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2406,10 +2350,10 @@
this.label23.BackColor = System.Drawing.Color.Transparent;
this.label23.Dock = System.Windows.Forms.DockStyle.Fill;
this.label23.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label23.Location = new System.Drawing.Point(1282, 121);
+ this.label23.Location = new System.Drawing.Point(641, 67);
this.label23.Margin = new System.Windows.Forms.Padding(0);
this.label23.Name = "label23";
- this.label23.Size = new System.Drawing.Size(136, 56);
+ this.label23.Size = new System.Drawing.Size(68, 31);
this.label23.TabIndex = 56;
this.label23.Text = "团体名称：";
this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2419,10 +2363,10 @@
this.label31.BackColor = System.Drawing.Color.Transparent;
this.label31.Dock = System.Windows.Forms.DockStyle.Fill;
this.label31.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label31.Location = new System.Drawing.Point(1282, 177);
+ this.label31.Location = new System.Drawing.Point(641, 98);
this.label31.Margin = new System.Windows.Forms.Padding(0);
this.label31.Name = "label31";
- this.label31.Size = new System.Drawing.Size(136, 58);
+ this.label31.Size = new System.Drawing.Size(68, 31);
this.label31.TabIndex = 64;
this.label31.Text = "分组名称：";
this.label31.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2433,10 +2377,10 @@
this.lblOccupation.BackColor = System.Drawing.Color.Transparent;
this.lblOccupation.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblOccupation.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblOccupation.Location = new System.Drawing.Point(962, 9);
+ this.lblOccupation.Location = new System.Drawing.Point(481, 5);
this.lblOccupation.Margin = new System.Windows.Forms.Padding(0);
this.lblOccupation.Name = "lblOccupation";
- this.lblOccupation.Size = new System.Drawing.Size(320, 56);
+ this.lblOccupation.Size = new System.Drawing.Size(160, 31);
this.lblOccupation.TabIndex = 39;
this.lblOccupation.Text = " ";
this.lblOccupation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2446,10 +2390,10 @@
this.label5.BackColor = System.Drawing.Color.Transparent;
this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label5.Location = new System.Drawing.Point(826, 9);
+ this.label5.Location = new System.Drawing.Point(413, 5);
this.label5.Margin = new System.Windows.Forms.Padding(0);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(136, 56);
+ this.label5.Size = new System.Drawing.Size(68, 31);
this.label5.TabIndex = 38;
this.label5.Text = "职业：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2460,10 +2404,10 @@
this.lblMarriage.BackColor = System.Drawing.Color.Transparent;
this.lblMarriage.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblMarriage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblMarriage.Location = new System.Drawing.Point(962, 65);
+ this.lblMarriage.Location = new System.Drawing.Point(481, 36);
this.lblMarriage.Margin = new System.Windows.Forms.Padding(0);
this.lblMarriage.Name = "lblMarriage";
- this.lblMarriage.Size = new System.Drawing.Size(320, 56);
+ this.lblMarriage.Size = new System.Drawing.Size(160, 31);
this.lblMarriage.TabIndex = 47;
this.lblMarriage.Text = " ";
this.lblMarriage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2473,10 +2417,10 @@
this.label10.BackColor = System.Drawing.Color.Transparent;
this.label10.Dock = System.Windows.Forms.DockStyle.Fill;
this.label10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label10.Location = new System.Drawing.Point(370, 9);
+ this.label10.Location = new System.Drawing.Point(185, 5);
this.label10.Margin = new System.Windows.Forms.Padding(0);
this.label10.Name = "label10";
- this.label10.Size = new System.Drawing.Size(136, 56);
+ this.label10.Size = new System.Drawing.Size(68, 31);
this.label10.TabIndex = 36;
this.label10.Text = "体检号：";
this.label10.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2487,10 +2431,10 @@
this.lblEid.BackColor = System.Drawing.Color.Transparent;
this.lblEid.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblEid.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblEid.Location = new System.Drawing.Point(506, 9);
+ this.lblEid.Location = new System.Drawing.Point(253, 5);
this.lblEid.Margin = new System.Windows.Forms.Padding(0);
this.lblEid.Name = "lblEid";
- this.lblEid.Size = new System.Drawing.Size(320, 56);
+ this.lblEid.Size = new System.Drawing.Size(160, 31);
this.lblEid.TabIndex = 37;
this.lblEid.Text = " ";
this.lblEid.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2500,10 +2444,10 @@
this.label13.BackColor = System.Drawing.Color.Transparent;
this.label13.Dock = System.Windows.Forms.DockStyle.Fill;
this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label13.Location = new System.Drawing.Point(826, 65);
+ this.label13.Location = new System.Drawing.Point(413, 36);
this.label13.Margin = new System.Windows.Forms.Padding(0);
this.label13.Name = "label13";
- this.label13.Size = new System.Drawing.Size(136, 56);
+ this.label13.Size = new System.Drawing.Size(68, 31);
this.label13.TabIndex = 46;
this.label13.Text = "婚姻状况：";
this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2514,10 +2458,10 @@
this.lblTel.BackColor = System.Drawing.Color.Transparent;
this.lblTel.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblTel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblTel.Location = new System.Drawing.Point(962, 177);
+ this.lblTel.Location = new System.Drawing.Point(481, 98);
this.lblTel.Margin = new System.Windows.Forms.Padding(0);
this.lblTel.Name = "lblTel";
- this.lblTel.Size = new System.Drawing.Size(320, 58);
+ this.lblTel.Size = new System.Drawing.Size(160, 31);
this.lblTel.TabIndex = 63;
this.lblTel.Text = " ";
this.lblTel.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2528,10 +2472,10 @@
this.lblName.BackColor = System.Drawing.Color.Transparent;
this.lblName.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblName.Location = new System.Drawing.Point(100, 9);
+ this.lblName.Location = new System.Drawing.Point(50, 5);
this.lblName.Margin = new System.Windows.Forms.Padding(0);
this.lblName.Name = "lblName";
- this.lblName.Size = new System.Drawing.Size(270, 56);
+ this.lblName.Size = new System.Drawing.Size(135, 31);
this.lblName.TabIndex = 35;
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
@@ -2540,10 +2484,10 @@
this.label16.BackColor = System.Drawing.Color.Transparent;
this.label16.Dock = System.Windows.Forms.DockStyle.Fill;
this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label16.Location = new System.Drawing.Point(10, 121);
+ this.label16.Location = new System.Drawing.Point(5, 67);
this.label16.Margin = new System.Windows.Forms.Padding(0);
this.label16.Name = "label16";
- this.label16.Size = new System.Drawing.Size(90, 56);
+ this.label16.Size = new System.Drawing.Size(45, 31);
this.label16.TabIndex = 50;
this.label16.Text = "年龄：";
this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2553,10 +2497,10 @@
this.label21.BackColor = System.Drawing.Color.Transparent;
this.label21.Dock = System.Windows.Forms.DockStyle.Fill;
this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label21.Location = new System.Drawing.Point(826, 121);
+ this.label21.Location = new System.Drawing.Point(413, 67);
this.label21.Margin = new System.Windows.Forms.Padding(0);
this.label21.Name = "label21";
- this.label21.Size = new System.Drawing.Size(136, 56);
+ this.label21.Size = new System.Drawing.Size(68, 31);
this.label21.TabIndex = 54;
this.label21.Text = "教育程度：";
this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2567,10 +2511,10 @@
this.lblType.BackColor = System.Drawing.Color.Transparent;
this.lblType.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblType.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblType.Location = new System.Drawing.Point(506, 65);
+ this.lblType.Location = new System.Drawing.Point(253, 36);
this.lblType.Margin = new System.Windows.Forms.Padding(0);
this.lblType.Name = "lblType";
- this.lblType.Size = new System.Drawing.Size(320, 56);
+ this.lblType.Size = new System.Drawing.Size(160, 31);
this.lblType.TabIndex = 45;
this.lblType.Text = " ";
this.lblType.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2580,10 +2524,10 @@
this.label25.BackColor = System.Drawing.Color.Transparent;
this.label25.Dock = System.Windows.Forms.DockStyle.Fill;
this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label25.Location = new System.Drawing.Point(10, 177);
+ this.label25.Location = new System.Drawing.Point(5, 98);
this.label25.Margin = new System.Windows.Forms.Padding(0);
this.label25.Name = "label25";
- this.label25.Size = new System.Drawing.Size(90, 58);
+ this.label25.Size = new System.Drawing.Size(45, 31);
this.label25.TabIndex = 58;
this.label25.Text = "民族：";
this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2593,10 +2537,10 @@
this.label29.BackColor = System.Drawing.Color.Transparent;
this.label29.Dock = System.Windows.Forms.DockStyle.Fill;
this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label29.Location = new System.Drawing.Point(826, 177);
+ this.label29.Location = new System.Drawing.Point(413, 98);
this.label29.Margin = new System.Windows.Forms.Padding(0);
this.label29.Name = "label29";
- this.label29.Size = new System.Drawing.Size(136, 58);
+ this.label29.Size = new System.Drawing.Size(68, 31);
this.label29.TabIndex = 62;
this.label29.Text = "联系电话：";
this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2607,10 +2551,10 @@
this.lblSex.BackColor = System.Drawing.Color.Transparent;
this.lblSex.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblSex.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblSex.Location = new System.Drawing.Point(100, 65);
+ this.lblSex.Location = new System.Drawing.Point(50, 36);
this.lblSex.Margin = new System.Windows.Forms.Padding(0);
this.lblSex.Name = "lblSex";
- this.lblSex.Size = new System.Drawing.Size(270, 56);
+ this.lblSex.Size = new System.Drawing.Size(135, 31);
this.lblSex.TabIndex = 43;
this.lblSex.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
@@ -2619,10 +2563,10 @@
this.label22.BackColor = System.Drawing.Color.Transparent;
this.label22.Dock = System.Windows.Forms.DockStyle.Fill;
this.label22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label22.Location = new System.Drawing.Point(370, 65);
+ this.label22.Location = new System.Drawing.Point(185, 36);
this.label22.Margin = new System.Windows.Forms.Padding(0);
this.label22.Name = "label22";
- this.label22.Size = new System.Drawing.Size(136, 56);
+ this.label22.Size = new System.Drawing.Size(68, 31);
this.label22.TabIndex = 44;
this.label22.Text = "体检类别：";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2633,10 +2577,10 @@
this.lblAge.BackColor = System.Drawing.Color.Transparent;
this.lblAge.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblAge.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblAge.Location = new System.Drawing.Point(100, 121);
+ this.lblAge.Location = new System.Drawing.Point(50, 67);
this.lblAge.Margin = new System.Windows.Forms.Padding(0);
this.lblAge.Name = "lblAge";
- this.lblAge.Size = new System.Drawing.Size(270, 56);
+ this.lblAge.Size = new System.Drawing.Size(135, 31);
this.lblAge.TabIndex = 51;
this.lblAge.Text = " ";
this.lblAge.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2647,10 +2591,10 @@
this.lblNation.BackColor = System.Drawing.Color.Transparent;
this.lblNation.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblNation.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblNation.Location = new System.Drawing.Point(100, 177);
+ this.lblNation.Location = new System.Drawing.Point(50, 98);
this.lblNation.Margin = new System.Windows.Forms.Padding(0);
this.lblNation.Name = "lblNation";
- this.lblNation.Size = new System.Drawing.Size(270, 58);
+ this.lblNation.Size = new System.Drawing.Size(135, 31);
this.lblNation.TabIndex = 59;
this.lblNation.Text = " ";
this.lblNation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2660,10 +2604,10 @@
this.label28.BackColor = System.Drawing.Color.Transparent;
this.label28.Dock = System.Windows.Forms.DockStyle.Fill;
this.label28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label28.Location = new System.Drawing.Point(370, 121);
+ this.label28.Location = new System.Drawing.Point(185, 67);
this.label28.Margin = new System.Windows.Forms.Padding(0);
this.label28.Name = "label28";
- this.label28.Size = new System.Drawing.Size(136, 56);
+ this.label28.Size = new System.Drawing.Size(68, 31);
this.label28.TabIndex = 52;
this.label28.Text = "体检日期：";
this.label28.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2673,10 +2617,10 @@
this.label33.BackColor = System.Drawing.Color.Transparent;
this.label33.Dock = System.Windows.Forms.DockStyle.Fill;
this.label33.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.label33.Location = new System.Drawing.Point(370, 177);
+ this.label33.Location = new System.Drawing.Point(185, 98);
this.label33.Margin = new System.Windows.Forms.Padding(0);
this.label33.Name = "label33";
- this.label33.Size = new System.Drawing.Size(136, 58);
+ this.label33.Size = new System.Drawing.Size(68, 31);
this.label33.TabIndex = 60;
this.label33.Text = "签到时间：";
this.label33.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2687,10 +2631,10 @@
this.lblSignTime.BackColor = System.Drawing.Color.Transparent;
this.lblSignTime.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblSignTime.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblSignTime.Location = new System.Drawing.Point(506, 177);
+ this.lblSignTime.Location = new System.Drawing.Point(253, 98);
this.lblSignTime.Margin = new System.Windows.Forms.Padding(0);
this.lblSignTime.Name = "lblSignTime";
- this.lblSignTime.Size = new System.Drawing.Size(320, 58);
+ this.lblSignTime.Size = new System.Drawing.Size(160, 31);
this.lblSignTime.TabIndex = 61;
this.lblSignTime.Text = " ";
this.lblSignTime.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2701,10 +2645,10 @@
this.lblExamDate.BackColor = System.Drawing.Color.Transparent;
this.lblExamDate.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblExamDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblExamDate.Location = new System.Drawing.Point(506, 121);
+ this.lblExamDate.Location = new System.Drawing.Point(253, 67);
this.lblExamDate.Margin = new System.Windows.Forms.Padding(0);
this.lblExamDate.Name = "lblExamDate";
- this.lblExamDate.Size = new System.Drawing.Size(320, 56);
+ this.lblExamDate.Size = new System.Drawing.Size(160, 31);
this.lblExamDate.TabIndex = 53;
this.lblExamDate.Text = " ";
this.lblExamDate.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2715,10 +2659,10 @@
this.lblEducation.BackColor = System.Drawing.Color.Transparent;
this.lblEducation.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblEducation.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblEducation.Location = new System.Drawing.Point(962, 121);
+ this.lblEducation.Location = new System.Drawing.Point(481, 67);
this.lblEducation.Margin = new System.Windows.Forms.Padding(0);
this.lblEducation.Name = "lblEducation";
- this.lblEducation.Size = new System.Drawing.Size(320, 56);
+ this.lblEducation.Size = new System.Drawing.Size(160, 31);
this.lblEducation.TabIndex = 55;
this.lblEducation.Text = " ";
this.lblEducation.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2729,10 +2673,10 @@
this.lblOeid.BackColor = System.Drawing.Color.Transparent;
this.lblOeid.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblOeid.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.lblOeid.Location = new System.Drawing.Point(1418, 65);
+ this.lblOeid.Location = new System.Drawing.Point(709, 36);
this.lblOeid.Margin = new System.Windows.Forms.Padding(0);
this.lblOeid.Name = "lblOeid";
- this.lblOeid.Size = new System.Drawing.Size(320, 56);
+ this.lblOeid.Size = new System.Drawing.Size(160, 31);
this.lblOeid.TabIndex = 49;
this.lblOeid.Text = " ";
this.lblOeid.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2740,10 +2684,9 @@
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.label1.Location = new System.Drawing.Point(1744, 9);
- this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.label1.Location = new System.Drawing.Point(872, 5);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(124, 56);
+ this.label1.Size = new System.Drawing.Size(62, 31);
this.label1.TabIndex = 66;
this.label1.Text = "证件号:";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -2751,10 +2694,9 @@
// lblCardNo
//
this.lblCardNo.Dock = System.Windows.Forms.DockStyle.Fill;
- this.lblCardNo.Location = new System.Drawing.Point(1880, 9);
- this.lblCardNo.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+ this.lblCardNo.Location = new System.Drawing.Point(940, 5);
this.lblCardNo.Name = "lblCardNo";
- this.lblCardNo.Size = new System.Drawing.Size(495, 56);
+ this.lblCardNo.Size = new System.Drawing.Size(590, 31);
this.lblCardNo.TabIndex = 67;
this.lblCardNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
@@ -2766,18 +2708,18 @@
this.panel4.Location = new System.Drawing.Point(0, 0);
this.panel4.Margin = new System.Windows.Forms.Padding(0);
this.panel4.Name = "panel4";
- this.panel4.Padding = new System.Windows.Forms.Padding(10, 9, 10, 9);
- this.panel4.Size = new System.Drawing.Size(250, 244);
+ this.panel4.Padding = new System.Windows.Forms.Padding(5);
+ this.panel4.Size = new System.Drawing.Size(125, 134);
this.panel4.TabIndex = 68;
//
// picWeChat
//
this.picWeChat.BackColor = System.Drawing.Color.WhiteSmoke;
this.picWeChat.Image = global::PEIS.Properties.Resources.wechatlogo;
- this.picWeChat.Location = new System.Drawing.Point(168, 166);
+ this.picWeChat.Location = new System.Drawing.Point(84, 91);
this.picWeChat.Margin = new System.Windows.Forms.Padding(0);
this.picWeChat.Name = "picWeChat";
- this.picWeChat.Size = new System.Drawing.Size(70, 64);
+ this.picWeChat.Size = new System.Drawing.Size(35, 35);
this.picWeChat.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picWeChat.TabIndex = 35;
this.picWeChat.TabStop = false;
@@ -2788,10 +2730,10 @@
this.picAvatar.BackColor = System.Drawing.Color.WhiteSmoke;
this.picAvatar.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.picAvatar.Dock = System.Windows.Forms.DockStyle.Fill;
- this.picAvatar.Location = new System.Drawing.Point(10, 9);
+ this.picAvatar.Location = new System.Drawing.Point(5, 5);
this.picAvatar.Margin = new System.Windows.Forms.Padding(0);
this.picAvatar.Name = "picAvatar";
- this.picAvatar.Size = new System.Drawing.Size(230, 226);
+ this.picAvatar.Size = new System.Drawing.Size(115, 124);
this.picAvatar.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.picAvatar.TabIndex = 34;
this.picAvatar.TabStop = false;
@@ -2801,9 +2743,8 @@
this.panelMenu.Controls.Add(this.menuStrip);
this.panelMenu.Dock = System.Windows.Forms.DockStyle.Top;
this.panelMenu.Location = new System.Drawing.Point(0, 0);
- this.panelMenu.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5);
this.panelMenu.Name = "panelMenu";
- this.panelMenu.Size = new System.Drawing.Size(2645, 82);
+ this.panelMenu.Size = new System.Drawing.Size(1665, 45);
this.panelMenu.TabIndex = 58;
//
// menuStrip
@@ -2823,9 +2764,9 @@
this.toolStripTxtStatus});
this.menuStrip.Location = new System.Drawing.Point(0, 0);
this.menuStrip.Name = "menuStrip";
- this.menuStrip.Padding = new System.Windows.Forms.Padding(4, 0, 10, 0);
+ this.menuStrip.Padding = new System.Windows.Forms.Padding(2, 0, 5, 0);
this.menuStrip.RightToLeft = System.Windows.Forms.RightToLeft.No;
- this.menuStrip.Size = new System.Drawing.Size(2645, 82);
+ this.menuStrip.Size = new System.Drawing.Size(1665, 45);
this.menuStrip.TabIndex = 58;
this.menuStrip.Text = "menuStrip2";
//
@@ -2835,7 +2776,7 @@
this.TsmiWeChatViewReport.ForeColor = System.Drawing.Color.Red;
this.TsmiWeChatViewReport.Image = global::PEIS.Properties.Resources.WeChat;
this.TsmiWeChatViewReport.Name = "TsmiWeChatViewReport";
- this.TsmiWeChatViewReport.Size = new System.Drawing.Size(303, 82);
+ this.TsmiWeChatViewReport.Size = new System.Drawing.Size(171, 45);
this.TsmiWeChatViewReport.Text = "已禁止微信查看报告";
//
// TsmiAbandoned
@@ -2843,7 +2784,7 @@
this.TsmiAbandoned.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.TsmiAbandoned.Image = ((System.Drawing.Image)(resources.GetObject("TsmiAbandoned.Image")));
this.TsmiAbandoned.Name = "TsmiAbandoned";
- this.TsmiAbandoned.Size = new System.Drawing.Size(163, 82);
+ this.TsmiAbandoned.Size = new System.Drawing.Size(101, 45);
this.TsmiAbandoned.Text = "预览报告";
//
// TsmiFinishCancel
@@ -2851,7 +2792,7 @@
this.TsmiFinishCancel.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.TsmiFinishCancel.Image = ((System.Drawing.Image)(resources.GetObject("TsmiFinishCancel.Image")));
this.TsmiFinishCancel.Name = "TsmiFinishCancel";
- this.TsmiFinishCancel.Size = new System.Drawing.Size(163, 82);
+ this.TsmiFinishCancel.Size = new System.Drawing.Size(101, 45);
this.TsmiFinishCancel.Text = "取消完结";
//
// TsmiFinish
@@ -2859,13 +2800,13 @@
this.TsmiFinish.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.TsmiFinish.Image = ((System.Drawing.Image)(resources.GetObject("TsmiFinish.Image")));
this.TsmiFinish.Name = "TsmiFinish";
- this.TsmiFinish.Size = new System.Drawing.Size(107, 82);
+ this.TsmiFinish.Size = new System.Drawing.Size(73, 45);
this.TsmiFinish.Text = "完结";
//
// ToolStripMenuItemStatusTxt
//
this.ToolStripMenuItemStatusTxt.Name = "ToolStripMenuItemStatusTxt";
- this.ToolStripMenuItemStatusTxt.Size = new System.Drawing.Size(167, 82);
+ this.ToolStripMenuItemStatusTxt.Size = new System.Drawing.Size(91, 45);
this.ToolStripMenuItemStatusTxt.Text = "体检状态：";
this.ToolStripMenuItemStatusTxt.Visible = false;
//
@@ -2875,7 +2816,7 @@
this.toolStripTxtStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F);
this.toolStripTxtStatus.Name = "toolStripTxtStatus";
this.toolStripTxtStatus.ReadOnly = true;
- this.toolStripTxtStatus.Size = new System.Drawing.Size(356, 82);
+ this.toolStripTxtStatus.Size = new System.Drawing.Size(180, 45);
this.toolStripTxtStatus.TextBoxTextAlign = System.Windows.Forms.HorizontalAlignment.Center;
this.toolStripTxtStatus.Visible = false;
//
@@ -2909,11 +2850,11 @@
//
// TotalForm
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(2888, 1504);
+ this.ClientSize = new System.Drawing.Size(1904, 1041);
this.Controls.Add(this.splitContainerBase);
- this.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
+ this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Name = "TotalForm";
this.Text = "总检";
this.splitContainerBase.Panel1.ResumeLayout(false);
diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs
index d09cfb9..9924384 100644
--- a/PEIS/View/Exam/TotalForm.cs
+++ b/PEIS/View/Exam/TotalForm.cs
@@ -1,9 +1,12 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics;
using System.Drawing;
using System.Globalization;
using System.IO;
using System.Linq;
+using System.Reflection;
+using System.Threading.Tasks;
using System.Windows.Forms;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid.Views.Base;
@@ -87,10 +90,19 @@ namespace PEIS.View.Exam
RbStatus2.Click += RadioButton_Click;
// 输入体检号回车
//txtId.KeyDown += TxtId_KeyDown;
- OpsConclusion.TsmiRefresh.Visible = false;
- OpsConclusion.TsmiAdd.Visible = false;
- //结论-添加
- //OpsConclusion.TsmiAdd.Click += ConclusionAdd_Click;
+ OpsConclusion.TsmiRefresh.Text = "上移";
+ OpsConclusion.TsmiRefresh.Image = Properties.Resources.shang;
+ OpsConclusion.TsmiAdd.Text = "下移";
+ OpsConclusion.TsmiAdd.Image = Properties.Resources.xia;
+ //结论-排序
+ OpsConclusion.TsmiRefresh.Click += (s, e) =>
+ {
+ ConclusionSort(-1);
+ };
+ OpsConclusion.TsmiAdd.Click += (s, e) =>
+ {
+ ConclusionSort(1);
+ };
//结论-删除
OpsConclusion.TsmiDelete.Click += ConclusionDelete_Click;
//结论-保存
@@ -212,22 +224,59 @@ namespace PEIS.View.Exam
{
SearchAllConclusion();
};
- DgvExamConclusion.OptionsCustomization.AllowSort = true;
+ DgvExamConclusion.OptionsCustomization.AllowSort = true;
//DgcAllConclusion.DataSource = Global._lstConclusion;
// DgvAllConclusion.OptionsFind.AlwaysVisible = true;
// DgvAllConclusion.OptionsFind.ShowClearButton = false;
// DgvAllConclusion.OptionsFind.ShowCloseButton = false;
DgvAllConclusion.DoubleClick += DgvAllConclusion_DoubleClick;
DgvExamResultData.CustomDrawCell += DgvExamResultData_CustomDrawCell;
+
+ // 启用行选择
+ DgvExamConclusion.OptionsSelection.EnableAppearanceFocusedCell = false;
+ DgvExamConclusion.OptionsSelection.MultiSelect = false; // 限制单选
+ // 启用编辑功能，以便显示勾选框
+ DgvExamConclusion.OptionsBehavior.Editable = true;
+ // 设置行头自动调整高度以显示勾选框
+ DgvExamConclusion.OptionsView.RowAutoHeight = true;
}
+ private void ConclusionSort(int i)
+ {
+ if (DgvExamConclusion.GetFocusedRow() is ExamConclusion selected)
+ {
+ var current = _examConclusion.IndexOf(selected);
+ if ((current == 0 && i < 0) || (current == _examConclusion.Count - 1 && i > 0))
+ {
+ return;
+ }
+
+ var temp = _examConclusion[current + i];
+ var tempSeq = _examConclusion[current + i].Seq;
+ temp.Seq = selected.Seq;
+ selected.Seq = tempSeq;
+ _examConclusion[current + i] = selected;
+ _examConclusion[current] = temp;
+ _examConclusion = _examConclusion.OrderBy(o => o.Seq).ToList();
+ // for (int j = 0; j < _examConclusion.Count; j++)
+ // {
+ // _examConclusion[j].Seq = j + 1;
+ // }
+ Invoke(new Action(() => DgcExamConclusion.DataSource = null));
+ Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
+ Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
+ Invoke(new Action(() => DgvExamConclusion.FocusedRowHandle = current+i));
+ Invoke(new Action(() => DgvExamConclusion.SelectRow(current + i)));
+
+ }
+ }
private void SearchAllConclusion()
{
var query = txtConclusionSerch.Text;
var isId = long.TryParse(query, out var id);
- var list=string.IsNullOrEmpty(query)
- ? Global._lstConclusion
- : Global._lstConclusion.Where(p => p.SpellCode.Contains(query) || p.ConclusionName.Contains(query) || (isId && p.ID == id)).ToList();
+ var list = string.IsNullOrEmpty(query)
+ ? Global._lstConclusion
+ : Global._lstConclusion.Where(p => p.SpellCode.Contains(query) || p.ConclusionName.Contains(query) || (isId && p.ID == id)).ToList();
Invoke(new Action(() => DgcAllConclusion.DataSource = null));
Invoke(new Action(() => DgcAllConclusion.DataSource = list));
@@ -337,12 +386,12 @@ namespace PEIS.View.Exam
if (rowData != null)
{
- var conclusion = DgvExamConclusion.GetFocusedRow() as ExamConclusion;
- if (rowData == null || conclusion == null) return;
- var index = _examConclusion.IndexOf(conclusion);
- _examConclusion[index].Conclusion = rowData.ConclusionName;
- _examConclusion[index].Suggestion = rowData.Suggestion;
- ShowExamConclusion(_examConclusion);
+ var conclusion = DgvExamConclusion.GetFocusedRow() as ExamConclusion;
+ if (rowData == null || conclusion == null) return;
+ var index = _examConclusion.IndexOf(conclusion);
+ _examConclusion[index].Conclusion = rowData.ConclusionName;
+ _examConclusion[index].Suggestion = rowData.Suggestion;
+ ShowExamConclusion(_examConclusion);
}
}
}
@@ -472,9 +521,9 @@ namespace PEIS.View.Exam
///
/// 3. 获取科室小结
///
- public event EventHandler> GetSummary;
+ public event EventHandler> GetSummary;
+
-
public void ShowSummary(List items)
{
Invoke(new Action(() => _examPart = items));
@@ -504,6 +553,11 @@ namespace PEIS.View.Exam
public void ShowExamConclusion(List items)
{
+ items = items.OrderBy(o => o.Seq).ToList();
+ for (int j = 0; j < items.Count; j++)
+ {
+ items[j].Seq = j + 1;
+ }
Invoke(new Action(() => DgcExamConclusion.DataSource = null));
Invoke(new Action(() => _examConclusion = items));
Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion));
@@ -537,8 +591,8 @@ namespace PEIS.View.Exam
{
GetPatient?.Invoke(this, new Args
- iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAlJJREFUWEfV
- lrFP20AUxpNCiIoEAuEwVEBM24WhCimIZKjoWrNARQQjf0K7tWuBuaqABXVpJ5hYSar+A8xBXRmRGFqE
- QGoloLx3/i44vjv7HFOp/KQ3vO/ufe9y8Z2dudeUvG9vOMpz3yuQ/h09vY8eztQO/1rGNsrS0+c8zwfN
- q8s/9jCk8GR6/dlMrXkZmH+Aoc4gg6Y0KxS9HGQraCF1WZvLD2Qh2yOLK7XDNUgdIX2Q2tFRUQTkdcV+
- 3T0DeUhmaOvEtiPV4i+weYzUCr8m5kfJB462fRWSgpWRgdjauAmt8WzXA0iJcNz5Ia6nI90P6RZ5zgvF
- V9qnvdU8JUafqAZRY0lxxheLxgVUltRL5i6bS9iv5DW+IPXRNZHNKU4pftkGmX+ChRaao/4oRSDkxBRx
- Dqs26Aif8DhSfqvV37YJAaQZUmueVj++M9VSv902PWoBjMkojuHHr0e4bmJ204UkUBZQ9urVuAadLkJX
- R8/IkeJlY64zi2N8em0jXEP5H8WHBX6fIzXC85TiCGgB78Pz4fETqY8vNi+RRgKDC6SR0LzfPB+pIJwL
- qPm2diAl7Enen5FynwNjH0zeR5qObFfW99Nuv/Z+4EHz6ixBg1ZAFlB+FtYUdIW20LkXr1sOpzj/ArKA
- 7oJR1t2pDyuQ9OTyg3LrriDdCXJhSONJXGBg4uXWGLyuIdnBH5ByEY67MAQ5EVQr/nMOSMmRBhwFd3EM
- ciQ0VzzMHLH/uQ38DScNA3Ey6TV2OHC3i+s1EPqjlpbSXONrqFEw2q/X/59M5gZwQwBmYRNKogAAAABJ
- RU5ErkJggg==
+ iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAYBJREFUWEft
+ lM9KwzAcx4sIwjqQTQU91j2DdOyk4lNsB1/AJxBkUpVOJqakhzag+AwevPsSvoMXbx4ERU3mNyWGdDat
+ dJd+4AfJ9/eXNKnT0GBLFLMvYdjWi2y+kAHU5rUPoDevdQC9aa0D6M0FtQ1gai5QdWEkTo46ne4y3P+D
+ 2gBShurTjVD2iLDyqAUh5bLj9zf5CYRqjjASpXcIsUMtAsmKiLKXrAZln5CLUbW5SqlaMmFtfaMLqRLW
+ QxCaXMqEluu2IFdC1iMxe4I0H3UISJWxrjeZRrFMcg0nIX0Ge+PxSwjLmFxF9z/+9BXS36hD6HdC6vNs
+ d+9gH+EzpI5tMfLuRF4xHh9Inx7Dn+SH2Pv+oA2pGKY7oe91XLe9ImOEnZ1PRyfji6FYE5o+IKw4+p2Q
+ a7hzOQ3CRMbyV3BbNM+IOoRNIW+7t1omz4j6OWwKeV7v1yeBXI6y/4lxEB7P8ih7hlQefqGurd404M3f
+ h6PDG2wXg98fbGHZ0AAc5xt8asXwHSUE5wAAAABJRU5ErkJggg==