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

身份证校验重写和一些优化

Browse Source 
1.团体信息界面导入名单时，身份证校验逻辑重写，更加严格准确
2.多个弹窗窗口边框显示优化
3.主界面恢复当前操作员显示
dhzzyy
LiJiaWen 3 days ago
parent af90ce9966
commit 9c31da55f8
18 changed files with 406 additions and 227 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. 80
      PEIS/Entity/BasePatient.cs
  2. 4
      PEIS/Utils/ExcelHelper.cs
  3. 4
      PEIS/View/Base/NewPersonForm.Designer.cs
  4. 1
      PEIS/View/Base/PatientImportForm.Designer.cs
  5. 22
      PEIS/View/Base/SelectOrgForm.Designer.cs
  6. 34
      PEIS/View/Base/SelectPatientForm.Designer.cs
  7. 1
      PEIS/View/Enrollment/CheckCostForm.Designer.cs
  8. 82
      PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
  9. 40
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  10. 23
      PEIS/View/Enrollment/EnrollmentOrgForm.resx
  11. 4
      PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs
  12. 90
      PEIS/View/Enrollment/EnrollmentPersonForm.cs
  13. 3
      PEIS/View/Enrollment/NewEnrollmentOrgForm.Designer.cs
  14. 4
      PEIS/View/Enrollment/NewEnrollmentPersonForm.Designer.cs
  15. 208
      PEIS/View/Exam/CareerHisInqForm.Designer.cs
  16. 3
      PEIS/View/Exam/CareerHisInqForm.resx
  17. 26
      PEIS/View/Exam/CareerHisInqStmForm.Designer.cs
  18. 2
      PEIS/View/MainForm.cs

80
PEIS/Entity/BasePatient.cs
Unescape View File

@ -1,4 +1,5 @@
using System;
using System.Text.RegularExpressions;
using PEIS.Utils;
namespace PEIS.Entity
@ -108,25 +109,78 @@ namespace PEIS.Entity
}
private static readonly int[] _weight = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 };
private static readonly char[] _checkCode = { '1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2' };
/// <summary>
/// 验证
/// </summary>
/// <returns></returns>
public bool Validate()
public bool Validate(out string message)
{
if (string.IsNullOrEmpty(Name)) return false;
if (string.IsNullOrEmpty(Sex)) return false;
if (string.IsNullOrEmpty(Nation)) return false;
if (string.IsNullOrEmpty(Marriage)) return false;
if (CardNo?.Trim()?.Length != 18) return false;
if (Tel1?.Trim()?.Length != 11) return false;
var year = CardNo.Substring(6, 4);
var month = CardNo.Substring(10, 2);
var day = CardNo.Substring(12, 2);
var isDay = DateTime.TryParse($"{year}-{month}-{day}", out var birthday);
if (!isDay) return false;
Birthday = birthday;
message = @"必填项信息缺失或者信息错误，请检查";
if (string.IsNullOrEmpty(Name))
{
message = @"姓名缺失，请检查";
return false;
}
if (string.IsNullOrEmpty(Sex))
{
message = @"性别缺失，请检查";
return false;
}
if (string.IsNullOrEmpty(Nation))
{
message = @"民族缺失，请检查";
return false;
}
if (string.IsNullOrEmpty(Marriage))
{
message = @"婚姻缺失，请检查";
return false;
}
if (string.IsNullOrWhiteSpace(Tel1) || !Regex.IsMatch(Tel1, @"^1[3-9]\d{9}$"))
{
message = @"电话异常，请检查";
return false;
}
#region 身份证验证
//长度格式
if (string.IsNullOrEmpty(CardNo) || !Regex.IsMatch(CardNo, @"^[0-9]{17}[0-9Xx]$"))
{
message = @"身份证格式异常，请检查";
return false;
}
//合法性
CardNo = CardNo.ToUpper();
int sum = 0;
for (int i = 0; i < 17; i++)
sum += (CardNo[i] - '0') * _weight[i];
if (_checkCode[sum % 11] != CardNo[17])
{
message = @"身份证校验异常，请检查";
return false;
}
//出生日期
string birthStr = CardNo.Substring(6, 8);
if (!DateTime.TryParseExact(birthStr, "yyyyMMdd", null, System.Globalization.DateTimeStyles.None, out DateTime birth)
|| birth > DateTime.Now)
{
message = @"身份证出生日期异常，请检查";
return false;
}
Birthday = birth;
CardType = "居民身份证";
//性别
if (int.Parse(CardNo[16].ToString()) % 2 != int.Parse(Sex) % 2)
{
message = @"性别与身份证不符，请检查";
return false;
}
#endregion
return true;
}

4
PEIS/Utils/ExcelHelper.cs
Unescape View File

