Recoding
/
PEIS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加蒙自个性化功能等

Browse Source 
1.团体登记增加从体检者复制项目功能
2.增加页面允许重复打开功能, 开关在Dict_Config表
3.团体登记的导出人员名单报表的金额修改为总订单金额
dhzzyy
LiJiaWen 3 weeks ago
parent 4b4c4925c6
commit 9e2e95a0eb
9 changed files with 577 additions and 67 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 39
      PEIS/Model/Enrollment/EnrollmentOrgModel.cs
  2. 8
      PEIS/Presenter/EnrollmentOrgPresenter.cs
  3. 7
      PEIS/Utils/Global.cs
  4. 387
      PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
  5. 114
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  6. 12
      PEIS/View/Enrollment/EnrollmentOrgForm.resx
  7. 52
      PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs
  8. 4
      PEIS/View/Enrollment/IEnrollmentOrgView.cs
  9. 21
      PEIS/View/MainForm.cs

39
PEIS/Model/Enrollment/EnrollmentOrgModel.cs
Unescape View File

@ -146,9 +146,9 @@ namespace PEIS.Model.Enrollment
a.Tel1,
c.DeptName,
a.SignTime,
(SELECT SUM ([sum]) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL AND CancelTime IS NULL ) AS Price,
(SELECT ROUND(CAST(ISNULL((SUM (Fee) / NULLIF(SUM([Sum]),0) * 10),0) AS DECIMAL(10,2)), 2) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL AND CancelTime IS NULL ) AS Discount,
(SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL) AS Fee,
(SELECT SUM ([sum]) FROM Enrollment_CheckCost WHERE a.ID = EID AND DeleteTime IS NULL AND CancelTime IS NULL ) AS Price,
(SELECT ROUND(CAST(ISNULL((SUM (Fee) / NULLIF(SUM([Sum]),0) * 10),0) AS DECIMAL(10,2)), 2) FROM Enrollment_CheckCost WHERE a.ID = EID AND DeleteTime IS NULL AND CancelTime IS NULL ) AS Discount,
(SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND DeleteTime IS NULL) AS Fee,
a.Description
FROM
Enrollment_Patient a
@ -157,5 +157,38 @@ namespace PEIS.Model.Enrollment
WHERE
a.OEID = {oeID} ORDER BY a.SignTime");
}
public List<EnrollmentPatient> GetCopyList(String name, Int64 oeID)
{
if (string.IsNullOrEmpty(name)) return new List<EnrollmentPatient>();
return DAOHelp.GetDataBySQL<EnrollmentPatient>($@"SELECT
ID,
Sex,
Age,
Name,
Tel1,
AgeClass,
SignTime,
Address1,
Contactor1,
CreateTime,
CASE
WHEN FinishTime IS NOT NULL THEN '3'
WHEN SignTime IS NOT NULL THEN '2'
WHEN SignTime IS NULL THEN '1'
END AS Signer,
FinishTime,
SpellCode
FROM
Enrollment_Patient
WHERE
( Name like '%{name}%' or id like '%{name}%' or SpellCode like '{name}%')
AND OEID = {oeID}
AND PID IS NOT NULL
AND WeChatStatus IN ( 0, 1 )
ORDER BY
CreateTime DESC");
}
}
}

8
PEIS/Presenter/EnrollmentOrgPresenter.cs
Unescape View File

@ -84,7 +84,7 @@ namespace PEIS.Presenter
};
View.GetEnrollmentFeeItem += (send, args) =>
{
View.ShowEnrollmentFeeItem(new EnrollmentFeeItemModel().GetItemsByEnrollmentID(args.EnrollmentID));
View.ShowEnrollmentFeeItem(new EnrollmentFeeItemModel().GetItemsByEnrollmentID(args.EnrollmentID), args.Code);
};
View.GetCheckCost += (send, args) =>
{
@ -135,7 +135,7 @@ namespace PEIS.Presenter
};
View.DelItemByPackId += (send, args) =>
{
if(args.ID == 0)
if (args.ID == 0)
{
new EnrollmentOrgFeeItemModel().DelItemByPackID(args.GroupID, args.PackID);
}
@ -168,6 +168,10 @@ namespace PEIS.Presenter
{
View.ShowExcelList(new EnrollmentOrgModel().GetExcelList(args.EnrollmentOID));
};
View.GetCopyRegItems += (send, args) =>
{
View.ShowCopyRegItems(new EnrollmentOrgModel().GetCopyList(args.Name, args.EnrollmentOID));
};
}
}
}

7
PEIS/Utils/Global.cs
Unescape View File

@ -36,6 +36,13 @@ namespace PEIS.Utils
return Global._lstConfig.FirstOrDefault(x => x.Key == "HisDBName")?.Value ?? "his.hisdata.dbo";
}
}
public static string AllowDuplicateTabs
{
get
{
return Global._lstConfig.FirstOrDefault(x => x.Key == "AllowDuplicateTabs")?.Value ?? "0";
}
}
/// <summary>
/// 配置信息

387
PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs generated
Unescape View File

