diff --git a/PEIS/App.config b/PEIS/App.config
index f1bc3d1..8441306 100644
--- a/PEIS/App.config
+++ b/PEIS/App.config
@@ -17,11 +17,11 @@
-
+
-
+
diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs
index a872252..c3ecaca 100644
--- a/PEIS/View/Exam/TotalForm.Designer.cs
+++ b/PEIS/View/Exam/TotalForm.Designer.cs
@@ -71,20 +71,6 @@
this.panelRightBase = new System.Windows.Forms.Panel();
this.panelExamInfoBase = new System.Windows.Forms.Panel();
this.splitContainerExamInfo = new System.Windows.Forms.SplitContainer();
- this.panelTxtSummary = new System.Windows.Forms.Panel();
- this.splitExamPart = new System.Windows.Forms.SplitContainer();
- this.panel5 = new System.Windows.Forms.Panel();
- this.DgcExamResultData = new DevExpress.XtraGrid.GridControl();
- this.DgvExamResultData = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemMemoEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
- this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.txtSummary = new System.Windows.Forms.TextBox();
this.panelExamInfoL = new System.Windows.Forms.Panel();
this.TabPart = new DevExpress.XtraTab.XtraTabControl();
this.tabPageConslusion = new DevExpress.XtraTab.XtraTabPage();
@@ -176,6 +162,20 @@
this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
this.tabPageHistory = new DevExpress.XtraTab.XtraTabPage();
+ this.panelTxtSummary = new System.Windows.Forms.Panel();
+ this.txtSummary = new System.Windows.Forms.TextBox();
+ this.splitExamPart = new System.Windows.Forms.SplitContainer();
+ this.panel5 = new System.Windows.Forms.Panel();
+ this.DgcExamResultData = new DevExpress.XtraGrid.GridControl();
+ this.DgvExamResultData = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemMemoEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panelPatientInfo = new System.Windows.Forms.Panel();
this.panel3 = new System.Windows.Forms.Panel();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
@@ -250,15 +250,6 @@
this.splitContainerExamInfo.Panel1.SuspendLayout();
this.splitContainerExamInfo.Panel2.SuspendLayout();
this.splitContainerExamInfo.SuspendLayout();
- this.panelTxtSummary.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitExamPart)).BeginInit();
- this.splitExamPart.Panel1.SuspendLayout();
- this.splitExamPart.Panel2.SuspendLayout();
- this.splitExamPart.SuspendLayout();
- this.panel5.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.DgcExamResultData)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.DgvExamResultData)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit4)).BeginInit();
this.panelExamInfoL.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.TabPart)).BeginInit();
this.TabPart.SuspendLayout();
@@ -311,6 +302,14 @@
((System.ComponentModel.ISupportInitialize)(this.PictureBoxReportExt)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DgcRptExt)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DgvRptExt)).BeginInit();
+ this.panelTxtSummary.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.splitExamPart)).BeginInit();
+ this.splitExamPart.Panel1.SuspendLayout();
+ this.splitExamPart.SuspendLayout();
+ this.panel5.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.DgcExamResultData)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.DgvExamResultData)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit4)).BeginInit();
this.panelPatientInfo.SuspendLayout();
this.panel3.SuspendLayout();
this.tableLayoutPanel1.SuspendLayout();
@@ -862,237 +861,22 @@
//
// splitContainerExamInfo.Panel1
//
- this.splitContainerExamInfo.Panel1.Controls.Add(this.panelTxtSummary);
+ this.splitContainerExamInfo.Panel1.Controls.Add(this.panelExamInfoL);
//
// splitContainerExamInfo.Panel2
//
- this.splitContainerExamInfo.Panel2.Controls.Add(this.panelExamInfoL);
+ this.splitContainerExamInfo.Panel2.Controls.Add(this.panelTxtSummary);
this.splitContainerExamInfo.Size = new System.Drawing.Size(1665, 860);
- this.splitContainerExamInfo.SplitterDistance = 544;
+ this.splitContainerExamInfo.SplitterDistance = 1300;
this.splitContainerExamInfo.TabIndex = 0;
//
- // panelTxtSummary
- //
- this.panelTxtSummary.BackColor = System.Drawing.Color.White;
- 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.Name = "panelTxtSummary";
- this.panelTxtSummary.Size = new System.Drawing.Size(544, 860);
- this.panelTxtSummary.TabIndex = 2;
- //
- // splitExamPart
- //
- 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.Name = "splitExamPart";
- //
- // splitExamPart.Panel1
- //
- this.splitExamPart.Panel1.Controls.Add(this.panel5);
- //
- // splitExamPart.Panel2
- //
- this.splitExamPart.Panel2.Controls.Add(this.txtSummary);
- this.splitExamPart.Size = new System.Drawing.Size(544, 860);
- this.splitExamPart.SplitterDistance = 249;
- this.splitExamPart.TabIndex = 0;
- //
- // panel5
- //
- this.panel5.AutoScroll = true;
- this.panel5.BackColor = System.Drawing.Color.White;
- 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.Name = "panel5";
- this.panel5.Size = new System.Drawing.Size(249, 860);
- this.panel5.TabIndex = 0;
- //
- // DgcExamResultData
- //
- 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.Location = new System.Drawing.Point(0, 0);
- this.DgcExamResultData.MainView = this.DgvExamResultData;
- this.DgcExamResultData.Name = "DgcExamResultData";
- this.DgcExamResultData.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemMemoEdit4});
- 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});
- //
- // DgvExamResultData
- //
- this.DgvExamResultData.Appearance.GroupRow.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(187)))), ((int)(((byte)(106)))));
- this.DgvExamResultData.Appearance.GroupRow.ForeColor = System.Drawing.Color.Black;
- this.DgvExamResultData.Appearance.GroupRow.Options.UseBackColor = true;
- this.DgvExamResultData.Appearance.GroupRow.Options.UseForeColor = true;
- this.DgvExamResultData.AppearancePrint.GroupRow.BackColor = System.Drawing.Color.Transparent;
- this.DgvExamResultData.AppearancePrint.GroupRow.BackColor2 = System.Drawing.Color.Transparent;
- this.DgvExamResultData.AppearancePrint.GroupRow.Options.UseBackColor = true;
- this.DgvExamResultData.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn12,
- this.gridColumn13,
- this.gridColumn15,
- this.gridColumn18,
- this.gridColumn19,
- this.gridColumn31,
- this.gridColumn32});
- this.DgvExamResultData.GridControl = this.DgcExamResultData;
- this.DgvExamResultData.GroupCount = 2;
- this.DgvExamResultData.GroupFormat = "{1} {2}";
- this.DgvExamResultData.GroupRowHeight = 30;
- this.DgvExamResultData.Name = "DgvExamResultData";
- this.DgvExamResultData.OptionsBehavior.ReadOnly = true;
- this.DgvExamResultData.OptionsFilter.AllowColumnMRUFilterList = false;
- this.DgvExamResultData.OptionsFilter.AllowFilterEditor = false;
- this.DgvExamResultData.OptionsMenu.EnableColumnMenu = false;
- this.DgvExamResultData.OptionsView.ShowGroupPanel = false;
- this.DgvExamResultData.OptionsView.ShowIndicator = false;
- this.DgvExamResultData.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] {
- new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn12, DevExpress.Data.ColumnSortOrder.Ascending),
- new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn13, DevExpress.Data.ColumnSortOrder.Ascending)});
- //
- // gridColumn12
- //
- this.gridColumn12.AppearanceCell.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
- this.gridColumn12.AppearanceCell.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
- this.gridColumn12.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
- this.gridColumn12.AppearanceCell.Options.UseBackColor = true;
- this.gridColumn12.AppearanceCell.Options.UseFont = true;
- this.gridColumn12.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
- this.gridColumn12.AppearanceHeader.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
- this.gridColumn12.AppearanceHeader.Options.UseBackColor = true;
- this.gridColumn12.Caption = "科室";
- this.gridColumn12.FieldName = "DeptName";
- this.gridColumn12.MinWidth = 100;
- this.gridColumn12.Name = "gridColumn12";
- this.gridColumn12.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn12.OptionsFilter.AllowFilter = false;
- this.gridColumn12.Visible = true;
- this.gridColumn12.VisibleIndex = 0;
- this.gridColumn12.Width = 150;
- //
- // gridColumn13
- //
- this.gridColumn13.AppearanceCell.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.gridColumn13.AppearanceCell.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.gridColumn13.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
- this.gridColumn13.AppearanceCell.Options.UseBackColor = true;
- this.gridColumn13.AppearanceCell.Options.UseFont = true;
- this.gridColumn13.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.gridColumn13.AppearanceHeader.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
- this.gridColumn13.AppearanceHeader.Options.UseBackColor = true;
- this.gridColumn13.Caption = "收费项目";
- this.gridColumn13.FieldName = "FeeItemName";
- this.gridColumn13.MinWidth = 120;
- this.gridColumn13.Name = "gridColumn13";
- this.gridColumn13.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn13.OptionsFilter.AllowFilter = false;
- this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 0;
- this.gridColumn13.Width = 150;
- //
- // gridColumn15
- //
- this.gridColumn15.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
- this.gridColumn15.AppearanceCell.Options.UseFont = true;
- this.gridColumn15.Caption = "检查项目";
- this.gridColumn15.FieldName = "RptItemName";
- this.gridColumn15.MinWidth = 120;
- this.gridColumn15.Name = "gridColumn15";
- this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn15.OptionsFilter.AllowFilter = false;
- this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 0;
- this.gridColumn15.Width = 198;
- //
- // gridColumn18
- //
- this.gridColumn18.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
- this.gridColumn18.AppearanceCell.Options.UseFont = true;
- this.gridColumn18.Caption = "检查结果";
- this.gridColumn18.ColumnEdit = this.repositoryItemMemoEdit4;
- this.gridColumn18.FieldName = "TextResult";
- this.gridColumn18.MinWidth = 120;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn18.OptionsFilter.AllowFilter = false;
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 1;
- this.gridColumn18.Width = 120;
- //
- // repositoryItemMemoEdit4
- //
- this.repositoryItemMemoEdit4.Name = "repositoryItemMemoEdit4";
- //
- // gridColumn19
- //
- this.gridColumn19.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
- this.gridColumn19.AppearanceCell.Options.UseFont = true;
- this.gridColumn19.Caption = "参考范围";
- this.gridColumn19.FieldName = "Range";
- this.gridColumn19.MinWidth = 50;
- this.gridColumn19.Name = "gridColumn19";
- this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn19.OptionsFilter.AllowFilter = false;
- this.gridColumn19.Visible = true;
- this.gridColumn19.VisibleIndex = 2;
- this.gridColumn19.Width = 62;
- //
- // gridColumn31
- //
- this.gridColumn31.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
- this.gridColumn31.AppearanceCell.Options.UseFont = true;
- this.gridColumn31.Caption = "标志";
- this.gridColumn31.FieldName = "UnusualFlag";
- this.gridColumn31.MinWidth = 50;
- this.gridColumn31.Name = "gridColumn31";
- this.gridColumn31.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn31.OptionsFilter.AllowFilter = false;
- this.gridColumn31.Visible = true;
- this.gridColumn31.VisibleIndex = 3;
- this.gridColumn31.Width = 107;
- //
- // gridColumn32
- //
- this.gridColumn32.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
- this.gridColumn32.AppearanceCell.Options.UseFont = true;
- this.gridColumn32.Caption = "代码";
- this.gridColumn32.FieldName = "RptItemCode";
- this.gridColumn32.MinWidth = 50;
- this.gridColumn32.Name = "gridColumn32";
- this.gridColumn32.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
- this.gridColumn32.OptionsFilter.AllowFilter = false;
- this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 4;
- this.gridColumn32.Width = 111;
- //
- // txtSummary
- //
- this.txtSummary.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
- 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.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(291, 860);
- this.txtSummary.TabIndex = 4;
- this.txtSummary.Text = "科室小结";
- //
// panelExamInfoL
//
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.Name = "panelExamInfoL";
- this.panelExamInfoL.Size = new System.Drawing.Size(1117, 860);
+ this.panelExamInfoL.Size = new System.Drawing.Size(1300, 860);
this.panelExamInfoL.TabIndex = 2;
//
// TabPart
@@ -1120,7 +904,7 @@
this.TabPart.Name = "TabPart";
this.TabPart.SelectedTabPage = this.tabPageConslusion;
this.TabPart.ShowTabHeader = DevExpress.Utils.DefaultBoolean.True;
- this.TabPart.Size = new System.Drawing.Size(1117, 860);
+ this.TabPart.Size = new System.Drawing.Size(1300, 860);
this.TabPart.TabIndex = 0;
this.TabPart.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabPageConslusion,
@@ -1139,7 +923,7 @@
this.tabPageConslusion.Image = global::PEIS.Properties.Resources.menu;
this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(2);
this.tabPageConslusion.Name = "tabPageConslusion";
- this.tabPageConslusion.Size = new System.Drawing.Size(1111, 821);
+ this.tabPageConslusion.Size = new System.Drawing.Size(1294, 821);
this.tabPageConslusion.Text = "结论词";
//
// panelConclussion
@@ -1149,7 +933,7 @@
this.panelConclussion.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelConclussion.Location = new System.Drawing.Point(0, 40);
this.panelConclussion.Name = "panelConclussion";
- this.panelConclussion.Size = new System.Drawing.Size(770, 781);
+ this.panelConclussion.Size = new System.Drawing.Size(953, 781);
this.panelConclussion.TabIndex = 3;
//
// DgcExamConclusion
@@ -1163,7 +947,7 @@
this.repositoryItemRichTextEdit2,
this.repositoryItemMemoEdit2,
this.CmbSearchConclusion});
- this.DgcExamConclusion.Size = new System.Drawing.Size(770, 781);
+ this.DgcExamConclusion.Size = new System.Drawing.Size(953, 781);
this.DgcExamConclusion.TabIndex = 5;
this.DgcExamConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvExamConclusion,
@@ -1316,7 +1100,7 @@
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(770, 40);
+ this.panelAllConclusion.Location = new System.Drawing.Point(953, 40);
this.panelAllConclusion.Name = "panelAllConclusion";
this.panelAllConclusion.Size = new System.Drawing.Size(341, 781);
this.panelAllConclusion.TabIndex = 2;
@@ -1438,7 +1222,7 @@
this.panelConclussionMenu.Dock = System.Windows.Forms.DockStyle.Top;
this.panelConclussionMenu.Location = new System.Drawing.Point(0, 0);
this.panelConclussionMenu.Name = "panelConclussionMenu";
- this.panelConclussionMenu.Size = new System.Drawing.Size(1111, 40);
+ this.panelConclussionMenu.Size = new System.Drawing.Size(1294, 40);
this.panelConclussionMenu.TabIndex = 0;
//
// OpsConclusion
@@ -1447,7 +1231,7 @@
this.OpsConclusion.Location = new System.Drawing.Point(0, 0);
this.OpsConclusion.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7);
this.OpsConclusion.Name = "OpsConclusion";
- this.OpsConclusion.Size = new System.Drawing.Size(1111, 40);
+ this.OpsConclusion.Size = new System.Drawing.Size(1294, 40);
this.OpsConclusion.TabIndex = 5;
//
// tabPageExam
@@ -1470,7 +1254,7 @@
this.tabPageExam.Image = global::PEIS.Properties.Resources.menu;
this.tabPageExam.Margin = new System.Windows.Forms.Padding(2);
this.tabPageExam.Name = "tabPageExam";
- this.tabPageExam.Size = new System.Drawing.Size(1111, 821);
+ this.tabPageExam.Size = new System.Drawing.Size(1128, 821);
this.tabPageExam.Text = "一般项目";
//
// DgcExamResult
@@ -1481,7 +1265,7 @@
this.DgcExamResult.Name = "DgcExamResult";
this.DgcExamResult.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemMemoEdit3});
- this.DgcExamResult.Size = new System.Drawing.Size(1111, 821);
+ this.DgcExamResult.Size = new System.Drawing.Size(1128, 821);
this.DgcExamResult.TabIndex = 140;
this.DgcExamResult.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvExamResult});
@@ -1669,7 +1453,7 @@
this.tabPageSummary.Image = global::PEIS.Properties.Resources.menu;
this.tabPageSummary.Margin = new System.Windows.Forms.Padding(2);
this.tabPageSummary.Name = "tabPageSummary";
- this.tabPageSummary.Size = new System.Drawing.Size(1111, 821);
+ this.tabPageSummary.Size = new System.Drawing.Size(1128, 821);
this.tabPageSummary.Text = "科室小结";
//
// panelDeptSummary
@@ -1679,7 +1463,7 @@
this.panelDeptSummary.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelDeptSummary.Location = new System.Drawing.Point(0, 0);
this.panelDeptSummary.Name = "panelDeptSummary";
- this.panelDeptSummary.Size = new System.Drawing.Size(1111, 821);
+ this.panelDeptSummary.Size = new System.Drawing.Size(1128, 821);
this.panelDeptSummary.TabIndex = 61;
//
// DgcSummary
@@ -1692,7 +1476,7 @@
this.repositoryItemRichTextEdit1,
this.repositoryItemTextEdit1,
this.repositoryItemMemoEdit1});
- this.DgcSummary.Size = new System.Drawing.Size(1111, 821);
+ this.DgcSummary.Size = new System.Drawing.Size(1128, 821);
this.DgcSummary.TabIndex = 0;
this.DgcSummary.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvSummary});
@@ -1756,7 +1540,7 @@
this.tabPageLis.Image = global::PEIS.Properties.Resources.menu;
this.tabPageLis.Margin = new System.Windows.Forms.Padding(2);
this.tabPageLis.Name = "tabPageLis";
- this.tabPageLis.Size = new System.Drawing.Size(1111, 821);
+ this.tabPageLis.Size = new System.Drawing.Size(1128, 821);
this.tabPageLis.Text = "检验报告";
//
// DgcLisReport
@@ -1765,7 +1549,7 @@
this.DgcLisReport.Location = new System.Drawing.Point(0, 0);
this.DgcLisReport.MainView = this.DgvLisReport;
this.DgcLisReport.Name = "DgcLisReport";
- this.DgcLisReport.Size = new System.Drawing.Size(1111, 821);
+ this.DgcLisReport.Size = new System.Drawing.Size(1128, 821);
this.DgcLisReport.TabIndex = 1;
this.DgcLisReport.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvLisReport});
@@ -1876,7 +1660,7 @@
this.tabPagePacs.Image = global::PEIS.Properties.Resources.menu;
this.tabPagePacs.Margin = new System.Windows.Forms.Padding(2);
this.tabPagePacs.Name = "tabPagePacs";
- this.tabPagePacs.Size = new System.Drawing.Size(1111, 821);
+ this.tabPagePacs.Size = new System.Drawing.Size(1128, 821);
this.tabPagePacs.Text = "检查报告";
//
// panelPacsBase
@@ -1886,7 +1670,7 @@
this.panelPacsBase.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelPacsBase.Location = new System.Drawing.Point(0, 0);
this.panelPacsBase.Name = "panelPacsBase";
- this.panelPacsBase.Size = new System.Drawing.Size(1111, 821);
+ this.panelPacsBase.Size = new System.Drawing.Size(1128, 821);
this.panelPacsBase.TabIndex = 1;
//
// xtraTabControl1
@@ -1897,7 +1681,7 @@
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(851, 821);
+ this.xtraTabControl1.Size = new System.Drawing.Size(868, 821);
this.xtraTabControl1.TabIndex = 1;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabPacsRpt,
@@ -1907,7 +1691,7 @@
//
this.tabPacsRpt.Controls.Add(this.panelPacsRpt);
this.tabPacsRpt.Name = "tabPacsRpt";
- this.tabPacsRpt.Size = new System.Drawing.Size(807, 815);
+ this.tabPacsRpt.Size = new System.Drawing.Size(824, 815);
this.tabPacsRpt.Text = "报告";
//
// panelPacsRpt
@@ -1918,7 +1702,7 @@
this.panelPacsRpt.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelPacsRpt.Location = new System.Drawing.Point(0, 0);
this.panelPacsRpt.Name = "panelPacsRpt";
- this.panelPacsRpt.Size = new System.Drawing.Size(807, 815);
+ this.panelPacsRpt.Size = new System.Drawing.Size(824, 815);
this.panelPacsRpt.TabIndex = 3;
//
// pictureBoxPacsRpt
@@ -1936,7 +1720,7 @@
//
this.tabPacsImg.Controls.Add(this.panel12);
this.tabPacsImg.Name = "tabPacsImg";
- this.tabPacsImg.Size = new System.Drawing.Size(807, 815);
+ this.tabPacsImg.Size = new System.Drawing.Size(824, 815);
this.tabPacsImg.Text = "图片";
//
// panel12
@@ -1945,7 +1729,7 @@
this.panel12.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel12.Location = new System.Drawing.Point(0, 0);
this.panel12.Name = "panel12";
- this.panel12.Size = new System.Drawing.Size(807, 815);
+ this.panel12.Size = new System.Drawing.Size(824, 815);
this.panel12.TabIndex = 3;
//
// panel13
@@ -1955,7 +1739,7 @@
this.panel13.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel13.Location = new System.Drawing.Point(0, 0);
this.panel13.Name = "panel13";
- this.panel13.Size = new System.Drawing.Size(807, 815);
+ this.panel13.Size = new System.Drawing.Size(824, 815);
this.panel13.TabIndex = 6;
//
// panel15
@@ -1964,7 +1748,7 @@
this.panel15.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel15.Location = new System.Drawing.Point(0, 0);
this.panel15.Name = "panel15";
- this.panel15.Size = new System.Drawing.Size(807, 815);
+ this.panel15.Size = new System.Drawing.Size(824, 815);
this.panel15.TabIndex = 4;
//
// panelPacsImg
@@ -1974,7 +1758,7 @@
this.panelPacsImg.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelPacsImg.Location = new System.Drawing.Point(0, 0);
this.panelPacsImg.Name = "panelPacsImg";
- this.panelPacsImg.Size = new System.Drawing.Size(807, 815);
+ this.panelPacsImg.Size = new System.Drawing.Size(824, 815);
this.panelPacsImg.TabIndex = 5;
//
// flowLayoutPanelPacsImg
@@ -1984,7 +1768,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(807, 815);
+ this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(824, 815);
this.flowLayoutPanelPacsImg.TabIndex = 0;
//
// panelPacsRptList
@@ -2069,7 +1853,7 @@
this.tabPageReport.Image = global::PEIS.Properties.Resources.menu;
this.tabPageReport.Margin = new System.Windows.Forms.Padding(2);
this.tabPageReport.Name = "tabPageReport";
- this.tabPageReport.Size = new System.Drawing.Size(1111, 821);
+ this.tabPageReport.Size = new System.Drawing.Size(1128, 821);
this.tabPageReport.Text = "其他报告";
//
// panelReportBase
@@ -2079,7 +1863,7 @@
this.panelReportBase.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelReportBase.Location = new System.Drawing.Point(0, 0);
this.panelReportBase.Name = "panelReportBase";
- this.panelReportBase.Size = new System.Drawing.Size(1111, 821);
+ this.panelReportBase.Size = new System.Drawing.Size(1128, 821);
this.panelReportBase.TabIndex = 0;
//
// panelReport
@@ -2090,7 +1874,7 @@
this.panelReport.Dock = System.Windows.Forms.DockStyle.Fill;
this.panelReport.Location = new System.Drawing.Point(260, 0);
this.panelReport.Name = "panelReport";
- this.panelReport.Size = new System.Drawing.Size(851, 821);
+ this.panelReport.Size = new System.Drawing.Size(868, 821);
this.panelReport.TabIndex = 2;
//
// PictureBoxReportExt
@@ -2165,9 +1949,222 @@
//
this.tabPageHistory.Margin = new System.Windows.Forms.Padding(2);
this.tabPageHistory.Name = "tabPageHistory";
- this.tabPageHistory.Size = new System.Drawing.Size(1111, 821);
+ this.tabPageHistory.Size = new System.Drawing.Size(1128, 821);
this.tabPageHistory.Text = "历史结果";
//
+ // panelTxtSummary
+ //
+ this.panelTxtSummary.BackColor = System.Drawing.Color.White;
+ this.panelTxtSummary.Controls.Add(this.txtSummary);
+ 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.Name = "panelTxtSummary";
+ this.panelTxtSummary.Size = new System.Drawing.Size(361, 860);
+ this.panelTxtSummary.TabIndex = 2;
+ //
+ // txtSummary
+ //
+ this.txtSummary.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+ 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.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(361, 670);
+ this.txtSummary.TabIndex = 5;
+ this.txtSummary.Text = "科室小结";
+ //
+ // splitExamPart
+ //
+ this.splitExamPart.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
+ this.splitExamPart.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.splitExamPart.Location = new System.Drawing.Point(0, 670);
+ this.splitExamPart.Name = "splitExamPart";
+ //
+ // splitExamPart.Panel1
+ //
+ this.splitExamPart.Panel1.Controls.Add(this.panel5);
+ this.splitExamPart.Size = new System.Drawing.Size(361, 190);
+ this.splitExamPart.SplitterDistance = 165;
+ this.splitExamPart.TabIndex = 0;
+ this.splitExamPart.Visible = false;
+ //
+ // panel5
+ //
+ this.panel5.AutoScroll = true;
+ this.panel5.BackColor = System.Drawing.Color.White;
+ 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.Name = "panel5";
+ this.panel5.Size = new System.Drawing.Size(165, 190);
+ this.panel5.TabIndex = 0;
+ //
+ // DgcExamResultData
+ //
+ 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.Location = new System.Drawing.Point(0, 0);
+ this.DgcExamResultData.MainView = this.DgvExamResultData;
+ this.DgcExamResultData.Name = "DgcExamResultData";
+ this.DgcExamResultData.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemMemoEdit4});
+ this.DgcExamResultData.Size = new System.Drawing.Size(600, 173);
+ this.DgcExamResultData.TabIndex = 0;
+ this.DgcExamResultData.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.DgvExamResultData});
+ //
+ // DgvExamResultData
+ //
+ this.DgvExamResultData.Appearance.GroupRow.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(102)))), ((int)(((byte)(187)))), ((int)(((byte)(106)))));
+ this.DgvExamResultData.Appearance.GroupRow.ForeColor = System.Drawing.Color.Black;
+ this.DgvExamResultData.Appearance.GroupRow.Options.UseBackColor = true;
+ this.DgvExamResultData.Appearance.GroupRow.Options.UseForeColor = true;
+ this.DgvExamResultData.AppearancePrint.GroupRow.BackColor = System.Drawing.Color.Transparent;
+ this.DgvExamResultData.AppearancePrint.GroupRow.BackColor2 = System.Drawing.Color.Transparent;
+ this.DgvExamResultData.AppearancePrint.GroupRow.Options.UseBackColor = true;
+ this.DgvExamResultData.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn12,
+ this.gridColumn13,
+ this.gridColumn15,
+ this.gridColumn18,
+ this.gridColumn19,
+ this.gridColumn31,
+ this.gridColumn32});
+ this.DgvExamResultData.GridControl = this.DgcExamResultData;
+ this.DgvExamResultData.GroupCount = 2;
+ this.DgvExamResultData.GroupFormat = "{1} {2}";
+ this.DgvExamResultData.GroupRowHeight = 30;
+ this.DgvExamResultData.Name = "DgvExamResultData";
+ this.DgvExamResultData.OptionsBehavior.ReadOnly = true;
+ this.DgvExamResultData.OptionsFilter.AllowColumnMRUFilterList = false;
+ this.DgvExamResultData.OptionsFilter.AllowFilterEditor = false;
+ this.DgvExamResultData.OptionsMenu.EnableColumnMenu = false;
+ this.DgvExamResultData.OptionsView.ShowGroupPanel = false;
+ this.DgvExamResultData.OptionsView.ShowIndicator = false;
+ this.DgvExamResultData.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] {
+ new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn12, DevExpress.Data.ColumnSortOrder.Ascending),
+ new DevExpress.XtraGrid.Columns.GridColumnSortInfo(this.gridColumn13, DevExpress.Data.ColumnSortOrder.Ascending)});
+ //
+ // gridColumn12
+ //
+ this.gridColumn12.AppearanceCell.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+ this.gridColumn12.AppearanceCell.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+ this.gridColumn12.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+ this.gridColumn12.AppearanceCell.Options.UseBackColor = true;
+ this.gridColumn12.AppearanceCell.Options.UseFont = true;
+ this.gridColumn12.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+ this.gridColumn12.AppearanceHeader.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(192)))));
+ this.gridColumn12.AppearanceHeader.Options.UseBackColor = true;
+ this.gridColumn12.Caption = "科室";
+ this.gridColumn12.FieldName = "DeptName";
+ this.gridColumn12.MinWidth = 100;
+ this.gridColumn12.Name = "gridColumn12";
+ this.gridColumn12.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn12.OptionsFilter.AllowFilter = false;
+ this.gridColumn12.Visible = true;
+ this.gridColumn12.VisibleIndex = 0;
+ this.gridColumn12.Width = 150;
+ //
+ // gridColumn13
+ //
+ this.gridColumn13.AppearanceCell.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.gridColumn13.AppearanceCell.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.gridColumn13.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
+ this.gridColumn13.AppearanceCell.Options.UseBackColor = true;
+ this.gridColumn13.AppearanceCell.Options.UseFont = true;
+ this.gridColumn13.AppearanceHeader.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.gridColumn13.AppearanceHeader.BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(255)))), ((int)(((byte)(255)))));
+ this.gridColumn13.AppearanceHeader.Options.UseBackColor = true;
+ this.gridColumn13.Caption = "收费项目";
+ this.gridColumn13.FieldName = "FeeItemName";
+ this.gridColumn13.MinWidth = 120;
+ this.gridColumn13.Name = "gridColumn13";
+ this.gridColumn13.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn13.OptionsFilter.AllowFilter = false;
+ this.gridColumn13.Visible = true;
+ this.gridColumn13.VisibleIndex = 0;
+ this.gridColumn13.Width = 150;
+ //
+ // gridColumn15
+ //
+ this.gridColumn15.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
+ this.gridColumn15.AppearanceCell.Options.UseFont = true;
+ this.gridColumn15.Caption = "检查项目";
+ this.gridColumn15.FieldName = "RptItemName";
+ this.gridColumn15.MinWidth = 120;
+ this.gridColumn15.Name = "gridColumn15";
+ this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn15.OptionsFilter.AllowFilter = false;
+ this.gridColumn15.Visible = true;
+ this.gridColumn15.VisibleIndex = 0;
+ this.gridColumn15.Width = 198;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
+ this.gridColumn18.AppearanceCell.Options.UseFont = true;
+ this.gridColumn18.Caption = "检查结果";
+ this.gridColumn18.ColumnEdit = this.repositoryItemMemoEdit4;
+ this.gridColumn18.FieldName = "TextResult";
+ this.gridColumn18.MinWidth = 120;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn18.OptionsFilter.AllowFilter = false;
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 1;
+ this.gridColumn18.Width = 120;
+ //
+ // repositoryItemMemoEdit4
+ //
+ this.repositoryItemMemoEdit4.Name = "repositoryItemMemoEdit4";
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
+ this.gridColumn19.AppearanceCell.Options.UseFont = true;
+ this.gridColumn19.Caption = "参考范围";
+ this.gridColumn19.FieldName = "Range";
+ this.gridColumn19.MinWidth = 50;
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn19.OptionsFilter.AllowFilter = false;
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 2;
+ this.gridColumn19.Width = 62;
+ //
+ // gridColumn31
+ //
+ this.gridColumn31.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
+ this.gridColumn31.AppearanceCell.Options.UseFont = true;
+ this.gridColumn31.Caption = "标志";
+ this.gridColumn31.FieldName = "UnusualFlag";
+ this.gridColumn31.MinWidth = 50;
+ this.gridColumn31.Name = "gridColumn31";
+ this.gridColumn31.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn31.OptionsFilter.AllowFilter = false;
+ this.gridColumn31.Visible = true;
+ this.gridColumn31.VisibleIndex = 3;
+ this.gridColumn31.Width = 107;
+ //
+ // gridColumn32
+ //
+ this.gridColumn32.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F);
+ this.gridColumn32.AppearanceCell.Options.UseFont = true;
+ this.gridColumn32.Caption = "代码";
+ this.gridColumn32.FieldName = "RptItemCode";
+ this.gridColumn32.MinWidth = 50;
+ this.gridColumn32.Name = "gridColumn32";
+ this.gridColumn32.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
+ this.gridColumn32.OptionsFilter.AllowFilter = false;
+ this.gridColumn32.Visible = true;
+ this.gridColumn32.VisibleIndex = 4;
+ this.gridColumn32.Width = 111;
+ //
// panelPatientInfo
//
this.panelPatientInfo.BackColor = System.Drawing.Color.White;
@@ -2877,16 +2874,6 @@
this.splitContainerExamInfo.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainerExamInfo)).EndInit();
this.splitContainerExamInfo.ResumeLayout(false);
- this.panelTxtSummary.ResumeLayout(false);
- this.splitExamPart.Panel1.ResumeLayout(false);
- this.splitExamPart.Panel2.ResumeLayout(false);
- this.splitExamPart.Panel2.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.splitExamPart)).EndInit();
- this.splitExamPart.ResumeLayout(false);
- this.panel5.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.DgcExamResultData)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.DgvExamResultData)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit4)).EndInit();
this.panelExamInfoL.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.TabPart)).EndInit();
this.TabPart.ResumeLayout(false);
@@ -2942,6 +2929,15 @@
((System.ComponentModel.ISupportInitialize)(this.PictureBoxReportExt)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.DgcRptExt)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.DgvRptExt)).EndInit();
+ this.panelTxtSummary.ResumeLayout(false);
+ this.panelTxtSummary.PerformLayout();
+ this.splitExamPart.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitExamPart)).EndInit();
+ this.splitExamPart.ResumeLayout(false);
+ this.panel5.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.DgcExamResultData)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.DgvExamResultData)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit4)).EndInit();
this.panelPatientInfo.ResumeLayout(false);
this.panel3.ResumeLayout(false);
this.tableLayoutPanel1.ResumeLayout(false);
@@ -3148,7 +3144,6 @@
private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
private System.Windows.Forms.Panel panelAllConclusion;
private System.Windows.Forms.SplitContainer splitExamPart;
- private System.Windows.Forms.TextBox txtSummary;
private DevExpress.XtraGrid.GridControl DgcAllConclusion;
private DevExpress.XtraGrid.Views.Grid.GridView DgvAllConclusion;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
@@ -3169,5 +3164,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit4;
+ private System.Windows.Forms.TextBox txtSummary;
}
}
\ No newline at end of file
diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs
index 262e5e1..17df39b 100644
--- a/PEIS/View/Exam/TotalForm.cs
+++ b/PEIS/View/Exam/TotalForm.cs
@@ -39,6 +39,8 @@ namespace PEIS.View.Exam
private readonly string _watermarkTeam = @"团检号或团队名称";
private readonly string _watermarkInfo = @"体检号或体检者姓名";
+ // 芒市妇幼定制功能开关配置
+ private readonly bool isShowDgcExamResultData = false;
// 定义一个委托
public delegate void SelectedPatientDelegate(long? eid);
@@ -1067,7 +1069,7 @@ namespace PEIS.View.Exam
///
public void GetExamResultData(long eid)
{
- if (eid == 0)
+ if (eid == 0|| !isShowDgcExamResultData)
{
return;
}
diff --git a/PEIS/View/Exam/TotalForm.resx b/PEIS/View/Exam/TotalForm.resx
index 7155ed1..3a5483d 100644
--- a/PEIS/View/Exam/TotalForm.resx
+++ b/PEIS/View/Exam/TotalForm.resx
@@ -120,12 +120,6 @@
497, 55
-
- 497, 55
-
-
- 377, 55
-
377, 55
diff --git a/PEIS/View/MainForm.cs b/PEIS/View/MainForm.cs
index b71c70c..c27df2a 100644
--- a/PEIS/View/MainForm.cs
+++ b/PEIS/View/MainForm.cs
@@ -4,6 +4,7 @@ using System.Drawing;
using System.Runtime.InteropServices;
using System.Windows.Forms;
using DevExpress.XtraNavBar;
+using NPOI.SS.Formula.PTG;
using PEIS.Base;
using PEIS.Model;
using PEIS.Properties;
@@ -27,6 +28,8 @@ namespace PEIS.View
public static extern bool SendMessage(IntPtr hwnd, int wMsg, int wParam, int lParam);
private static bool _isCloseMainForm = false;
+ // 是否显示进度条
+ private static bool _isShowStepViewer = false;
public MainForm()
{
@@ -85,10 +88,20 @@ namespace PEIS.View
stepViewer2.Eid = null;
FormClosing += TipsFormClosing;
+ if (!_isShowStepViewer)
+ {
+ stepViewer2.Visible = false;
+ panelFooter.Visible = false;
+ lblStep.Visible = false;
+ panelFooter.Height=5;
+ }
}
private void UpdateStepViewerEid(long? eid)
{
-
+ if (!_isShowStepViewer)
+ {
+ return;
+ }
panelFooter.Visible = true;
// lblStep.Text = eid==null ? "" : eid+" 体检完成情况：";
stepViewer2.Eid = eid;