@ -68,13 +68,13 @@ namespace PEIS.Utils
}
var dataRow = sheet.GetRow(row);
var readPatient = ReadRowToBasePatient(dataRow);
var isBasePatient = readPatient.Validate();
var isBasePatient = readPatient.Validate(out string message);
if (!isBasePatient || string.IsNullOrEmpty(readPatient.Address1))
{
continuousEmpty++;
if (!string.IsNullOrEmpty(dataRow.GetCell(4)?.ToString()))
{
dataRow.GetCell(10).SetCellValue("必填项信息缺失或者信息错误，请检查");
dataRow.GetCell(10).SetCellValue(message);
}
ErrorList.Add(new ExcelRowModel(row, dataRow));
continue;

4
PEIS/View/Base/NewPersonForm.Designer.cs generated
Unescape View File

@ -580,8 +580,10 @@
this.Controls.Add(this.ProfessionLabel);
this.Controls.Add(this.ContactLabel2);
this.Controls.Add(this.IDCardLabel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "NewPersonForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "新增体检者信息";

1
PEIS/View/Base/PatientImportForm.Designer.cs generated
Unescape View File

@ -857,6 +857,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1327, 788);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.panel1);

22
PEIS/View/Base/SelectOrgForm.Designer.cs generated
Unescape View File

@ -37,10 +37,10 @@
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DgvOrg)).BeginInit();
@ -187,6 +187,15 @@
this.gridColumn17.VisibleIndex = 5;
this.gridColumn17.Width = 200;
//
// gridColumn2
//
this.gridColumn2.Caption = "发票名称";
this.gridColumn2.FieldName = "InvoiceName";
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 4;
this.gridColumn2.Width = 150;
//
// gridColumn7
//
this.gridColumn7.Caption = "创建时间";
@ -234,20 +243,11 @@
this.gridColumn21.VisibleIndex = 8;
this.gridColumn21.Width = 40;
//
// gridColumn2
//
this.gridColumn2.Caption = "发票名称";
this.gridColumn2.FieldName = "InvoiceName";
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
this.gridColumn2.VisibleIndex = 4;
this.gridColumn2.Width = 150;
//
// SelectOrgForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White;
this.BackColor = System.Drawing.SystemColors.Control;
this.ClientSize = new System.Drawing.Size(721, 441);
this.Controls.Add(this.DgcOrg);
this.Controls.Add(this.panel1);

34
PEIS/View/Base/SelectPatientForm.Designer.cs generated
Unescape View File

@ -29,6 +29,7 @@
private void InitializeComponent()
{
this.panel1 = new System.Windows.Forms.Panel();
this.NewBaseBtn = new System.Windows.Forms.Button();
this.TxtName = new System.Windows.Forms.TextBox();
this.DgcPatient = new DevExpress.XtraGrid.GridControl();
this.DgvPatient = new DevExpress.XtraGrid.Views.Grid.GridView();
@ -54,7 +55,6 @@
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
this.NewBaseBtn = new System.Windows.Forms.Button();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcPatient)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.DgvPatient)).BeginInit();
@ -75,12 +75,25 @@
this.panel1.Size = new System.Drawing.Size(746, 46);
this.panel1.TabIndex = 0;
//
// NewBaseBtn
//
this.NewBaseBtn.AutoSize = true;
this.NewBaseBtn.Image = global::PEIS.Properties.Resources.添加;
this.NewBaseBtn.Location = new System.Drawing.Point(223, 4);
this.NewBaseBtn.Margin = new System.Windows.Forms.Padding(4);
this.NewBaseBtn.Name = "NewBaseBtn";
this.NewBaseBtn.Size = new System.Drawing.Size(118, 38);
this.NewBaseBtn.TabIndex = 5;
this.NewBaseBtn.Text = "新增成员";
this.NewBaseBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
this.NewBaseBtn.UseVisualStyleBackColor = true;
//
// TxtName
//
this.TxtName.Location = new System.Drawing.Point(12, 10);
this.TxtName.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.TxtName.Name = "TxtName";
this.TxtName.Size = new System.Drawing.Size(173, 31);
this.TxtName.Size = new System.Drawing.Size(173, 26);
this.TxtName.TabIndex = 3;
//
// DgcPatient
@ -397,19 +410,6 @@
this.gridColumn26.VisibleIndex = 8;
this.gridColumn26.Width = 30;
//
// NewBaseBtn
//
this.NewBaseBtn.AutoSize = true;
this.NewBaseBtn.Image = global::PEIS.Properties.Resources.添加;
this.NewBaseBtn.Location = new System.Drawing.Point(223, 4);
this.NewBaseBtn.Margin = new System.Windows.Forms.Padding(4);
this.NewBaseBtn.Name = "NewBaseBtn";
this.NewBaseBtn.Size = new System.Drawing.Size(118, 38);
this.NewBaseBtn.TabIndex = 5;
this.NewBaseBtn.Text = "新增成员";
this.NewBaseBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
this.NewBaseBtn.UseVisualStyleBackColor = true;
//
// SelectPatientForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@ -418,8 +418,10 @@
this.Controls.Add(this.DgcPatient);
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "SelectPatientForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "选择体检人";

1
PEIS/View/Enrollment/CheckCostForm.Designer.cs generated
Unescape View File

@ -532,6 +532,7 @@
// CheckCostForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1233, 726);
this.Controls.Add(this.DgcFeeItem);
this.Controls.Add(this.LblTitle);

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