@ -271,6 +271,8 @@
this.splitter5 = new System.Windows.Forms.Splitter();
this.panel8 = new System.Windows.Forms.Panel();
this.DgcEnrollmentFeeItem = new DevExpress.XtraGrid.GridControl();
this.EFeeItemMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.EnrollmentPartOption = new System.Windows.Forms.ToolStripMenuItem();
this.DgvEnrollmentFeeItem = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn110 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn111 = new DevExpress.XtraGrid.Columns.GridColumn();
@ -288,8 +290,6 @@
this.tabControl2 = new System.Windows.Forms.TabControl();
this.tabPage1 = new System.Windows.Forms.TabPage();
this.DgcPack2 = new DevExpress.XtraGrid.GridControl();
this.EFeeItemMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
this.EnrollmentPartOption = new System.Windows.Forms.ToolStripMenuItem();
this.DgvPack2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn126 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn127 = new DevExpress.XtraGrid.Columns.GridColumn();
@ -313,6 +313,25 @@
this.repositoryItemCheckEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.gridView6 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.FeeItemSearch2 = new System.Windows.Forms.TextBox();
this.tabPage3 = new System.Windows.Forms.TabPage();
this.DgcCopyItem = new DevExpress.XtraGrid.GridControl();
this.DgvCopyItem = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn162 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn165 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn166 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn167 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn168 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn169 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn170 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn171 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel14 = new System.Windows.Forms.Panel();
this.NameSearch2 = new System.Windows.Forms.TextBox();
this.DgcRegItem2 = new DevExpress.XtraGrid.GridControl();
this.DgvRegItem2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn172 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn173 = new DevExpress.XtraGrid.Columns.GridColumn();
this.CopyMenu = new System.Windows.Forms.MenuStrip();
this.TsmiCopyFeeItem = new System.Windows.Forms.ToolStripMenuItem();
this.panel7 = new System.Windows.Forms.Panel();
this.menuStrip1 = new System.Windows.Forms.MenuStrip();
this.TsmiCheckOrg = new System.Windows.Forms.ToolStripMenuItem();
@ -470,12 +489,12 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit3)).BeginInit();
this.panel8.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcEnrollmentFeeItem)).BeginInit();
this.EFeeItemMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgvEnrollmentFeeItem)).BeginInit();
this.PnlFeeItem.SuspendLayout();
this.tabControl2.SuspendLayout();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcPack2)).BeginInit();
this.EFeeItemMenu.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgvPack2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
this.tabPage2.SuspendLayout();
@ -483,6 +502,13 @@
((System.ComponentModel.ISupportInitialize)(this.DgvFeeItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView6)).BeginInit();
this.tabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcCopyItem)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DgvCopyItem)).BeginInit();
this.panel14.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcRegItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DgvRegItem2)).BeginInit();
this.CopyMenu.SuspendLayout();
this.panel7.SuspendLayout();
this.menuStrip1.SuspendLayout();
this.panel11.SuspendLayout();
@ -3920,6 +3946,20 @@
this.DgcEnrollmentFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvEnrollmentFeeItem});
//
// EFeeItemMenu
//
this.EFeeItemMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.EnrollmentPartOption});
this.EFeeItemMenu.Name = "EFeeItemMenu";
this.EFeeItemMenu.Size = new System.Drawing.Size(125, 26);
//
// EnrollmentPartOption
//
this.EnrollmentPartOption.Image = global::PEIS.Properties.Resources.个人信息__1_;
this.EnrollmentPartOption.Name = "EnrollmentPartOption";
this.EnrollmentPartOption.Size = new System.Drawing.Size(124, 22);
this.EnrollmentPartOption.Text = "选择部位";
//
// DgvEnrollmentFeeItem
//
this.DgvEnrollmentFeeItem.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.8F);
@ -4172,6 +4212,7 @@
//
this.tabControl2.Controls.Add(this.tabPage1);
this.tabControl2.Controls.Add(this.tabPage2);
this.tabControl2.Controls.Add(this.tabPage3);
this.tabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
this.tabControl2.Location = new System.Drawing.Point(0, 0);
this.tabControl2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
@ -4204,20 +4245,6 @@
this.DgvPack2,
this.gridView4});
//
// EFeeItemMenu
//
this.EFeeItemMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.EnrollmentPartOption});
this.EFeeItemMenu.Name = "EFeeItemMenu";
this.EFeeItemMenu.Size = new System.Drawing.Size(125, 26);
//
// EnrollmentPartOption
//
this.EnrollmentPartOption.Image = global::PEIS.Properties.Resources.个人信息__1_;
this.EnrollmentPartOption.Name = "EnrollmentPartOption";
this.EnrollmentPartOption.Size = new System.Drawing.Size(124, 22);
this.EnrollmentPartOption.Text = "选择部位";
//
// DgvPack2
//
this.DgvPack2.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
@ -4575,6 +4602,301 @@
this.FeeItemSearch2.Size = new System.Drawing.Size(368, 22);
this.FeeItemSearch2.TabIndex = 137;
//
// tabPage3
//
this.tabPage3.Controls.Add(this.DgcCopyItem);
this.tabPage3.Controls.Add(this.panel14);
this.tabPage3.Controls.Add(this.CopyMenu);
this.tabPage3.Location = new System.Drawing.Point(4, 23);
this.tabPage3.Name = "tabPage3";
this.tabPage3.Padding = new System.Windows.Forms.Padding(3);
this.tabPage3.Size = new System.Drawing.Size(372, 362);
this.tabPage3.TabIndex = 2;
this.tabPage3.Text = "从体检者复制项目";
this.tabPage3.UseVisualStyleBackColor = true;
//
// DgcCopyItem
//
this.DgcCopyItem.Dock = System.Windows.Forms.DockStyle.Fill;
this.DgcCopyItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcCopyItem.Location = new System.Drawing.Point(143, 31);
this.DgcCopyItem.MainView = this.DgvCopyItem;
this.DgcCopyItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcCopyItem.Name = "DgcCopyItem";
this.DgcCopyItem.Size = new System.Drawing.Size(226, 328);
this.DgcCopyItem.TabIndex = 33;
this.DgcCopyItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvCopyItem});
//
// DgvCopyItem
//
this.DgvCopyItem.Appearance.FooterPanel.Font = new System.Drawing.Font("微软雅黑", 10.8F);
this.DgvCopyItem.Appearance.FooterPanel.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(84)))), ((int)(((byte)(48)))), ((int)(((byte)(240)))));
this.DgvCopyItem.Appearance.FooterPanel.Options.UseFont = true;
this.DgvCopyItem.Appearance.FooterPanel.Options.UseForeColor = true;
this.DgvCopyItem.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 10F);
this.DgvCopyItem.Appearance.Row.Options.UseFont = true;
this.DgvCopyItem.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn162,
this.gridColumn165,
this.gridColumn166,
this.gridColumn167,
this.gridColumn168,
this.gridColumn169,
this.gridColumn170,
this.gridColumn171});
this.DgvCopyItem.GridControl = this.DgcCopyItem;
this.DgvCopyItem.Name = "DgvCopyItem";
this.DgvCopyItem.OptionsBehavior.Editable = false;
this.DgvCopyItem.OptionsMenu.EnableColumnMenu = false;
this.DgvCopyItem.OptionsView.AllowCellMerge = true;
this.DgvCopyItem.OptionsView.ColumnAutoWidth = false;
this.DgvCopyItem.OptionsView.ShowGroupPanel = false;
this.DgvCopyItem.OptionsView.ShowIndicator = false;
this.DgvCopyItem.RowHeight = 35;
//
// gridColumn162
//
this.gridColumn162.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn162.AppearanceCell.Options.UseFont = true;
this.gridColumn162.Caption = "套餐";
this.gridColumn162.FieldName = "PackName";
this.gridColumn162.Name = "gridColumn162";
this.gridColumn162.OptionsColumn.AllowEdit = false;
this.gridColumn162.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn162.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.True;
this.gridColumn162.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn162.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn162.OptionsColumn.ReadOnly = true;
this.gridColumn162.OptionsFilter.AllowFilter = false;
this.gridColumn162.Visible = true;
this.gridColumn162.VisibleIndex = 0;
this.gridColumn162.Width = 147;
//
// gridColumn165
//
this.gridColumn165.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn165.AppearanceCell.Options.UseFont = true;
this.gridColumn165.Caption = "收费项目";
this.gridColumn165.FieldName = "FeeItemName";
this.gridColumn165.Name = "gridColumn165";
this.gridColumn165.OptionsColumn.AllowEdit = false;
this.gridColumn165.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn165.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn165.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn165.OptionsColumn.ReadOnly = true;
this.gridColumn165.OptionsFilter.AllowFilter = false;
this.gridColumn165.Visible = true;
this.gridColumn165.VisibleIndex = 1;
//
// gridColumn166
//
this.gridColumn166.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn166.AppearanceCell.Options.UseFont = true;
this.gridColumn166.Caption = "收费价格";
this.gridColumn166.FieldName = "Price";
this.gridColumn166.Name = "gridColumn166";
this.gridColumn166.OptionsColumn.AllowEdit = false;
this.gridColumn166.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn166.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn166.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn166.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn166.OptionsColumn.ReadOnly = true;
this.gridColumn166.OptionsFilter.AllowFilter = false;
this.gridColumn166.Visible = true;
this.gridColumn166.VisibleIndex = 2;
//
// gridColumn167
//
this.gridColumn167.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn167.AppearanceCell.Options.UseFont = true;
this.gridColumn167.Caption = "核算价格";
this.gridColumn167.FieldName = "SettlePrice";
this.gridColumn167.Name = "gridColumn167";
this.gridColumn167.OptionsColumn.AllowEdit = false;
this.gridColumn167.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn167.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn167.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn167.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn167.OptionsColumn.ReadOnly = true;
this.gridColumn167.OptionsFilter.AllowFilter = false;
this.gridColumn167.Visible = true;
this.gridColumn167.VisibleIndex = 3;
//
// gridColumn168
//
this.gridColumn168.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn168.AppearanceCell.Options.UseFont = true;
this.gridColumn168.Caption = "执行科室";
this.gridColumn168.FieldName = "DeptName";
this.gridColumn168.Name = "gridColumn168";
this.gridColumn168.OptionsColumn.AllowEdit = false;
this.gridColumn168.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn168.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.True;
this.gridColumn168.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn168.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn168.OptionsColumn.ReadOnly = true;
this.gridColumn168.OptionsFilter.AllowFilter = false;
this.gridColumn168.Visible = true;
this.gridColumn168.VisibleIndex = 4;
//
// gridColumn169
//
this.gridColumn169.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn169.AppearanceCell.Options.UseFont = true;
this.gridColumn169.Caption = "数量";
this.gridColumn169.FieldName = "Quantity";
this.gridColumn169.Name = "gridColumn169";
this.gridColumn169.OptionsColumn.AllowEdit = false;
this.gridColumn169.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn169.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn169.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn169.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn169.OptionsColumn.ReadOnly = true;
this.gridColumn169.OptionsFilter.AllowFilter = false;
this.gridColumn169.Visible = true;
this.gridColumn169.VisibleIndex = 5;
this.gridColumn169.Width = 59;
//
// gridColumn170
//
this.gridColumn170.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn170.AppearanceCell.Options.UseFont = true;
this.gridColumn170.Caption = "单位";
this.gridColumn170.FieldName = "Unit";
this.gridColumn170.Name = "gridColumn170";
this.gridColumn170.OptionsColumn.AllowEdit = false;
this.gridColumn170.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn170.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn170.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn170.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn170.OptionsColumn.ReadOnly = true;
this.gridColumn170.OptionsFilter.AllowFilter = false;
this.gridColumn170.Visible = true;
this.gridColumn170.VisibleIndex = 6;
this.gridColumn170.Width = 48;
//
// gridColumn171
//
this.gridColumn171.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn171.AppearanceCell.Options.UseFont = true;
this.gridColumn171.Caption = "检查类别";
this.gridColumn171.FieldName = "ItemClass";
this.gridColumn171.Name = "gridColumn171";
this.gridColumn171.OptionsColumn.AllowEdit = false;
this.gridColumn171.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn171.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.True;
this.gridColumn171.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn171.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn171.OptionsColumn.ReadOnly = true;
this.gridColumn171.OptionsFilter.AllowFilter = false;
this.gridColumn171.Visible = true;
this.gridColumn171.VisibleIndex = 7;
//
// panel14
//
this.panel14.Controls.Add(this.DgcRegItem2);
this.panel14.Controls.Add(this.NameSearch2);
this.panel14.Dock = System.Windows.Forms.DockStyle.Left;
this.panel14.Location = new System.Drawing.Point(3, 31);
this.panel14.Name = "panel14";
this.panel14.Size = new System.Drawing.Size(140, 328);
this.panel14.TabIndex = 32;
//
// NameSearch2
//
this.NameSearch2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.NameSearch2.Dock = System.Windows.Forms.DockStyle.Top;
this.NameSearch2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.NameSearch2.Location = new System.Drawing.Point(0, 0);
this.NameSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.NameSearch2.Name = "NameSearch2";
this.NameSearch2.Size = new System.Drawing.Size(140, 23);
this.NameSearch2.TabIndex = 32;
//
// DgcRegItem2
//
this.DgcRegItem2.Dock = System.Windows.Forms.DockStyle.Fill;
this.DgcRegItem2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcRegItem2.Location = new System.Drawing.Point(0, 23);
this.DgcRegItem2.MainView = this.DgvRegItem2;
this.DgcRegItem2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcRegItem2.Name = "DgcRegItem2";
this.DgcRegItem2.Size = new System.Drawing.Size(140, 305);
this.DgcRegItem2.TabIndex = 31;
this.DgcRegItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvRegItem2});
//
// DgvRegItem2
//
this.DgvRegItem2.Appearance.Row.Font = new System.Drawing.Font("微软雅黑", 10F);
this.DgvRegItem2.Appearance.Row.Options.UseFont = true;
this.DgvRegItem2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
this.gridColumn172,
this.gridColumn173});
this.DgvRegItem2.GridControl = this.DgcRegItem2;
this.DgvRegItem2.Name = "DgvRegItem2";
this.DgvRegItem2.OptionsMenu.EnableColumnMenu = false;
this.DgvRegItem2.OptionsSelection.MultiSelect = true;
this.DgvRegItem2.OptionsView.ColumnAutoWidth = false;
this.DgvRegItem2.OptionsView.ShowGroupPanel = false;
this.DgvRegItem2.OptionsView.ShowIndicator = false;
this.DgvRegItem2.RowHeight = 35;
//
// gridColumn172
//
this.gridColumn172.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn172.AppearanceCell.Options.UseFont = true;
this.gridColumn172.Caption = "体检号";
this.gridColumn172.FieldName = "ID";
this.gridColumn172.Name = "gridColumn172";
this.gridColumn172.OptionsColumn.AllowEdit = false;
this.gridColumn172.OptionsColumn.ReadOnly = true;
this.gridColumn172.OptionsFilter.AllowFilter = false;
this.gridColumn172.Visible = true;
this.gridColumn172.VisibleIndex = 0;
this.gridColumn172.Width = 55;
//
// gridColumn173
//
this.gridColumn173.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn173.AppearanceCell.Options.UseFont = true;
this.gridColumn173.Caption = "姓名";
this.gridColumn173.FieldName = "Name";
this.gridColumn173.Name = "gridColumn173";
this.gridColumn173.OptionsColumn.AllowEdit = false;
this.gridColumn173.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn173.OptionsColumn.AllowMove = false;
this.gridColumn173.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn173.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn173.OptionsColumn.ReadOnly = true;
this.gridColumn173.OptionsFilter.AllowFilter = false;
this.gridColumn173.Visible = true;
this.gridColumn173.VisibleIndex = 1;
this.gridColumn173.Width = 52;
//
// CopyMenu
//
this.CopyMenu.BackColor = System.Drawing.Color.White;
this.CopyMenu.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.CopyMenu.GripStyle = System.Windows.Forms.ToolStripGripStyle.Visible;
this.CopyMenu.ImageScalingSize = new System.Drawing.Size(20, 20);
this.CopyMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.TsmiCopyFeeItem});
this.CopyMenu.Location = new System.Drawing.Point(3, 3);
this.CopyMenu.Name = "CopyMenu";
this.CopyMenu.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2);
this.CopyMenu.Size = new System.Drawing.Size(366, 28);
this.CopyMenu.TabIndex = 25;
this.CopyMenu.Text = "menuStrip1";
//
// TsmiCopyFeeItem
//
this.TsmiCopyFeeItem.Image = ((System.Drawing.Image)(resources.GetObject("TsmiCopyFeeItem.Image")));
this.TsmiCopyFeeItem.Name = "TsmiCopyFeeItem";
this.TsmiCopyFeeItem.Size = new System.Drawing.Size(64, 24);
this.TsmiCopyFeeItem.Text = "复制";
//
// panel7
//
this.panel7.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
@ -5499,12 +5821,12 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit3)).EndInit();
this.panel8.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.DgcEnrollmentFeeItem)).EndInit();
this.EFeeItemMenu.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.DgvEnrollmentFeeItem)).EndInit();
this.PnlFeeItem.ResumeLayout(false);
this.tabControl2.ResumeLayout(false);
this.tabPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.DgcPack2)).EndInit();
this.EFeeItemMenu.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.DgvPack2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
this.tabPage2.ResumeLayout(false);
@ -5513,6 +5835,16 @@
((System.ComponentModel.ISupportInitialize)(this.DgvFeeItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView6)).EndInit();
this.tabPage3.ResumeLayout(false);
this.tabPage3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcCopyItem)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.DgvCopyItem)).EndInit();
this.panel14.ResumeLayout(false);
this.panel14.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcRegItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.DgvRegItem2)).EndInit();
this.CopyMenu.ResumeLayout(false);
this.CopyMenu.PerformLayout();
this.panel7.ResumeLayout(false);
this.panel7.PerformLayout();
this.menuStrip1.ResumeLayout(false);
@ -5893,5 +6225,24 @@
private System.Windows.Forms.ToolStripMenuItem GroupPartOption;
private System.Windows.Forms.ContextMenuStrip EFeeItemMenu;
private System.Windows.Forms.ToolStripMenuItem EnrollmentPartOption;
private System.Windows.Forms.TabPage tabPage3;
private DevExpress.XtraGrid.GridControl DgcCopyItem;
private DevExpress.XtraGrid.Views.Grid.GridView DgvCopyItem;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn162;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn165;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn166;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn167;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn168;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn169;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn170;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn171;
private System.Windows.Forms.Panel panel14;
private System.Windows.Forms.TextBox NameSearch2;
private DevExpress.XtraGrid.GridControl DgcRegItem2;
private DevExpress.XtraGrid.Views.Grid.GridView DgvRegItem2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn172;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn173;
private System.Windows.Forms.MenuStrip CopyMenu;
private System.Windows.Forms.ToolStripMenuItem TsmiCopyFeeItem;
}
}

