diff --git a/PEIS/App.config b/PEIS/App.config index e1a080b..e35a23d 100644 --- a/PEIS/App.config +++ b/PEIS/App.config @@ -15,9 +15,9 @@ - + - + diff --git a/PEIS/Model/ReportModel.cs b/PEIS/Model/ReportModel.cs index fe7d5f7..94d2b10 100644 --- a/PEIS/Model/ReportModel.cs +++ b/PEIS/Model/ReportModel.cs @@ -201,7 +201,7 @@ namespace PEIS.Model Image bitmap = Image.FromStream(memoryStream); using (MemoryStream stream = new MemoryStream()) { - bitmap.RotateFlip(RotateFlipType.Rotate90FlipNone); + bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone); bitmap.Save(stream, ImageFormat.Jpeg); var img = stream.ToArray(); pacs.Add(new Report { ReportImage = img }); diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index 4249c07..7204228 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -325,12 +325,6 @@ OrgForm.cs - - Form - - - PatientForm.cs - Form @@ -542,9 +536,6 @@ OrgForm.cs - - PatientForm.cs - PatientImportForm.cs @@ -699,9 +690,6 @@ Always - - Always - diff --git a/PEIS/View/Base/PatientForm.Designer.cs b/PEIS/View/Base/PatientForm.Designer.cs deleted file mode 100644 index 92a3190..0000000 --- a/PEIS/View/Base/PatientForm.Designer.cs +++ /dev/null @@ -1,505 +0,0 @@ -namespace PEIS.View.Base -{ - partial class PatientForm - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - this.DgcPatient = new DevExpress.XtraGrid.GridControl(); - this.DgvPatient = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.colContactor2 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit(); - this.panel6 = new System.Windows.Forms.Panel(); - this.OpsPatient = new PEIS.View.UControl.OpMenuSimple(); - this.label2 = new System.Windows.Forms.Label(); - ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.DgvPatient)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemImageEdit1)).BeginInit(); - this.panel6.SuspendLayout(); - this.SuspendLayout(); - // - // DgcPatient - // - this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPatient.Location = new System.Drawing.Point(0, 41); - this.DgcPatient.MainView = this.DgvPatient; - this.DgcPatient.Name = "DgcPatient"; - this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { - this.repositoryItemImageEdit1}); - this.DgcPatient.Size = new System.Drawing.Size(933, 596); - this.DgcPatient.TabIndex = 130; - this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { - this.DgvPatient}); - // - // DgvPatient - // - this.DgvPatient.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.DgvPatient.Appearance.FooterPanel.ForeColor = System.Drawing.Color.Red; - this.DgvPatient.Appearance.FooterPanel.Options.UseFont = true; - this.DgvPatient.Appearance.FooterPanel.Options.UseForeColor = true; - this.DgvPatient.Appearance.GroupRow.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.DgvPatient.Appearance.GroupRow.Options.UseFont = true; - this.DgvPatient.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.DgvPatient.Appearance.Row.Options.UseFont = true; - this.DgvPatient.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { - this.gridColumn1, - this.gridColumn2, - this.gridColumn3, - this.gridColumn4, - this.gridColumn5, - this.gridColumn7, - this.gridColumn11, - this.gridColumn6, - this.gridColumn14, - this.gridColumn15, - this.gridColumn16, - this.gridColumn17, - this.gridColumn9, - this.gridColumn19, - this.colContactor2, - this.gridColumn10, - this.gridColumn27, - this.gridColumn28, - this.gridColumn29, - this.gridColumn30, - this.gridColumn8, - this.gridColumn31}); - this.DgvPatient.FixedLineWidth = 1; - this.DgvPatient.GridControl = this.DgcPatient; - this.DgvPatient.IndicatorWidth = 30; - this.DgvPatient.Name = "DgvPatient"; - this.DgvPatient.OptionsSelection.MultiSelect = true; - this.DgvPatient.OptionsView.ColumnAutoWidth = false; - this.DgvPatient.OptionsView.ShowGroupPanel = false; - this.DgvPatient.RowHeight = 30; - // - // gridColumn1 - // - this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen; - this.gridColumn1.AppearanceCell.Options.UseFont = true; - this.gridColumn1.AppearanceCell.Options.UseForeColor = true; - this.gridColumn1.Caption = "姓名"; - this.gridColumn1.FieldName = "Name"; - this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.OptionsColumn.AllowEdit = false; - this.gridColumn1.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn1.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn1.OptionsColumn.ReadOnly = true; - this.gridColumn1.OptionsFilter.AllowFilter = false; - this.gridColumn1.Visible = true; - this.gridColumn1.VisibleIndex = 0; - this.gridColumn1.Width = 80; - // - // gridColumn2 - // - this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen; - this.gridColumn2.AppearanceCell.Options.UseFont = true; - this.gridColumn2.AppearanceCell.Options.UseForeColor = true; - this.gridColumn2.Caption = "性别"; - this.gridColumn2.FieldName = "Sex"; - this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.OptionsColumn.AllowEdit = false; - this.gridColumn2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn2.OptionsColumn.ReadOnly = true; - this.gridColumn2.OptionsFilter.AllowFilter = false; - this.gridColumn2.Visible = true; - this.gridColumn2.VisibleIndex = 1; - this.gridColumn2.Width = 40; - // - // gridColumn3 - // - this.gridColumn3.Caption = "出生年月"; - this.gridColumn3.FieldName = "Birthday"; - this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.OptionsColumn.AllowEdit = false; - this.gridColumn3.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn3.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn3.OptionsColumn.ReadOnly = true; - this.gridColumn3.OptionsFilter.AllowFilter = false; - this.gridColumn3.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { - new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")}); - this.gridColumn3.Visible = true; - this.gridColumn3.VisibleIndex = 2; - this.gridColumn3.Width = 100; - // - // gridColumn4 - // - this.gridColumn4.Caption = "证件类型"; - this.gridColumn4.FieldName = "CardType"; - this.gridColumn4.Name = "gridColumn4"; - this.gridColumn4.OptionsColumn.AllowEdit = false; - this.gridColumn4.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn4.OptionsColumn.ReadOnly = true; - this.gridColumn4.OptionsFilter.AllowFilter = false; - this.gridColumn4.Visible = true; - this.gridColumn4.VisibleIndex = 3; - this.gridColumn4.Width = 80; - // - // gridColumn5 - // - this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gridColumn5.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen; - this.gridColumn5.AppearanceCell.Options.UseFont = true; - this.gridColumn5.AppearanceCell.Options.UseForeColor = true; - this.gridColumn5.Caption = "证件号码"; - this.gridColumn5.FieldName = "CardNo"; - this.gridColumn5.Name = "gridColumn5"; - this.gridColumn5.OptionsColumn.AllowEdit = false; - this.gridColumn5.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn5.OptionsColumn.ReadOnly = true; - this.gridColumn5.OptionsFilter.AllowFilter = false; - this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 4; - this.gridColumn5.Width = 160; - // - // gridColumn7 - // - this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen; - this.gridColumn7.AppearanceCell.Options.UseFont = true; - this.gridColumn7.AppearanceCell.Options.UseForeColor = true; - this.gridColumn7.Caption = "民族"; - this.gridColumn7.FieldName = "Nation"; - this.gridColumn7.Name = "gridColumn7"; - this.gridColumn7.OptionsColumn.AllowEdit = false; - this.gridColumn7.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn7.OptionsColumn.ReadOnly = true; - this.gridColumn7.Visible = true; - this.gridColumn7.VisibleIndex = 5; - this.gridColumn7.Width = 60; - // - // gridColumn11 - // - this.gridColumn11.Caption = "学历"; - this.gridColumn11.FieldName = "Education"; - this.gridColumn11.Name = "gridColumn11"; - this.gridColumn11.OptionsColumn.AllowEdit = false; - this.gridColumn11.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn11.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn11.OptionsColumn.ReadOnly = true; - this.gridColumn11.Visible = true; - this.gridColumn11.VisibleIndex = 6; - this.gridColumn11.Width = 60; - // - // gridColumn6 - // - this.gridColumn6.Caption = "婚况"; - this.gridColumn6.FieldName = "Marriage"; - this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.OptionsColumn.AllowEdit = false; - this.gridColumn6.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn6.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn6.OptionsColumn.ReadOnly = true; - this.gridColumn6.OptionsFilter.AllowFilter = false; - this.gridColumn6.Visible = true; - this.gridColumn6.VisibleIndex = 7; - this.gridColumn6.Width = 60; - // - // gridColumn14 - // - this.gridColumn14.Caption = "职业"; - this.gridColumn14.FieldName = "Occupation"; - this.gridColumn14.Name = "gridColumn14"; - this.gridColumn14.OptionsColumn.AllowEdit = false; - this.gridColumn14.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn14.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn14.OptionsColumn.ReadOnly = true; - this.gridColumn14.Visible = true; - this.gridColumn14.VisibleIndex = 8; - // - // gridColumn15 - // - this.gridColumn15.Caption = "工作单位"; - this.gridColumn15.FieldName = "Company"; - this.gridColumn15.Name = "gridColumn15"; - this.gridColumn15.OptionsColumn.AllowEdit = false; - this.gridColumn15.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn15.OptionsColumn.ReadOnly = true; - this.gridColumn15.Visible = true; - this.gridColumn15.VisibleIndex = 9; - this.gridColumn15.Width = 200; - // - // gridColumn16 - // - this.gridColumn16.Caption = "籍贯"; - this.gridColumn16.FieldName = "CardAddress"; - this.gridColumn16.Name = "gridColumn16"; - this.gridColumn16.OptionsColumn.AllowEdit = false; - this.gridColumn16.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn16.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn16.OptionsColumn.ReadOnly = true; - this.gridColumn16.Visible = true; - this.gridColumn16.VisibleIndex = 10; - this.gridColumn16.Width = 200; - // - // gridColumn17 - // - this.gridColumn17.Caption = "联系人1"; - this.gridColumn17.FieldName = "Contactor1"; - this.gridColumn17.Name = "gridColumn17"; - this.gridColumn17.OptionsColumn.AllowEdit = false; - this.gridColumn17.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn17.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn17.OptionsColumn.ReadOnly = true; - this.gridColumn17.Visible = true; - this.gridColumn17.VisibleIndex = 11; - // - // gridColumn9 - // - this.gridColumn9.Caption = "联系电话1"; - this.gridColumn9.FieldName = "Tel1"; - this.gridColumn9.Name = "gridColumn9"; - this.gridColumn9.OptionsColumn.AllowEdit = false; - this.gridColumn9.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn9.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn9.OptionsColumn.ReadOnly = true; - this.gridColumn9.Visible = true; - this.gridColumn9.VisibleIndex = 12; - this.gridColumn9.Width = 100; - // - // gridColumn19 - // - this.gridColumn19.Caption = "联系地址1"; - this.gridColumn19.Name = "gridColumn19"; - this.gridColumn19.OptionsColumn.AllowEdit = false; - this.gridColumn19.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn19.OptionsColumn.ReadOnly = true; - this.gridColumn19.Visible = true; - this.gridColumn19.VisibleIndex = 13; - // - // colContactor2 - // - this.colContactor2.Caption = "联系人2"; - this.colContactor2.FieldName = "Contactor2"; - this.colContactor2.Name = "colContactor2"; - this.colContactor2.OptionsColumn.AllowEdit = false; - this.colContactor2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.colContactor2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.colContactor2.OptionsColumn.ReadOnly = true; - this.colContactor2.Visible = true; - this.colContactor2.VisibleIndex = 14; - // - // gridColumn10 - // - this.gridColumn10.Caption = "联系电话2"; - this.gridColumn10.FieldName = "Tel2"; - this.gridColumn10.Name = "gridColumn10"; - this.gridColumn10.OptionsColumn.AllowEdit = false; - this.gridColumn10.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn10.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn10.OptionsColumn.ReadOnly = true; - this.gridColumn10.Visible = true; - this.gridColumn10.VisibleIndex = 20; - this.gridColumn10.Width = 100; - // - // gridColumn27 - // - this.gridColumn27.Caption = "联系地址2"; - this.gridColumn27.Name = "gridColumn27"; - this.gridColumn27.OptionsColumn.AllowEdit = false; - this.gridColumn27.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn27.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn27.OptionsColumn.ReadOnly = true; - this.gridColumn27.Visible = true; - this.gridColumn27.VisibleIndex = 15; - // - // gridColumn28 - // - this.gridColumn28.Caption = "备注"; - this.gridColumn28.FieldName = "Description"; - this.gridColumn28.Name = "gridColumn28"; - this.gridColumn28.OptionsColumn.AllowEdit = false; - this.gridColumn28.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn28.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn28.OptionsColumn.ReadOnly = true; - this.gridColumn28.Visible = true; - this.gridColumn28.VisibleIndex = 16; - // - // gridColumn29 - // - this.gridColumn29.Caption = "建档时间"; - this.gridColumn29.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; - this.gridColumn29.FieldName = "CreateTime"; - this.gridColumn29.Name = "gridColumn29"; - this.gridColumn29.OptionsColumn.AllowEdit = false; - this.gridColumn29.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn29.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn29.OptionsColumn.ReadOnly = true; - this.gridColumn29.Visible = true; - this.gridColumn29.VisibleIndex = 17; - this.gridColumn29.Width = 130; - // - // gridColumn30 - // - this.gridColumn30.Caption = "建档人"; - this.gridColumn30.FieldName = "Creator"; - this.gridColumn30.Name = "gridColumn30"; - this.gridColumn30.OptionsColumn.AllowEdit = false; - this.gridColumn30.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn30.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn30.OptionsColumn.ReadOnly = true; - this.gridColumn30.Visible = true; - this.gridColumn30.VisibleIndex = 18; - // - // gridColumn8 - // - this.gridColumn8.Caption = "ID"; - this.gridColumn8.FieldName = "ID"; - this.gridColumn8.Name = "gridColumn8"; - this.gridColumn8.OptionsColumn.AllowEdit = false; - this.gridColumn8.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn8.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn8.OptionsColumn.ReadOnly = true; - this.gridColumn8.Visible = true; - this.gridColumn8.VisibleIndex = 19; - this.gridColumn8.Width = 40; - // - // gridColumn31 - // - this.gridColumn31.Caption = "身份证照片"; - this.gridColumn31.ColumnEdit = this.repositoryItemImageEdit1; - this.gridColumn31.FieldName = "Photo"; - this.gridColumn31.Name = "gridColumn31"; - this.gridColumn31.Visible = true; - this.gridColumn31.VisibleIndex = 21; - // - // repositoryItemImageEdit1 - // - this.repositoryItemImageEdit1.AutoHeight = false; - this.repositoryItemImageEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { - new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}); - this.repositoryItemImageEdit1.Name = "repositoryItemImageEdit1"; - // - // panel6 - // - this.panel6.BackColor = System.Drawing.Color.White; - this.panel6.Controls.Add(this.OpsPatient); - this.panel6.Controls.Add(this.label2); - this.panel6.Dock = System.Windows.Forms.DockStyle.Top; - this.panel6.Location = new System.Drawing.Point(0, 0); - this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(933, 41); - this.panel6.TabIndex = 129; - // - // OpsPatient - // - this.OpsPatient.Dock = System.Windows.Forms.DockStyle.Fill; - this.OpsPatient.Location = new System.Drawing.Point(136, 0); - this.OpsPatient.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.OpsPatient.Name = "OpsPatient"; - this.OpsPatient.Size = new System.Drawing.Size(797, 41); - this.OpsPatient.TabIndex = 1; - // - // label2 - // - this.label2.Dock = System.Windows.Forms.DockStyle.Left; - this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(136, 41); - this.label2.TabIndex = 0; - this.label2.Text = "人员基础信息库"; - this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; - // - // PatientForm - // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(933, 637); - this.Controls.Add(this.DgcPatient); - this.Controls.Add(this.panel6); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "PatientForm"; - this.Text = "人员基本信息"; - ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.DgvPatient)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.repositoryItemImageEdit1)).EndInit(); - this.panel6.ResumeLayout(false); - this.ResumeLayout(false); - - } - - #endregion - - private DevExpress.XtraGrid.GridControl DgcPatient; - private DevExpress.XtraGrid.Views.Grid.GridView DgvPatient; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn1; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn3; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn4; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn5; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn9; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn11; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn6; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn10; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn8; - private System.Windows.Forms.Panel panel6; - private UControl.OpMenuSimple OpsPatient; - private System.Windows.Forms.Label label2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn14; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn15; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn16; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn17; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn19; - private DevExpress.XtraGrid.Columns.GridColumn colContactor2; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn27; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn28; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn29; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn30; - private DevExpress.XtraGrid.Columns.GridColumn gridColumn31; - private DevExpress.XtraEditors.Repository.RepositoryItemImageEdit repositoryItemImageEdit1; - } -} \ No newline at end of file diff --git a/PEIS/View/Base/PatientForm.cs b/PEIS/View/Base/PatientForm.cs deleted file mode 100644 index 65aad28..0000000 --- a/PEIS/View/Base/PatientForm.cs +++ /dev/null @@ -1,40 +0,0 @@ -using PEIS.Base; -using PEIS.Entity; -using PEIS.Event; -using PEIS.Presenter; -using System; -using System.Collections.Generic; - -namespace PEIS.View.Base -{ - public partial class PatientForm : ViewBase, IBasePatientView - { - public PatientForm() - { - InitializeComponent(); - Shown += PatientForm_Shown; - } - - protected override object CreatePresenter() - { - return new BasePatientPresenter(this); - } - - private void PatientForm_Shown(object sender, EventArgs e) - { - OnGetBasePatient(); - } - - public event EventHandler> GetBasePatient; - - protected virtual void OnGetBasePatient() - { - GetBasePatient?.Invoke(this, new Args { }); - } - - public void ShowBasePatient(List items) - { - DgcPatient.DataSource = items; - } - } -} diff --git a/PEIS/View/Base/PatientForm.resx b/PEIS/View/Base/PatientForm.resx deleted file mode 100644 index 1af7de1..0000000 --- a/PEIS/View/Base/PatientForm.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - \ No newline at end of file diff --git a/PEIS/View/Base/PersonForm.Designer.cs b/PEIS/View/Base/PersonForm.Designer.cs index 09a5c3c..2374947 100644 --- a/PEIS/View/Base/PersonForm.Designer.cs +++ b/PEIS/View/Base/PersonForm.Designer.cs @@ -54,8 +54,8 @@ this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit(); this.panel6 = new System.Windows.Forms.Panel(); - this.label2 = new System.Windows.Forms.Label(); this.OpsPatient = new PEIS.View.UControl.OpMenu(); + this.label2 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvPatient)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemImageEdit1)).BeginInit(); @@ -65,12 +65,14 @@ // DgcPatient // this.DgcPatient.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcPatient.Location = new System.Drawing.Point(0, 41); + this.DgcPatient.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.DgcPatient.Location = new System.Drawing.Point(0, 75); this.DgcPatient.MainView = this.DgvPatient; + this.DgcPatient.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcPatient.Name = "DgcPatient"; this.DgcPatient.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemImageEdit1}); - this.DgcPatient.Size = new System.Drawing.Size(933, 596); + this.DgcPatient.Size = new System.Drawing.Size(1866, 1087); this.DgcPatient.TabIndex = 130; this.DgcPatient.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvPatient}); @@ -110,26 +112,27 @@ this.gridColumn31}); this.DgvPatient.FixedLineWidth = 1; this.DgvPatient.GridControl = this.DgcPatient; - this.DgvPatient.IndicatorWidth = 30; + this.DgvPatient.IndicatorWidth = 70; this.DgvPatient.Name = "DgvPatient"; this.DgvPatient.OptionsSelection.MultiSelect = true; this.DgvPatient.OptionsView.ColumnAutoWidth = false; this.DgvPatient.OptionsView.ShowGroupPanel = false; - this.DgvPatient.RowHeight = 30; + this.DgvPatient.RowHeight = 45; // // gridColumn1 // - this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.gridColumn1.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn1.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen; this.gridColumn1.AppearanceCell.Options.UseFont = true; this.gridColumn1.AppearanceCell.Options.UseForeColor = true; this.gridColumn1.Caption = "姓名"; this.gridColumn1.FieldName = "Name"; this.gridColumn1.Name = "gridColumn1"; - this.gridColumn1.OptionsColumn.AllowEdit = false; this.gridColumn1.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn1.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn1.OptionsColumn.AllowMove = false; this.gridColumn1.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn1.OptionsColumn.ReadOnly = true; + this.gridColumn1.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn1.OptionsFilter.AllowFilter = false; this.gridColumn1.Visible = true; this.gridColumn1.VisibleIndex = 0; @@ -137,17 +140,18 @@ // // gridColumn2 // - this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.gridColumn2.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn2.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen; this.gridColumn2.AppearanceCell.Options.UseFont = true; this.gridColumn2.AppearanceCell.Options.UseForeColor = true; this.gridColumn2.Caption = "性别"; this.gridColumn2.FieldName = "Sex"; this.gridColumn2.Name = "gridColumn2"; - this.gridColumn2.OptionsColumn.AllowEdit = false; this.gridColumn2.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn2.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn2.OptionsColumn.AllowMove = false; this.gridColumn2.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn2.OptionsColumn.ReadOnly = true; + this.gridColumn2.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn2.OptionsFilter.AllowFilter = false; this.gridColumn2.Visible = true; this.gridColumn2.VisibleIndex = 1; @@ -155,13 +159,15 @@ // // gridColumn3 // + this.gridColumn3.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn3.AppearanceCell.Options.UseFont = true; this.gridColumn3.Caption = "出生年月"; this.gridColumn3.FieldName = "Birthday"; this.gridColumn3.Name = "gridColumn3"; - this.gridColumn3.OptionsColumn.AllowEdit = false; this.gridColumn3.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn3.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn3.OptionsColumn.AllowMove = false; this.gridColumn3.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn3.OptionsColumn.ReadOnly = true; this.gridColumn3.OptionsFilter.AllowFilter = false; this.gridColumn3.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] { new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")}); @@ -171,12 +177,17 @@ // // gridColumn4 // + this.gridColumn4.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn4.AppearanceCell.Options.UseFont = true; this.gridColumn4.Caption = "证件类型"; this.gridColumn4.FieldName = "CardType"; this.gridColumn4.Name = "gridColumn4"; this.gridColumn4.OptionsColumn.AllowEdit = false; this.gridColumn4.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn4.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn4.OptionsColumn.AllowMove = false; this.gridColumn4.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn4.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn4.OptionsColumn.ReadOnly = true; this.gridColumn4.OptionsFilter.AllowFilter = false; this.gridColumn4.Visible = true; @@ -185,17 +196,18 @@ // // gridColumn5 // - this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn5.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen; this.gridColumn5.AppearanceCell.Options.UseFont = true; this.gridColumn5.AppearanceCell.Options.UseForeColor = true; this.gridColumn5.Caption = "证件号码"; this.gridColumn5.FieldName = "CardNo"; this.gridColumn5.Name = "gridColumn5"; - this.gridColumn5.OptionsColumn.AllowEdit = false; this.gridColumn5.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn5.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn5.OptionsColumn.AllowMove = false; this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn5.OptionsColumn.ReadOnly = true; + this.gridColumn5.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn5.OptionsFilter.AllowFilter = false; this.gridColumn5.Visible = true; this.gridColumn5.VisibleIndex = 4; @@ -203,7 +215,7 @@ // // gridColumn7 // - this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.gridColumn7.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.ForestGreen; this.gridColumn7.AppearanceCell.Options.UseFont = true; this.gridColumn7.AppearanceCell.Options.UseForeColor = true; @@ -212,7 +224,10 @@ this.gridColumn7.Name = "gridColumn7"; this.gridColumn7.OptionsColumn.AllowEdit = false; this.gridColumn7.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn7.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn7.OptionsColumn.AllowMove = false; this.gridColumn7.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn7.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn7.OptionsColumn.ReadOnly = true; this.gridColumn7.Visible = true; this.gridColumn7.VisibleIndex = 5; @@ -220,26 +235,32 @@ // // gridColumn11 // + this.gridColumn11.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn11.AppearanceCell.Options.UseFont = true; this.gridColumn11.Caption = "学历"; this.gridColumn11.FieldName = "Education"; this.gridColumn11.Name = "gridColumn11"; - this.gridColumn11.OptionsColumn.AllowEdit = false; this.gridColumn11.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn11.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn11.OptionsColumn.AllowMove = false; this.gridColumn11.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn11.OptionsColumn.ReadOnly = true; + this.gridColumn11.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn11.Visible = true; this.gridColumn11.VisibleIndex = 6; this.gridColumn11.Width = 60; // // gridColumn6 // + this.gridColumn6.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn6.AppearanceCell.Options.UseFont = true; this.gridColumn6.Caption = "婚况"; this.gridColumn6.FieldName = "Marriage"; this.gridColumn6.Name = "gridColumn6"; - this.gridColumn6.OptionsColumn.AllowEdit = false; this.gridColumn6.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn6.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn6.OptionsColumn.AllowMove = false; this.gridColumn6.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn6.OptionsColumn.ReadOnly = true; + this.gridColumn6.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn6.OptionsFilter.AllowFilter = false; this.gridColumn6.Visible = true; this.gridColumn6.VisibleIndex = 7; @@ -247,129 +268,161 @@ // // gridColumn14 // + this.gridColumn14.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn14.AppearanceCell.Options.UseFont = true; this.gridColumn14.Caption = "职业"; this.gridColumn14.FieldName = "Occupation"; this.gridColumn14.Name = "gridColumn14"; - this.gridColumn14.OptionsColumn.AllowEdit = false; this.gridColumn14.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn14.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn14.OptionsColumn.AllowMove = false; this.gridColumn14.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn14.OptionsColumn.ReadOnly = true; + this.gridColumn14.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn14.Visible = true; this.gridColumn14.VisibleIndex = 8; // // gridColumn15 // + this.gridColumn15.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn15.AppearanceCell.Options.UseFont = true; this.gridColumn15.Caption = "工作单位"; this.gridColumn15.FieldName = "Company"; this.gridColumn15.Name = "gridColumn15"; - this.gridColumn15.OptionsColumn.AllowEdit = false; this.gridColumn15.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn15.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn15.OptionsColumn.AllowMove = false; this.gridColumn15.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn15.OptionsColumn.ReadOnly = true; + this.gridColumn15.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn15.Visible = true; this.gridColumn15.VisibleIndex = 15; this.gridColumn15.Width = 200; // // gridColumn16 // + this.gridColumn16.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn16.AppearanceCell.Options.UseFont = true; this.gridColumn16.Caption = "籍贯"; this.gridColumn16.FieldName = "CardAddress"; this.gridColumn16.Name = "gridColumn16"; - this.gridColumn16.OptionsColumn.AllowEdit = false; this.gridColumn16.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn16.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn16.OptionsColumn.AllowMove = false; this.gridColumn16.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn16.OptionsColumn.ReadOnly = true; + this.gridColumn16.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn16.Visible = true; this.gridColumn16.VisibleIndex = 16; this.gridColumn16.Width = 200; // // gridColumn17 // + this.gridColumn17.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn17.AppearanceCell.Options.UseFont = true; this.gridColumn17.Caption = "联系人1"; this.gridColumn17.FieldName = "Contactor1"; this.gridColumn17.Name = "gridColumn17"; - this.gridColumn17.OptionsColumn.AllowEdit = false; this.gridColumn17.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn17.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn17.OptionsColumn.AllowMove = false; this.gridColumn17.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn17.OptionsColumn.ReadOnly = true; + this.gridColumn17.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn17.Visible = true; this.gridColumn17.VisibleIndex = 9; // // gridColumn9 // + this.gridColumn9.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn9.AppearanceCell.Options.UseFont = true; this.gridColumn9.Caption = "联系电话1"; this.gridColumn9.FieldName = "Tel1"; this.gridColumn9.Name = "gridColumn9"; - this.gridColumn9.OptionsColumn.AllowEdit = false; this.gridColumn9.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn9.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn9.OptionsColumn.AllowMove = false; this.gridColumn9.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn9.OptionsColumn.ReadOnly = true; + this.gridColumn9.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn9.Visible = true; this.gridColumn9.VisibleIndex = 10; this.gridColumn9.Width = 100; // // gridColumn19 // + this.gridColumn19.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn19.AppearanceCell.Options.UseFont = true; this.gridColumn19.Caption = "联系地址1"; this.gridColumn19.FieldName = "Address1"; this.gridColumn19.Name = "gridColumn19"; - this.gridColumn19.OptionsColumn.AllowEdit = false; this.gridColumn19.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn19.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn19.OptionsColumn.AllowMove = false; this.gridColumn19.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn19.OptionsColumn.ReadOnly = true; + this.gridColumn19.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn19.Visible = true; this.gridColumn19.VisibleIndex = 11; // // gridColumn21 // + this.gridColumn21.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn21.AppearanceCell.Options.UseFont = true; this.gridColumn21.Caption = "联系人2"; this.gridColumn21.Name = "gridColumn21"; - this.gridColumn21.OptionsColumn.AllowEdit = false; this.gridColumn21.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn21.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn21.OptionsColumn.AllowMove = false; this.gridColumn21.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn21.OptionsColumn.ReadOnly = true; + this.gridColumn21.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn21.Visible = true; this.gridColumn21.VisibleIndex = 12; // // gridColumn10 // + this.gridColumn10.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn10.AppearanceCell.Options.UseFont = true; this.gridColumn10.Caption = "联系电话2"; this.gridColumn10.FieldName = "Tel2"; this.gridColumn10.Name = "gridColumn10"; - this.gridColumn10.OptionsColumn.AllowEdit = false; this.gridColumn10.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn10.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn10.OptionsColumn.AllowMove = false; this.gridColumn10.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn10.OptionsColumn.ReadOnly = true; + this.gridColumn10.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn10.Visible = true; this.gridColumn10.VisibleIndex = 13; this.gridColumn10.Width = 100; // // gridColumn27 // + this.gridColumn27.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn27.AppearanceCell.Options.UseFont = true; this.gridColumn27.Caption = "联系地址2"; this.gridColumn27.FieldName = "Address2"; this.gridColumn27.Name = "gridColumn27"; - this.gridColumn27.OptionsColumn.AllowEdit = false; this.gridColumn27.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn27.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn27.OptionsColumn.AllowMove = false; this.gridColumn27.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn27.OptionsColumn.ReadOnly = true; + this.gridColumn27.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn27.Visible = true; this.gridColumn27.VisibleIndex = 14; // // gridColumn28 // + this.gridColumn28.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn28.AppearanceCell.Options.UseFont = true; this.gridColumn28.Caption = "备注"; this.gridColumn28.FieldName = "Description"; this.gridColumn28.Name = "gridColumn28"; - this.gridColumn28.OptionsColumn.AllowEdit = false; this.gridColumn28.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn28.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn28.OptionsColumn.AllowMove = false; this.gridColumn28.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn28.OptionsColumn.ReadOnly = true; + this.gridColumn28.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; this.gridColumn28.Visible = true; this.gridColumn28.VisibleIndex = 17; // // gridColumn29 // + this.gridColumn29.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn29.AppearanceCell.Options.UseFont = true; this.gridColumn29.Caption = "建档时间"; this.gridColumn29.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime; this.gridColumn29.FieldName = "CreateTime"; @@ -384,6 +437,8 @@ // // gridColumn30 // + this.gridColumn30.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn30.AppearanceCell.Options.UseFont = true; this.gridColumn30.Caption = "建档人"; this.gridColumn30.FieldName = "Creator"; this.gridColumn30.Name = "gridColumn30"; @@ -396,6 +451,8 @@ // // gridColumn8 // + this.gridColumn8.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn8.AppearanceCell.Options.UseFont = true; this.gridColumn8.Caption = "ID"; this.gridColumn8.FieldName = "ID"; this.gridColumn8.Name = "gridColumn8"; @@ -409,10 +466,19 @@ // // gridColumn31 // + this.gridColumn31.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F); + this.gridColumn31.AppearanceCell.Options.UseFont = true; this.gridColumn31.Caption = "身份证照片"; this.gridColumn31.ColumnEdit = this.repositoryItemImageEdit1; this.gridColumn31.FieldName = "Photo"; this.gridColumn31.Name = "gridColumn31"; + this.gridColumn31.OptionsColumn.AllowEdit = false; + this.gridColumn31.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn31.OptionsColumn.AllowMove = false; + this.gridColumn31.OptionsColumn.AllowSize = false; + this.gridColumn31.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn31.OptionsColumn.ReadOnly = true; + this.gridColumn31.OptionsFilter.AllowFilter = false; this.gridColumn31.Visible = true; this.gridColumn31.VisibleIndex = 21; // @@ -430,40 +496,42 @@ this.panel6.Controls.Add(this.label2); this.panel6.Dock = System.Windows.Forms.DockStyle.Top; this.panel6.Location = new System.Drawing.Point(0, 0); + this.panel6.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(933, 41); + this.panel6.Size = new System.Drawing.Size(1866, 75); this.panel6.TabIndex = 129; // + // OpsPatient + // + this.OpsPatient.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.OpsPatient.Dock = System.Windows.Forms.DockStyle.Fill; + this.OpsPatient.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.OpsPatient.Location = new System.Drawing.Point(272, 0); + this.OpsPatient.Margin = new System.Windows.Forms.Padding(4, 7, 4, 7); + this.OpsPatient.Name = "OpsPatient"; + this.OpsPatient.Size = new System.Drawing.Size(1594, 75); + this.OpsPatient.TabIndex = 1; + // // label2 // this.label2.Dock = System.Windows.Forms.DockStyle.Left; this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Location = new System.Drawing.Point(0, 0); + this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(136, 41); + this.label2.Size = new System.Drawing.Size(272, 75); this.label2.TabIndex = 0; this.label2.Text = "人员基础信息库"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // OpsPatient - // - this.OpsPatient.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; - this.OpsPatient.Dock = System.Windows.Forms.DockStyle.Fill; - this.OpsPatient.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.OpsPatient.Location = new System.Drawing.Point(136, 0); - this.OpsPatient.Margin = new System.Windows.Forms.Padding(2, 4, 2, 4); - this.OpsPatient.Name = "OpsPatient"; - this.OpsPatient.Size = new System.Drawing.Size(797, 41); - this.OpsPatient.TabIndex = 1; - // // PersonForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(933, 637); + this.ClientSize = new System.Drawing.Size(1866, 1162); this.Controls.Add(this.DgcPatient); this.Controls.Add(this.panel6); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7); this.Name = "PersonForm"; this.Text = "人员基本信息"; ((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).EndInit(); diff --git a/PEIS/View/Base/PersonForm.cs b/PEIS/View/Base/PersonForm.cs index 0d7040a..4396c06 100644 --- a/PEIS/View/Base/PersonForm.cs +++ b/PEIS/View/Base/PersonForm.cs @@ -12,7 +12,8 @@ namespace PEIS.View.Base { public partial class PersonForm : ViewBase, IBasePatientView { - List _lstBasePatients = null; + private BasePatient _baseInfo = null; + private List _lstBasePatients = null; public PersonForm() { @@ -23,15 +24,59 @@ namespace PEIS.View.Base OpsPatient.TsmiAdd.Click += TsmiAdd_Click; // 性别转换 DgvPatient.CustomColumnDisplayText += DgvPatient_CustomColumnDisplayText; + DgvPatient.CustomDrawRowIndicator += DgvPatient_CustomDrawRowIndicator; + DgvPatient.SelectionChanged += DgvPatient_SelectionChanged; // 刷新 OpsPatient.TsmiRefresh.Click += (sender, e) => OnGetBasePatient(); + // 保存 + OpsPatient.TsmiSave.Click += TsmiSave_Click; OpsPatient.TsmiDelete.Visible = false; - OpsPatient.TsmiSave.Visible = false; OpsPatient.TsmiSearch.Visible = false; OpsPatient.TstbKey.KeyDown += TstbKey_KeyDown; + } + + private void TsmiSave_Click(object sender, EventArgs e) + { + if (_baseInfo == null) return; + // 使当前控件获得焦点，避免日期选择器修改后未生效 + OpsPatient.Focus(); + BasePatient basePatient = new BasePatient() + { + ID = _baseInfo.ID, + Name = _baseInfo.Name, + Sex = _baseInfo.Sex == "男" ? "1" : "2", + Birthday = DateTime.Parse(_baseInfo.Birthday?.ToShortDateString()), + CardNo = _baseInfo.CardNo, + CardType = _baseInfo.CardType, + CardAddress = _baseInfo.CardAddress, + Tel1 = _baseInfo.Tel1, + Tel2 = _baseInfo.Tel2, + Contactor1 = _baseInfo.Contactor1, + Contactor2 = _baseInfo.Contactor2, + Address1 = _baseInfo.Address1, + Address2 = _baseInfo.Address2, + Marriage = _baseInfo.Marriage, + Education = _baseInfo.Education, + Occupation = _baseInfo.Occupation, + Company = _baseInfo.Company, + CreateTime = _baseInfo.CreateTime, + CreatorCode = _baseInfo.CreatorCode, + Creator = _baseInfo.Creator + }; + basePatient.Update(); + } - DgvPatient.Initialize(); + private void DgvPatient_SelectionChanged(object sender, DevExpress.Data.SelectionChangedEventArgs e) + { + if (DgvPatient.GetRowCellValue(DgvPatient.GetSelectedRows()[0], "ID") == null) return; + _baseInfo = DgvPatient.GetRow(DgvPatient.GetSelectedRows()[0]) as BasePatient; + } + + private void DgvPatient_CustomDrawRowIndicator(object sender, DevExpress.XtraGrid.Views.Grid.RowIndicatorCustomDrawEventArgs e) + { + if (e.RowHandle >= 0) + e.Info.DisplayText = (e.RowHandle + 1).ToString(); } private void TstbKey_KeyDown(object sender, KeyEventArgs e) @@ -76,10 +121,11 @@ namespace PEIS.View.Base Invoke(new Action(() => _lstBasePatients = items)); Invoke(new Action(() => DgcPatient.DataSource = null)); Invoke(new Action(() => DgcPatient.DataSource = _lstBasePatients)); + Invoke(new Action(() => DgvPatient.BestFitColumns())); } protected virtual void OnGetBasePatient() { - GetBasePatient?.Invoke(this, new Args{ Code = OpsPatient.TstbKey.Text.Trim() == "输入条件查询" ? null : string.IsNullOrEmpty(OpsPatient.TstbKey.Text) ? null : OpsPatient.TstbKey.Text.Trim() }); + GetBasePatient?.Invoke(this, new Args { Code = OpsPatient.TstbKey.Text.Trim() == "输入条件查询" ? null : string.IsNullOrEmpty(OpsPatient.TstbKey.Text) ? null : OpsPatient.TstbKey.Text.Trim() }); } #endregion