@ -30,10 +30,10 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnrollmentOrgForm));
DevExpress.XtraGrid.GridFormatRule gridFormatRule3 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression3 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
DevExpress.XtraGrid.GridFormatRule gridFormatRule1 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression1 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
DevExpress.XtraGrid.GridFormatRule gridFormatRule2 = new DevExpress.XtraGrid.GridFormatRule();
DevExpress.XtraEditors.FormatConditionRuleExpression formatConditionRuleExpression2 = new DevExpress.XtraEditors.FormatConditionRuleExpression();
this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemMemoEdit21 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
@ -153,6 +153,7 @@
this.gridColumn77 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn79 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn174 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn78 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn80 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn81 = new DevExpress.XtraGrid.Columns.GridColumn();
@ -413,7 +414,6 @@
this.gridView5 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn174 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
@ -2191,11 +2191,25 @@
this.gridColumn79.OptionsColumn.ReadOnly = true;
this.gridColumn79.OptionsFilter.AllowFilter = false;
this.gridColumn79.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "Price", "￥{0:0.##}")});
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Custom, "Price", "￥{0:0.##}", "TotalPrice")});
this.gridColumn79.Visible = true;
this.gridColumn79.VisibleIndex = 5;
this.gridColumn79.Width = 63;
//
// gridColumn174
//
this.gridColumn174.Caption = "数量";
this.gridColumn174.FieldName = "Quantity";
this.gridColumn174.Name = "gridColumn174";
this.gridColumn174.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsFilter.AllowFilter = false;
this.gridColumn174.Visible = true;
this.gridColumn174.VisibleIndex = 6;
this.gridColumn174.Width = 55;
//
// gridColumn78
//
this.gridColumn78.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@ -2209,7 +2223,7 @@
this.gridColumn78.OptionsColumn.ReadOnly = true;
this.gridColumn78.OptionsFilter.AllowFilter = false;
this.gridColumn78.Visible = true;
this.gridColumn78.VisibleIndex = 6;
this.gridColumn78.VisibleIndex = 7;
this.gridColumn78.Width = 63;
//
// gridColumn80
@ -2227,7 +2241,7 @@
this.gridColumn80.OptionsColumn.ReadOnly = true;
this.gridColumn80.OptionsFilter.AllowFilter = false;
this.gridColumn80.Visible = true;
this.gridColumn80.VisibleIndex = 7;
this.gridColumn80.VisibleIndex = 8;
this.gridColumn80.Width = 70;
//
// gridColumn81
@ -2242,7 +2256,7 @@
this.gridColumn81.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn81.OptionsColumn.ReadOnly = true;
this.gridColumn81.Visible = true;
this.gridColumn81.VisibleIndex = 8;
this.gridColumn81.VisibleIndex = 9;
this.gridColumn81.Width = 40;
//
// splitter4
@ -3151,15 +3165,15 @@
this.gridColumn100,
this.gridColumn99});
this.DgvCheckCost2.FixedLineWidth = 1;
gridFormatRule3.ApplyToRow = true;
gridFormatRule3.Column = this.gridColumn99;
gridFormatRule3.Name = "Format0";
formatConditionRuleExpression3.Appearance.ForeColor = System.Drawing.Color.Gray;
formatConditionRuleExpression3.Appearance.Options.UseForeColor = true;
formatConditionRuleExpression3.Expression = "[CancelTime] Is Not Null";
formatConditionRuleExpression3.PredefinedName = "Strikeout Text";
gridFormatRule3.Rule = formatConditionRuleExpression3;
this.DgvCheckCost2.FormatRules.Add(gridFormatRule3);
gridFormatRule1.ApplyToRow = true;
gridFormatRule1.Column = this.gridColumn99;
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.DgvCheckCost2.FormatRules.Add(gridFormatRule1);
this.DgvCheckCost2.GridControl = this.DgcCheckCost2;
this.DgvCheckCost2.GroupFormat = "{0}";
this.DgvCheckCost2.IndicatorWidth = 65;
@ -3597,15 +3611,15 @@
this.gridColumn101,
this.gridColumn102});
this.DgvCheckCost.FixedLineWidth = 1;
gridFormatRule1.ApplyToRow = true;
gridFormatRule1.Column = this.gridColumn102;
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);
gridFormatRule2.ApplyToRow = true;
gridFormatRule2.Column = this.gridColumn102;
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);
this.DgvCheckCost.GridControl = this.DgcCheckCost;
this.DgvCheckCost.GroupCount = 1;
this.DgvCheckCost.GroupFormat = "";
@ -4063,7 +4077,7 @@
this.gridColumn113.OptionsColumn.ReadOnly = true;
this.gridColumn113.OptionsFilter.AllowFilter = false;
this.gridColumn113.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "Price", "￥{0:0.##}")});
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Custom, "Price", "￥{0:0.##}", "TotalPrice")});
this.gridColumn113.Visible = true;
this.gridColumn113.VisibleIndex = 3;
//
@ -4082,7 +4096,7 @@
this.gridColumn114.OptionsColumn.ReadOnly = true;
this.gridColumn114.OptionsFilter.AllowFilter = false;
this.gridColumn114.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "SettlePrice", "￥{0:0.##}")});
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Custom, "SettlePrice", "￥{0:0.##}", "TotalSettlePrice")});
this.gridColumn114.Visible = true;
this.gridColumn114.VisibleIndex = 4;
//
@ -5728,20 +5742,6 @@
//
this.gridView8.Name = "gridView8";
//
// gridColumn174
//
this.gridColumn174.Caption = "数量";
this.gridColumn174.FieldName = "Quantity";
this.gridColumn174.Name = "gridColumn174";
this.gridColumn174.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn174.OptionsFilter.AllowFilter = false;
this.gridColumn174.Visible = true;
this.gridColumn174.VisibleIndex = 6;
this.gridColumn174.Width = 55;
//
// EnrollmentOrgForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);

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