114
PEIS/View/Enrollment/EnrollmentOrgForm.cs
Unescape View File

@ -1,4 +1,5 @@
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.Data;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraPrinting.Native;
using FastReport;
@ -48,6 +49,9 @@ namespace PEIS.View.Enrollment
private List<EnrollmentOrgFeeItem> _lstGroupFeeItem = new List<EnrollmentOrgFeeItem>();
private List<EnrollmentOrgPatient> _lstGroupPatient = new List<EnrollmentOrgPatient>();
private List<EnrollmentPatient> _lstRegItems2 = new List<EnrollmentPatient>();
private List<EnrollmentFeeItem> _lstCopyFeeItem = new List<EnrollmentFeeItem>();
private GridHitInfo _hInfo = new GridHitInfo();
private Int64 topRowIndex = -1;
@ -177,6 +181,11 @@ namespace PEIS.View.Enrollment
// 撤回发送科室
FastRecall.Click += FastRecall_Click;
// 复制项目
TsmiCopyFeeItem.Click += TsmiCopyFeeItem_Click;
NameSearch2.KeyDown += NameSearch2_KeyDown;
DgvRegItem2.SelectionChanged += DgvRegItem2_SelectionChanged;
#region 团体订单
TFastCharge.Click += TFastCharge_Click;
TFastAllCharge.Click += TFastAllCharge_Click;
@ -202,6 +211,68 @@ namespace PEIS.View.Enrollment
EnrollmentPartOption.Click += EnrollmentPartOption_Click;
}
private void NameSearch2_KeyDown(object sender, KeyEventArgs e) // 复制人员检索
{
if (e.KeyCode == Keys.Enter) OnGetCopyRegItems();
}
private void TsmiCopyFeeItem_Click(object sender, EventArgs e)
{
if (_lstCopyFeeItem == null || _lstCopyFeeItem.Count == 0) return;
if (_chooseRegItem == null)
{
Global.Msg("info", "请先选中体检人员！");
return;
}
if (_lstEnrollmentFeeItem?.Count != 0)
{
Global.Msg("info", "该登记已有收费项目，不能复制，请核对后重试!");
return;
}
EnrollmentFeeItem item = new EnrollmentFeeItem();
Int32 index = 0;
_lstCopyFeeItem.ForEach(a =>
{
index++;
item.EID = _chooseRegItem.ID;
item.OEID = a.OEID;
item.GroupID = a.GroupID;
item.PackId = a.PackId;
item.PackName = a.PackName;
item.FID = a.FID;
item.FeeItemCode = a.FeeItemCode;
item.FeeItemName = a.FeeItemName;
item.Quantity = 1;
item.Unit = a.Unit;
item.Price = a.Price;
item.SettlePrice = a.SettlePrice;
item.ItemClass = a.ItemClass;
item.CreateTime = DateTime.Now;
item.CreatorCode = Global.currentUser.Code;
item.Creator = Global.currentUser.Name;
item.DeptCode = a.DeptCode;
item.DeptName = a.DeptName;
item.Seq = index;
item.KeyNo = a.KeyNo;
item.Save();
});
OnGetEnrollmentFeeItem(_chooseRegItem.ID, "0");
}
private void DgvRegItem2_SelectionChanged(object sender, SelectionChangedEventArgs e)
{
Invoke(new Action(() =>
{
OnGetEnrollmentFeeItem(Convert.ToInt64(DgvRegItem2.GetRowCellValue(DgvRegItem2.GetSelectedRows()[0], "ID").ToString()), "1");
}));
}
private void EnrollmentPartOption_Click(object sender, EventArgs e)
{
if (DgvEnrollmentFeeItem.GetSelectedRows().Count() == 0) return;
@ -1997,6 +2068,15 @@ namespace PEIS.View.Enrollment
public event EventHandler<Args<EnrollmentPatient>> GetExcelList;
public event EventHandler<Args<EnrollmentPatient>> GetCopyRegItems;
protected virtual void OnGetCopyRegItems()
{
GetCopyRegItems?.Invoke(this, new Args<EnrollmentPatient>()
{
Name = NameSearch2.Text.Trim(),
EnrollmentOID = Convert.ToInt64(DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "ID").ToString())
});
}
protected virtual void OnCancelGroupTag(Int64 oeID, List<Int64> idList)
{
CancelGroupTag?.Invoke(this, new Args<EnrollmentCheckCost> { EnrollmentOID = oeID, IdList = idList });
@ -2067,9 +2147,9 @@ namespace PEIS.View.Enrollment
GetCheckCost?.Invoke(this, new Args<EnrollmentCheckCost> { EnrollmentOID = oeID, EnrollmentID = enrollmentID });
}
protected virtual void OnGetEnrollmentFeeItem(Int64 enrollmentID)
protected virtual void OnGetEnrollmentFeeItem(Int64 enrollmentID, string code = "0")
{
GetEnrollmentFeeItem?.Invoke(this, new Args<EnrollmentFeeItem> { EnrollmentID = enrollmentID });
GetEnrollmentFeeItem?.Invoke(this, new Args<EnrollmentFeeItem> { EnrollmentID = enrollmentID, Code = code });
}
protected virtual void OnGetEnrollmentPatient(Int64 oeID)
@ -2171,6 +2251,14 @@ namespace PEIS.View.Enrollment
GetExcelList?.Invoke(this, new Args<EnrollmentPatient> { EnrollmentOID = oeID });
}
public void ShowCopyRegItems(List<EnrollmentPatient> items)
{
Invoke(new Action(() => _lstRegItems2 = items));
Invoke(new Action(() => DgcRegItem2.DataSource = null));
Invoke(new Action(() => { DgcRegItem2.DataSource = _lstRegItems2.Where(a => a?.Name.Contains(NameSearch2.Text) == true || a?.ID.ToString().Contains(NameSearch2.Text) == true || a?.SpellCode?.Contains(NameSearch2.Text) == true); }));
if (_lstRegItems2.Where(a => a?.Name.Contains(NameSearch2.Text) == true || a?.ID.ToString().Contains(NameSearch2.Text) == true).Count() == 0) DgcCopyItem.DataSource = _lstCopyFeeItem = null;
}
public void ShowExcelList(List<EnrollmentPatient> items)
{
_lstExcelEPatient = items;
@ -2275,12 +2363,22 @@ namespace PEIS.View.Enrollment
DgvEnrollment.BestFitColumns();
}
public void ShowEnrollmentFeeItem(List<EnrollmentFeeItem> items)
public void ShowEnrollmentFeeItem(List<EnrollmentFeeItem> items, string code)
{
_lstEnrollmentFeeItem = items;
DgcEnrollmentFeeItem.DataSource = _lstEnrollmentFeeItem;
DgvEnrollmentFeeItem.BestFitColumns();
DgvEnrollmentFeeItem.ExpandAllGroups();
if (code == "0")
{
_lstEnrollmentFeeItem = items;
DgcEnrollmentFeeItem.DataSource = _lstEnrollmentFeeItem;
DgvEnrollmentFeeItem.BestFitColumns();
DgvEnrollmentFeeItem.ExpandAllGroups();
}
else
{
Invoke(new Action(() => _lstCopyFeeItem = items));
Invoke(new Action(() => DgcCopyItem.DataSource = null));
Invoke(new Action(() => DgcCopyItem.DataSource = _lstCopyFeeItem));
Invoke(new Action(() => DgvCopyItem.BestFitColumns()));
}
}