@ -1,4 +1,5 @@
using DevExpress.Data;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraPrinting.Native;
@ -111,6 +112,7 @@ namespace PEIS.View.Enrollment
DgvGroupFeeItem.DoubleClick += DgvGroupFeeItem_DoubleClick;
DgvGroupFeeItem.CustomColumnDisplayText += DgvGroupFeeItem_CustomColumnDisplayText;
DgvGroupFeeItem.CellValueChanged += DgvGroupFeeItem_CellValueChanged;
DgvGroupFeeItem.CustomSummaryCalculate += DgvEFeeItem_CustomSummaryCalculate;
DgvPack.MouseDown += DgvPack_MouseDown;
DgvPack.DoubleClick += DgvPack_DoubleClick;
@ -135,6 +137,7 @@ namespace PEIS.View.Enrollment
DgvEnrollmentFeeItem.CustomDrawRowIndicator += DgvOrg_CustomDrawRowIndicator;
DgvEnrollmentFeeItem.CustomDrawGroupRow += DgvEnrollmentFeeItem_CustomDrawGroupRow;
DgvEnrollmentFeeItem.CellValueChanged += DgvEnrollmentFeeItem_CellValueChanged;
DgvEnrollmentFeeItem.CustomSummaryCalculate += DgvEFeeItem_CustomSummaryCalculate;
DgvPack2.MouseDown += DgvPack2_MouseDown;
DgvPack2.DoubleClick += DgvPack2_DoubleClick;
@ -213,6 +216,37 @@ namespace PEIS.View.Enrollment
EnrollmentPartOption.Click += EnrollmentPartOption_Click;
}
private void DgvEFeeItem_CustomSummaryCalculate(object sender, DevExpress.Data.CustomSummaryEventArgs e)
{
GridView gv = sender as GridView;
// 只处理我们标记的 价格×数量 汇总
GridSummaryItem sumItem = e.Item as GridSummaryItem;
if (sumItem == null) return;
// 判断Tag
if (sumItem.Tag?.ToString() != "TotalPrice" && sumItem.Tag?.ToString() != "TotalSettlePrice")
return;
// 三个阶段：初始化、逐行计算、最终格式化
switch (e.SummaryProcess)
{
// 1. 初始化汇总总值
case CustomSummaryProcess.Start:
e.TotalValue = 0m;
break;
// 2. 遍历每一行，累加 价格*数量
case CustomSummaryProcess.Calculate:
// 获取当前行收费价格
decimal price = Convert.ToDecimal(gv.GetRowCellValue(e.RowHandle, sumItem.Tag.ToString().Replace("Total", "")) ?? 0);
// 获取数量字段（替换成你实际绑定的数量FieldName）
decimal num = Convert.ToDecimal(gv.GetRowCellValue(e.RowHandle, "Quantity") ?? 0);
// 累加乘积
e.TotalValue = Convert.ToDecimal(e.TotalValue) + price * num;
break;
}
}
private void NameSearch2_KeyDown(object sender, KeyEventArgs e) // 复制人员检索
{
if (e.KeyCode == Keys.Enter) OnGetCopyRegItems();
@ -768,6 +802,8 @@ namespace PEIS.View.Enrollment
item.Quantity = quantity;
item.Update();
//重新计算合计金额
DgvGroupFeeItem.UpdateTotalSummary();
MessageBox.Show("数量已更新！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
@ -1420,7 +1456,7 @@ namespace PEIS.View.Enrollment
Global.Msg("info", $"成员【{item.Name}】的订单已发送到科室，无法继续删除！");
return;
}
DialogResult delConfirm = MessageBox.Show($"确定删除成员【{item.Name}】的收费项目信息并剔除分组?", "警告", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
DialogResult delConfirm = MessageBox.Show($"确定删除成员【{item.Name}】的收费项目信息?", "警告", MessageBoxButtons.OKCancel, MessageBoxIcon.Question);
if (delConfirm == DialogResult.OK)
{
OnCancelRegInfo(item);
@ -1876,6 +1912,8 @@ namespace PEIS.View.Enrollment
}
item.Quantity = quantity;
item.Update();
//重新计算合计金额
DgvEnrollmentFeeItem.UpdateTotalSummary();
MessageBox.Show("数量已更新！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}

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

@ -120,9 +120,6 @@
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>299, 17</value>
</metadata>
<metadata name="menuStrip2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>299, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="TsmiOrgUpdate.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@ -134,9 +131,6 @@
r1DTM9FgcRKSF8VH1pkmGV/XE5H3rk2CugSYAAAAAElFTkSuQmCC
</value>
</data>
<metadata name="GFeeItmeMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="contextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>897, 17</value>
</metadata>
@ -147,6 +141,9 @@
azgI0NwCEBi1hCQwDC2hRWEHAzQtrkcBzQAAtlLL7bkHJToAAAAASUVORK5CYII=
</value>
</data>
<metadata name="GFeeItmeMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
<metadata name="PersonCostFastMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>588, 17</value>
</metadata>
@ -291,9 +288,6 @@
<metadata name="CopyMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 55</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
@ -306,9 +300,6 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1062, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>1062, 17</value>
</metadata>
<data name="TsmiCheckOrg.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABwAAAAcCAYAAAByDd+UAAAABGdBTUEAALGPC/xhBQAAAT5JREFUSEvd
@ -338,7 +329,7 @@
KGtGXgAAAABJRU5ErkJggg==
</value>
</data>
<data name="TsmiPrintCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="TsmiPrintPerson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft
VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
@ -350,7 +341,7 @@
FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
</value>
</data>
<data name="TsmiPrintPerson.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="TsmiPrintTeam.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft
VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
@ -362,7 +353,7 @@
FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
</value>
</data>
<data name="TsmiPrintTeam.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="TsmiPrintGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft
VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2
@ -374,7 +365,7 @@
FXPgD42yKUEeFV5FAAAAAElFTkSuQmCC
</value>
</data>
<data name="TsmiPrintGroup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<data name="TsmiPrintCost.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAABGdBTUEAALGPC/xhBQAAAXNJREFUWEft
VUtugzAUzBF6gV6gqy6Ko+xyhErYUnKbrHKDLnKFbHKEHoGFjXqcVk/E+HkwEDuAXImRRgj8mBl/eGw2

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

@ -1944,7 +1944,7 @@
this.gridColumn23.OptionsColumn.ReadOnly = true;
this.gridColumn23.OptionsFilter.AllowFilter = false;
this.gridColumn23.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "Price", "￥{0:0.##}")});
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Custom, "Price", "￥{0:0.##}", "TotalPrice")});
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 3;
//
@ -1963,7 +1963,7 @@
this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.OptionsFilter.AllowFilter = false;
this.gridColumn25.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "SettlePrice", "￥{0:0.##}")});
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Custom, "SettlePrice", "￥{0:0.##}", "TotalSettlePrice")});
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 4;
//