12
PEIS/View/Enrollment/EnrollmentOrgForm.resx
Unescape View File

@ -285,6 +285,18 @@
<metadata name="EFeeItemMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>159, 17</value>
</metadata>
<metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 55</value>
</metadata>
<data name="TsmiCopyFeeItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAM9JREFUSEvt
ltENgyAURR2q5btDPCZwEYdxAhfoEI/OU0Ob19CrkIs2NSSe5H5I5B5USOy6kyNxosNVwp2N89pjB43z
YXISnrW5iN6wiyItYBPvj0+KXRQmxPEc7QltI+B4jt3CWmihEx1xp5Xy2v6iA/ZQwjgRC7k8AnZRwvdq
686OSXG8DSEe5DQ256dCu16LzcFrY7MwF5uTCtcXuNzBH1DIUBT6MOH9X6BwUVDxSikOFzK0K2SzSxj/
QfBbcdERu2jiqvHMlVI8Zyf/YAauxQ0HrTL46QAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1062, 17</value>
</metadata>

52
PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs generated
Unescape View File

@ -30,8 +30,8 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentPersonForm));
DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn118 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn123 = new DevExpress.XtraGrid.Columns.GridColumn();
@ -226,11 +226,11 @@
this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel2 = new System.Windows.Forms.Panel();
this.NameSearch2 = new System.Windows.Forms.TextBox();
this.DgcRegItem2 = new DevExpress.XtraGrid.GridControl();
this.DgvRegItem2 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
this.NameSearch2 = new System.Windows.Forms.TextBox();
this.CopyMenu = new System.Windows.Forms.MenuStrip();
this.TsmiCopyFeeItem = new System.Windows.Forms.ToolStripMenuItem();
this.DgcCheckCost = new DevExpress.XtraGrid.GridControl();
@ -2629,34 +2629,23 @@
//
// panel2
//
this.panel2.Controls.Add(this.NameSearch2);
this.panel2.Controls.Add(this.DgcRegItem2);
this.panel2.Controls.Add(this.NameSearch2);
this.panel2.Dock = System.Windows.Forms.DockStyle.Left;
this.panel2.Location = new System.Drawing.Point(0, 28);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(140, 218);
this.panel2.TabIndex = 31;
//
// NameSearch2
//
this.NameSearch2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.NameSearch2.Dock = System.Windows.Forms.DockStyle.Top;
this.NameSearch2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.NameSearch2.Location = new System.Drawing.Point(0, 0);
this.NameSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.NameSearch2.Name = "NameSearch2";
this.NameSearch2.Size = new System.Drawing.Size(140, 23);
this.NameSearch2.TabIndex = 30;
//
// DgcRegItem2
//
this.DgcRegItem2.Dock = System.Windows.Forms.DockStyle.Fill;
this.DgcRegItem2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcRegItem2.Location = new System.Drawing.Point(0, 0);
this.DgcRegItem2.Location = new System.Drawing.Point(0, 23);
this.DgcRegItem2.MainView = this.DgvRegItem2;
this.DgcRegItem2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.DgcRegItem2.Name = "DgcRegItem2";
this.DgcRegItem2.Size = new System.Drawing.Size(140, 218);
this.DgcRegItem2.Size = new System.Drawing.Size(140, 195);
this.DgcRegItem2.TabIndex = 29;
this.DgcRegItem2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvRegItem2});
@ -2709,6 +2698,17 @@
this.gridColumn9.VisibleIndex = 1;
this.gridColumn9.Width = 52;
//
// NameSearch2
//
this.NameSearch2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.NameSearch2.Dock = System.Windows.Forms.DockStyle.Top;
this.NameSearch2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.NameSearch2.Location = new System.Drawing.Point(0, 0);
this.NameSearch2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.NameSearch2.Name = "NameSearch2";
this.NameSearch2.Size = new System.Drawing.Size(140, 23);
this.NameSearch2.TabIndex = 30;
//
// CopyMenu
//
this.CopyMenu.BackColor = System.Drawing.Color.White;
@ -2773,15 +2773,15 @@
this.gridColumn53,
this.gridColumn52});
this.DgvCheckCost.FixedLineWidth = 1;
gridFormatRule2.ApplyToRow = true;
gridFormatRule2.Column = this.gridColumn52;
gridFormatRule2.Name = "Format0";
formatConditionRuleExpression2.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression2.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression2.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression2.PredefinedName = "Strikeout Text";
gridFormatRule2.Rule = formatConditionRuleExpression2;
this.DgvCheckCost.FormatRules.Add(gridFormatRule2);
gridFormatRule1.ApplyToRow = true;
gridFormatRule1.Column = this.gridColumn52;
gridFormatRule1.Name = "Format0";
formatConditionRuleExpression1.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression1.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression1.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression1.PredefinedName = "Strikeout Text";
gridFormatRule1.Rule = formatConditionRuleExpression1;
this.DgvCheckCost.FormatRules.Add(gridFormatRule1);
this.DgvCheckCost.GridControl = this.DgcCheckCost;
this.DgvCheckCost.IndicatorWidth = 40;
this.DgvCheckCost.Name = "DgvCheckCost";