90
PEIS/View/Enrollment/EnrollmentPersonForm.cs
Unescape View File

@ -16,6 +16,8 @@ using System.Threading;
using System.Windows.Forms;
using System.Net;
using Newtonsoft.Json.Linq;
using DevExpress.XtraGrid;
using DevExpress.Data;
namespace PEIS.View.Enrollment
{
@ -121,6 +123,8 @@ namespace PEIS.View.Enrollment
DgvEFeeItem.DoubleClick += DgvEFeeItem_DoubleClick;
// 修改收费项目数量
DgvEFeeItem.CellValueChanged += DgvEFeeItem_CellValueChanged;
//计算合计金额
DgvEFeeItem.CustomSummaryCalculate += DgvEFeeItem_CustomSummaryCalculate;
//选择部位
PartOption.Click += PartOption_Click;
@ -151,6 +155,37 @@ namespace PEIS.View.Enrollment
}
private void DgvEFeeItem_CustomSummaryCalculate(object sender, DevExpress.Data.CustomSummaryEventArgs e)
{
GridView gv = sender as GridView;
// 只处理我们标记的 价格×数量 汇总
GridSummaryItem sumItem = e.Item as GridSummaryItem;
if (sumItem == null) return;
// 判断Tag
if (sumItem.Tag?.ToString() != "TotalPrice" && sumItem.Tag?.ToString() != "TotalSettlePrice")
return;
// 三个阶段：初始化、逐行计算、最终格式化
switch (e.SummaryProcess)
{
// 1. 初始化汇总总值
case CustomSummaryProcess.Start:
e.TotalValue = 0m;
break;
// 2. 遍历每一行，累加 价格*数量
case CustomSummaryProcess.Calculate:
// 获取当前行收费价格
decimal price = Convert.ToDecimal(gv.GetRowCellValue(e.RowHandle, sumItem.Tag.ToString().Replace("Total", "")) ?? 0);
// 获取数量字段（替换成你实际绑定的数量FieldName）
decimal num = Convert.ToDecimal(gv.GetRowCellValue(e.RowHandle, "Quantity") ?? 0);
// 累加乘积
e.TotalValue = Convert.ToDecimal(e.TotalValue) + price * num;
break;
}
}
private void DgvEFeeItem_MouseDown(object sender, MouseEventArgs e)
{
eInfo = DgvEFeeItem.CalcHitInfo(e.X, e.Y);
@ -278,13 +313,15 @@ namespace PEIS.View.Enrollment
private void DgvRegItem_SelectionChanged(object sender, DevExpress.Data.SelectionChangedEventArgs e) // 登记列表切换
{
Invoke(new Action(() => _chooseRegItem = null));
if (DgvRegItem.SelectedRowsCount == 0) return;
Invoke(new Action(() => _chooseRegItem = DgvRegItem.GetRow(DgvRegItem.GetSelectedRows()[0]) as EnrollmentPatient));
OnGetRegInfo(_chooseRegItem.ID);
OnGetCheckCost(_chooseRegItem.ID);
OnGetExamFeeItem(_chooseRegItem.ID, "0");
//调用
//刷新进度栏
SelectedPatientEvent?.Invoke(_chooseRegItem.ID);
}
@ -607,6 +644,9 @@ namespace PEIS.View.Enrollment
item.Quantity = quantity;
item.Update();
//重新计算合计金额
DgvEFeeItem.UpdateTotalSummary();
MessageBox.Show("数量已更新！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
}
@ -721,10 +761,12 @@ namespace PEIS.View.Enrollment
if (Global.Msg("warn", "确定要发送吗？") == DialogResult.No) return;
CostToHis(_chooseRegItem.ID);
OnSendToDept(_chooseRegItem.ID);
long eid = _chooseRegItem.ID;
CostToHis(eid);
OnSendToDept(eid);
OnGetRegItems(0);
OnGetCheckCost(_chooseRegItem.ID);
SelectPatientByEID(eid);
}
private void FastAllCharge_Click(object sender, EventArgs e)
@ -873,8 +915,11 @@ namespace PEIS.View.Enrollment
private void FastRecallDept_Click(object sender, EventArgs e)
{
if (_chooseRegItem == null || _chooseRegItem.SignTime == null) return;
long eid = _chooseRegItem.ID;
OnRecallDept(_chooseRegItem);
OnGetRegItems(0);
SelectPatientByEID(eid);
}
private void NameSearch2_KeyDown(object sender, KeyEventArgs e)
@ -1303,6 +1348,43 @@ namespace PEIS.View.Enrollment
#endregion
/// <summary>
/// 根据体检号选中Grid行，并触发SelectionChanged
/// </summary>
/// <param name="eid">目标体检号</param>
private void SelectPatientByEID(long eid)
{
GridView gridView = DgcRegItem.MainView as GridView;
// 1. 先清空所有选中行
gridView.ClearSelection();
// 2. 遍历所有数据行，匹配体检号
int targetRowHandle = DevExpress.XtraGrid.GridControl.InvalidRowHandle;
for (int i = 0; i < gridView.RowCount; i++)
{
// 跳过分组行、汇总行
if (gridView.IsGroupRow(i)) continue;
var pat = gridView.GetRow(i) as EnrollmentPatient;
if (pat.ID == eid)
{
targetRowHandle = i;
break;
}
}
// 3. 找到目标行则选中
if (targetRowHandle != DevExpress.XtraGrid.GridControl.InvalidRowHandle)
{
// 选中该行（选中状态变更，自动触发 SelectionChanged）
gridView.SelectRow(targetRowHandle);
// 把该行设为焦点行，滚动到可视区域
gridView.FocusedRowHandle = targetRowHandle;
gridView.MakeRowVisible(targetRowHandle);
}
}
#endregion
protected override object CreatePresenter()