4
PEIS/View/Enrollment/IEnrollmentOrgView.cs
Unescape View File

@ -60,7 +60,9 @@ namespace PEIS.View.Enrollment
event EventHandler<Args<EnrollmentCheckCost>> GroupTag;
event EventHandler<Args<EnrollmentCheckCost>> CancelGroupTag;
event EventHandler<Args<EnrollmentPatient>> GetExcelList;
event EventHandler<Args<EnrollmentPatient>> GetCopyRegItems;
void ShowCopyRegItems(List<EnrollmentPatient> items);
void ShowEnrollmentOrg(List<EnrollmentOrg> items);
void ShowEnrollmentOrgGroup(List<EnrollmentOrgGroup> items);
void ShowOrgPatient(List<BaseOrgPatient> items);
@ -72,7 +74,7 @@ namespace PEIS.View.Enrollment
void ShowEnrollmentOrgFeeItem(List<EnrollmentOrgFeeItem> items);
void ShowEnrollmentPatient(List<EnrollmentPatient> items);
void ShowEnrollmentFeeItem(List<EnrollmentFeeItem> items);
void ShowEnrollmentFeeItem(List<EnrollmentFeeItem> items, String code);
void ShowCheckCost(List<EnrollmentCheckCost> items);
void ShowSendToDept(bool status);
void ShowFeeCheckCost(bool status);