3
PEIS/View/Enrollment/NewEnrollmentOrgForm.Designer.cs generated
Unescape View File

@ -312,6 +312,9 @@
this.Controls.Add(this.BtnCancel);
this.Controls.Add(this.BtnOk);
this.Controls.Add(this.groupBox1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "NewEnrollmentOrgForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "新增团体登记";

4
PEIS/View/Enrollment/NewEnrollmentPersonForm.Designer.cs generated
Unescape View File

@ -772,8 +772,10 @@
this.Controls.Add(this.ProfessionLabel);
this.Controls.Add(this.ContactLabel2);
this.Controls.Add(this.IDCardLabel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "NewEnrollmentPersonForm";
this.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;

208
PEIS/View/Exam/CareerHisInqForm.Designer.cs generated
Unescape View File

@ -55,6 +55,16 @@
this.advPropertyGrid1 = new FastReport.DevComponents.DotNetBar.AdvPropertyGrid();
this.panelMain = new System.Windows.Forms.Panel();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.DrugTaboo = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label();
this.PreHisIllnessIsHeal = new System.Windows.Forms.TextBox();
this.PreHisIllnessOrg = new System.Windows.Forms.TextBox();
this.PreHisIllnessNo = new System.Windows.Forms.TextBox();
this.label19 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.label17 = new System.Windows.Forms.Label();
this.PreHisIllnessDate = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.btnSymptom = new System.Windows.Forms.Button();
this.panelDrink = new System.Windows.Forms.Panel();
this.DrinkState_1 = new System.Windows.Forms.RadioButton();
@ -128,16 +138,6 @@
this.CancelBtn = new System.Windows.Forms.Button();
this.ConfirmBtn = new System.Windows.Forms.Button();
this.superTabControl1 = new FastReport.DevComponents.DotNetBar.SuperTabControl();
this.label1 = new System.Windows.Forms.Label();
this.PreHisIllnessDate = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
this.label18 = new System.Windows.Forms.Label();
this.label19 = new System.Windows.Forms.Label();
this.PreHisIllnessNo = new System.Windows.Forms.TextBox();
this.PreHisIllnessOrg = new System.Windows.Forms.TextBox();
this.PreHisIllnessIsHeal = new System.Windows.Forms.TextBox();
this.label20 = new System.Windows.Forms.Label();
this.DrugTaboo = new System.Windows.Forms.TextBox();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.advPropertyGrid1)).BeginInit();
this.panelMain.SuspendLayout();
@ -491,6 +491,97 @@
this.groupBox1.TabStop = false;
this.groupBox1.Text = "问诊";
//
// DrugTaboo
//
this.DrugTaboo.Location = new System.Drawing.Point(779, 140);
this.DrugTaboo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.DrugTaboo.Name = "DrugTaboo";
this.DrugTaboo.Size = new System.Drawing.Size(318, 23);
this.DrugTaboo.TabIndex = 104;
this.DrugTaboo.Text = "无";
//
// label20
//
this.label20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label20.Location = new System.Drawing.Point(666, 140);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(107, 23);
this.label20.TabIndex = 103;
this.label20.Text = "药物禁忌或其他：";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// PreHisIllnessIsHeal
//
this.PreHisIllnessIsHeal.Location = new System.Drawing.Point(1054, 60);
this.PreHisIllnessIsHeal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.PreHisIllnessIsHeal.Name = "PreHisIllnessIsHeal";
this.PreHisIllnessIsHeal.Size = new System.Drawing.Size(43, 23);
this.PreHisIllnessIsHeal.TabIndex = 102;
//
// PreHisIllnessOrg
//
this.PreHisIllnessOrg.Location = new System.Drawing.Point(836, 60);
this.PreHisIllnessOrg.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.PreHisIllnessOrg.Name = "PreHisIllnessOrg";
this.PreHisIllnessOrg.Size = new System.Drawing.Size(135, 23);
this.PreHisIllnessOrg.TabIndex = 101;
//
// PreHisIllnessNo
//
this.PreHisIllnessNo.Location = new System.Drawing.Point(650, 60);
this.PreHisIllnessNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.PreHisIllnessNo.Name = "PreHisIllnessNo";
this.PreHisIllnessNo.Size = new System.Drawing.Size(120, 23);
this.PreHisIllnessNo.TabIndex = 100;
//
// label19
//
this.label19.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label19.Location = new System.Drawing.Point(977, 60);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(71, 23);
this.label19.TabIndex = 99;
this.label19.Text = "是否痊愈：";
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label18
//
this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.Location = new System.Drawing.Point(776, 60);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(71, 23);
this.label18.TabIndex = 98;
this.label18.Text = "诊断单位：";
this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label17
//
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.Location = new System.Drawing.Point(551, 60);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(107, 23);
this.label17.TabIndex = 97;
this.label17.Text = "诊断证明书编号：";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// PreHisIllnessDate
//
this.PreHisIllnessDate.Location = new System.Drawing.Point(403, 60);
this.PreHisIllnessDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.PreHisIllnessDate.Name = "PreHisIllnessDate";
this.PreHisIllnessDate.Size = new System.Drawing.Size(142, 23);
this.PreHisIllnessDate.TabIndex = 96;
//
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(329, 60);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 23);
this.label1.TabIndex = 95;
this.label1.Text = "诊断日期：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// btnSymptom
//
this.btnSymptom.Location = new System.Drawing.Point(1022, 381);
@ -1247,6 +1338,7 @@
//
// superTabControl1
//
this.superTabControl1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(239)))), ((int)(((byte)(239)))), ((int)(((byte)(242)))));
//
//
//
@ -1262,103 +1354,13 @@
this.superTabControl1.ControlBox.SubItems.AddRange(new FastReport.DevComponents.DotNetBar.BaseItem[] {
this.superTabControl1.ControlBox.MenuBox,
this.superTabControl1.ControlBox.CloseBox});
this.superTabControl1.ForeColor = System.Drawing.Color.Black;
this.superTabControl1.Location = new System.Drawing.Point(0, 0);
this.superTabControl1.Name = "superTabControl1";
this.superTabControl1.ReorderTabsEnabled = true;
this.superTabControl1.SelectedTabIndex = -1;
this.superTabControl1.TabIndex = 0;
//
// label1
//
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(329, 60);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(71, 23);
this.label1.TabIndex = 95;
this.label1.Text = "诊断日期：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// PreHisIllnessDate
//
this.PreHisIllnessDate.Location = new System.Drawing.Point(403, 60);
this.PreHisIllnessDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.PreHisIllnessDate.Name = "PreHisIllnessDate";
this.PreHisIllnessDate.Size = new System.Drawing.Size(142, 23);
this.PreHisIllnessDate.TabIndex = 96;
//
// label17
//
this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label17.Location = new System.Drawing.Point(551, 60);
this.label17.Name = "label17";
this.label17.Size = new System.Drawing.Size(107, 23);
this.label17.TabIndex = 97;
this.label17.Text = "诊断证明书编号：";
this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label18
//
this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label18.Location = new System.Drawing.Point(776, 60);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(71, 23);
this.label18.TabIndex = 98;
this.label18.Text = "诊断单位：";
this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// label19
//
this.label19.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label19.Location = new System.Drawing.Point(977, 60);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(71, 23);
this.label19.TabIndex = 99;
this.label19.Text = "是否痊愈：";
this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// PreHisIllnessNo
//
this.PreHisIllnessNo.Location = new System.Drawing.Point(650, 60);
this.PreHisIllnessNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.PreHisIllnessNo.Name = "PreHisIllnessNo";
this.PreHisIllnessNo.Size = new System.Drawing.Size(120, 23);
this.PreHisIllnessNo.TabIndex = 100;
//
// PreHisIllnessOrg
//
this.PreHisIllnessOrg.Location = new System.Drawing.Point(836, 60);
this.PreHisIllnessOrg.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.PreHisIllnessOrg.Name = "PreHisIllnessOrg";
this.PreHisIllnessOrg.Size = new System.Drawing.Size(135, 23);
this.PreHisIllnessOrg.TabIndex = 101;
//
// PreHisIllnessIsHeal
//
this.PreHisIllnessIsHeal.Location = new System.Drawing.Point(1054, 60);
this.PreHisIllnessIsHeal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.PreHisIllnessIsHeal.Name = "PreHisIllnessIsHeal";
this.PreHisIllnessIsHeal.Size = new System.Drawing.Size(43, 23);
this.PreHisIllnessIsHeal.TabIndex = 102;
//
// label20
//
this.label20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label20.Location = new System.Drawing.Point(666, 140);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(107, 23);
this.label20.TabIndex = 103;
this.label20.Text = "药物禁忌或其他：";
this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// DrugTaboo
//
this.DrugTaboo.Location = new System.Drawing.Point(779, 140);
this.DrugTaboo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.DrugTaboo.Name = "DrugTaboo";
this.DrugTaboo.Size = new System.Drawing.Size(318, 23);
this.DrugTaboo.TabIndex = 104;
this.DrugTaboo.Text = "无";
//
// CareerHisInqForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@ -1367,9 +1369,11 @@
this.Controls.Add(this.panelMain);
this.Controls.Add(this.panelButtom);
this.Controls.Add(this.advPropertyGrid1);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.MainMenuStrip = this.menuStrip1;
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "CareerHisInqForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "职业史问诊";

3
PEIS/View/Exam/CareerHisInqForm.resx
Unescape View File

@ -120,9 +120,6 @@
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>175, 17</value>
</metadata>
<metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>175, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="CancelBtn.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>

26
PEIS/View/Exam/CareerHisInqStmForm.Designer.cs generated
Unescape View File

@ -38,12 +38,12 @@ namespace PEIS.View.Exam
this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
this.repositoryItemCheckedComboBoxEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckedComboBoxEdit();
this.panel2 = new System.Windows.Forms.Panel();
this.label2 = new System.Windows.Forms.Label();
this.CancelBtn = new System.Windows.Forms.Button();
this.ConfirmBtn = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.textBox1 = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
@ -144,6 +144,16 @@ namespace PEIS.View.Exam
this.panel2.Size = new System.Drawing.Size(558, 60);
this.panel2.TabIndex = 11;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Top;
this.label2.Location = new System.Drawing.Point(0, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(558, 22);
this.label2.TabIndex = 14;
this.label2.Text = "有上述症状用“± + ++ +++“表示，无症状用”-“表示 双击相应项目可以切换";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// CancelBtn
//
this.CancelBtn.Image = ((System.Drawing.Image)(resources.GetObject("CancelBtn.Image")));
@ -196,16 +206,6 @@ namespace PEIS.View.Exam
this.textBox1.Size = new System.Drawing.Size(131, 23);
this.textBox1.TabIndex = 13;
//
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Top;
this.label2.Location = new System.Drawing.Point(0, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(558, 22);
this.label2.TabIndex = 14;
this.label2.Text = "有上述症状用“± + ++ +++“表示，无症状用”-“表示 双击相应项目可以切换";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// CareerHisInqStmForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@ -215,8 +215,10 @@ namespace PEIS.View.Exam
this.Controls.Add(this.gridControl1);
this.Controls.Add(this.panel1);
this.Controls.Add(this.panel2);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.MaximizeBox = false;
this.MinimizeBox = false;
this.Name = "CareerHisInqStmForm";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "症状";

2
PEIS/View/MainForm.cs
Unescape View File

@ -88,7 +88,7 @@ namespace PEIS.View
BtnStatistics.Visible = isShow;
BtnSetting.Visible = isShow;
// lblStep.Text = $@"当前操作员：{Global.currentUser.Name}";
lblStep.Text = $"当前操作员\r\n{Global.currentUser.Name}";
stepViewer2.Eid = null;
FormClosing += TipsFormClosing;

Write Preview
Loading…
Cancel
Save