21
PEIS/View/MainForm.cs
Unescape View File

@ -69,7 +69,7 @@ namespace PEIS.View
NbiPackage.LinkClicked += (s, e) => AddTab("NbiPackage", e.Link.Item);
NbiConclusion.LinkClicked += (s, e) => AddTab("NbiConclusion", e.Link.Item);
NbiDept.LinkClicked += (s, e) => AddTab("NbiDept", e.Link.Item);
NbiDictionary.LinkClicked+= (s, e) => AddTab("NbiDictionary", e.Link.Item);//字典管理
NbiDictionary.LinkClicked += (s, e) => AddTab("NbiDictionary", e.Link.Item);//字典管理
NbiHazardType.LinkClicked += (s, e) => AddTab("NbiHazardType", e.Link.Item);//接害类型
// 人次统计表
NbiPeopleCount.LinkClicked += (s, e) => AddTab("NbiPeopleCount", e.Link.Item);
@ -99,7 +99,7 @@ namespace PEIS.View
panelFooter.Visible = true;
// lblStep.Text = eid==null ? "" : eid+" 体检完成情况：";
stepViewer2.Eid = eid;
Console.WriteLine("stepViewer2.Invalidate()");
Console.WriteLine("stepViewer2.Invalidate()");
stepViewer2.Invalidate();
}
private void PbMax_Click(object sender, EventArgs e)
@ -155,7 +155,7 @@ namespace PEIS.View
base.WndProc(ref m);
break;
case 0x0005: // 窗体最大化、最小化
if(this.WindowState == FormWindowState.Maximized)
if (this.WindowState == FormWindowState.Maximized)
{
PbSmall.Visible = true;
PbMax.Visible = false;
@ -256,7 +256,7 @@ namespace PEIS.View
tabForm.Text = item.Caption;
tabForm.FormClosing += TipsFormClosing;
XtmmMain.Pages[tabForm].Image = item.LargeImage;
if (isNeedShowPanelFooter )
if (isNeedShowPanelFooter)
panelFooter.Visible = true;
tabForm.Show();
}
@ -268,12 +268,15 @@ namespace PEIS.View
/// <returns></returns>
private bool TabControlCheckHave(string tabName)
{
foreach (XtraMdiTabPage item in XtmmMain.Pages)
if (Global.AllowDuplicateTabs == "0")
{
if (item.Text == tabName)
foreach (XtraMdiTabPage item in XtmmMain.Pages)
{
XtmmMain.SelectedPage = item;
return true;
if (item.Text == tabName)
{
XtmmMain.SelectedPage = item;
return true;
}
}
}
return false;
@ -421,7 +424,7 @@ namespace PEIS.View
private void BtnStatistics_Click_1(object sender, EventArgs e)
{
isNeedShowPanelFooter = false;
if (panelFooter.Visible)
if (panelFooter.Visible)
panelFooter.Visible = false;
}

Write Preview
Loading…
Cancel
Save