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

1、导检单上部门不显示分组，2、未分组人员显示分组，3、体检者复制加入搜索框，4、心电图预览增加文件格式判断

Browse Source
dhzzyy
lsm 12 months ago
parent 5fd38152c6
commit 68b9db0172
10 changed files with 471 additions and 450 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. 2
      PEIS/Model/Enrollment/EnrollmentPatientModel.cs
  2. 43
      PEIS/Model/ReportModel.cs
  3. 2
      PEIS/Presenter/EnrollmentPersonPresenter.cs
  4. 65
      PEIS/Utils/ReportHelper.cs
  5. 234
      PEIS/View/Enrollment/EnrollmentOrgForm.Designer.cs
  6. 15
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  7. 465
      PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs
  8. 77
      PEIS/View/Enrollment/EnrollmentPersonForm.cs
  9. 16
      PEIS/View/Enrollment/EnrollmentPersonForm.resx
  10. 2
      PEIS/View/Enrollment/IEnrollmentPersonView.cs

2
PEIS/Model/Enrollment/EnrollmentPatientModel.cs
Unescape View File

@ -270,7 +270,7 @@ namespace PEIS.Model.Enrollment
public EnrollmentPatient GetEnrollmentPatient(Int64 EId) // 获取个人体检人员信息
{
var item = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"Select * From Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE a.ID = {EId}");
var item = DAOHelp.GetDataBySQL<EnrollmentPatient>($@"Select * From Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_OrgPatient c ON a.PID = c.PID AND c.OID = a.OID WHERE a.ID = {EId}");
return item.Count != 0 ? item[0] : null;
}
}

43
PEIS/Model/ReportModel.cs
Unescape View File

@ -198,33 +198,38 @@ namespace PEIS.Model
{
using (MemoryStream memoryStream = new MemoryStream(heart[0].ReportImage))
{
// 图片格式
//Image bitmap = Image.FromStream(memoryStream);
//using (MemoryStream stream = new MemoryStream())
//{
// bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
// bitmap.Save(stream, ImageFormat.Jpeg);
// var img = stream.ToArray();
// pacs.Add(new Report { ReportImage = img });
//}
// PDF格式
using (PdfDocument pdfDocument = PdfDocument.Load(memoryStream))
if (ReportHelper.IsPdf(heart[0].ReportImage))
{
for (int pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++)
// PDF格式
using (PdfDocument pdfDocument = PdfDocument.Load(memoryStream))
{
using (Image bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false))
for (int pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++)
{
using (MemoryStream stream = new MemoryStream())
using (Image bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false))
{
bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
bitmap.Save(stream, ImageFormat.Jpeg);
var img = stream.ToArray();
pacs.Add(new Report { ReportImage = img });
using (MemoryStream stream = new MemoryStream())
{
bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
bitmap.Save(stream, ImageFormat.Jpeg);
var img = stream.ToArray();
pacs.Add(new Report { ReportImage = img });
}
}
}
}
}
else
{
// 图片格式
Image bitmap = Image.FromStream(memoryStream);
using (MemoryStream stream = new MemoryStream())
{
bitmap.RotateFlip(RotateFlipType.Rotate270FlipNone);
bitmap.Save(stream, ImageFormat.Jpeg);
var img = stream.ToArray();
pacs.Add(new Report { ReportImage = img });
}
}
}
}

2
PEIS/Presenter/EnrollmentPersonPresenter.cs
Unescape View File

@ -35,7 +35,7 @@ namespace PEIS.Presenter
// 获取登记列表
View.GetRegItems += (send, args) =>
{
View.ShowRegItems(new EnrollmentPatientModel().GetEnrollmentPatientRegItems(args.Item.begDate, args.Item.endDate, args.Item.name));
View.ShowRegItems(new EnrollmentPatientModel().GetEnrollmentPatientRegItems(args.Item.begDate, args.Item.endDate, args.Item.name), args.Item.code);
};
View.GetRegInfo += (send, args) =>
{

65
PEIS/Utils/ReportHelper.cs
Unescape View File

@ -42,35 +42,40 @@ namespace PEIS.Utils
{
try
{
// 图片格式
//using (var ms = new MemoryStream(pdf, 0, pdf.Length))
//{
// return Image.FromStream(ms, true);
//}
// PDF格式
using (var memoryStream = new MemoryStream(pdf))
if (IsPdf(pdf))
{
using (var pdfDocument = PdfiumViewer.PdfDocument.Load(memoryStream))
// PDF格式
using (var memoryStream = new MemoryStream(pdf))
{
for (var pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++)
using (var pdfDocument = PdfiumViewer.PdfDocument.Load(memoryStream))
{
using (var bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false))
for (var pageIndex = 0; pageIndex < pdfDocument.PageCount; pageIndex++)
{
using (var stream = new MemoryStream())
using (var bitmap = pdfDocument.Render(pageIndex, 2480, 3508, false))
{
bitmap.Save(stream, ImageFormat.Jpeg);
var img = stream.ToArray();
using (var ms = new MemoryStream(img, 0, img.Length))
using (var stream = new MemoryStream())
{
return Image.FromStream(ms, true);
bitmap.Save(stream, ImageFormat.Jpeg);
var img = stream.ToArray();
using (var ms = new MemoryStream(img, 0, img.Length))
{
return Image.FromStream(ms, true);
}
}
}
}
}
}
}
else
{
// 图片格式
using (var ms = new MemoryStream(pdf, 0, pdf.Length))
{
return Image.FromStream(ms, true);
}
}
}
catch (Exception ex)
{
@ -80,6 +85,28 @@ namespace PEIS.Utils
return null;
}
/// <summary>
/// 判断是否PDF
/// </summary>
/// <param name="fileBytes"></param>
/// <returns></returns>
public static bool IsPdf(byte[] fileBytes)
{
const string pdfSignature = "%PDF";
if (fileBytes.Length >= pdfSignature.Length)
{
for (int i = 0; i < pdfSignature.Length; i++)
{
if (fileBytes[i] != pdfSignature[i])
{
return false;
}
}
return true;
}
return false;
}
/// <summary>
/// 获取报告单
/// </summary>
@ -499,14 +526,14 @@ namespace PEIS.Utils
rpt.SetParameterValue("ExamDate", regInfo.SignTime?.ToShortDateString());
rpt.SetParameterValue("Marriage", regInfo.Marriage);
rpt.SetParameterValue("TeamName", regInfo.OrgName);
rpt.SetParameterValue("GroupName", regInfo.GroupName);
rpt.SetParameterValue("GroupName", regInfo.DeptName);
rpt.SetParameterValue("ExamType", regInfo.Type);
rpt.SetParameterValue("Tel", regInfo.Tel1);
rpt.SetParameterValue("Nation", regInfo.Nation);
rpt.SetParameterValue("CardNo", regInfo.CardNo);
rpt.SetParameterValue("HospitalName", Global._hospital?.Name);
if (regInfo.Photo == null)
if (string.IsNullOrEmpty(regInfo.Photo))
{
rpt.SetParameterValue("Avatar", regInfo.Photo);
}

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

@ -95,6 +95,7 @@
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.DgcPatient = new DevExpress.XtraGrid.GridControl();
this.DgvPatient = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
@ -103,17 +104,12 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit();
this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemImageEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemImageEdit();
this.panel10 = new System.Windows.Forms.Panel();
this.ImportBtn = new System.Windows.Forms.Button();
this.NewBaseBtn = new System.Windows.Forms.Button();
@ -345,6 +341,7 @@
this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
this.PatientSearch = new System.Windows.Forms.TextBox();
@ -378,7 +375,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.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemMemoEdit21)).BeginInit();
this.panel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.DgcOrg)).BeginInit();
@ -532,7 +528,7 @@
// DgcOrg
//
this.DgcOrg.Dock = System.Windows.Forms.DockStyle.Fill;
this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.DgcOrg.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.DgcOrg.Location = new System.Drawing.Point(0, 163);
this.DgcOrg.MainView = this.DgvOrg;
this.DgcOrg.Name = "DgcOrg";
@ -564,7 +560,7 @@
this.gridColumn21});
this.DgvOrg.FixedLineWidth = 1;
this.DgvOrg.GridControl = this.DgcOrg;
this.DgvOrg.IndicatorWidth = 70;
this.DgvOrg.IndicatorWidth = 40;
this.DgvOrg.Name = "DgvOrg";
this.DgvOrg.OptionsMenu.EnableColumnMenu = false;
this.DgvOrg.OptionsSelection.MultiSelect = true;
@ -868,7 +864,7 @@
//
this.splitter1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
this.splitter1.Location = new System.Drawing.Point(236, 0);
this.splitter1.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
this.splitter1.Margin = new System.Windows.Forms.Padding(1);
this.splitter1.Name = "splitter1";
this.splitter1.Size = new System.Drawing.Size(4, 779);
this.splitter1.TabIndex = 1;
@ -1259,7 +1255,7 @@
this.splitter3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
this.splitter3.Dock = System.Windows.Forms.DockStyle.Right;
this.splitter3.Location = new System.Drawing.Point(658, 189);
this.splitter3.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
this.splitter3.Margin = new System.Windows.Forms.Padding(1);
this.splitter3.Name = "splitter3";
this.splitter3.Size = new System.Drawing.Size(4, 547);
this.splitter3.TabIndex = 135;
@ -1308,6 +1304,7 @@
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.gridColumn106,
this.gridColumn20,
this.gridColumn22,
this.gridColumn26,
@ -1316,14 +1313,9 @@
this.gridColumn23,
this.gridColumn24,
this.gridColumn25,
this.gridColumn29,
this.gridColumn30,
this.gridColumn31,
this.gridColumn38,
this.gridColumn39,
this.gridColumn40,
this.gridColumn41,
this.gridColumn42,
this.gridColumn54,
this.gridColumn56});
this.DgvPatient.FixedLineWidth = 1;
@ -1335,6 +1327,24 @@
this.DgvPatient.OptionsView.ShowGroupPanel = false;
this.DgvPatient.RowHeight = 40;
//
// gridColumn106
//
this.gridColumn106.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn106.AppearanceCell.Options.UseFont = true;
this.gridColumn106.Caption = "部门";
this.gridColumn106.FieldName = "DeptName";
this.gridColumn106.Name = "gridColumn106";
this.gridColumn106.OptionsColumn.AllowEdit = false;
this.gridColumn106.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn106.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn106.OptionsColumn.AllowMove = false;
this.gridColumn106.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn106.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn106.OptionsColumn.ReadOnly = true;
this.gridColumn106.OptionsFilter.AllowFilter = false;
this.gridColumn106.Visible = true;
this.gridColumn106.VisibleIndex = 0;
//
// gridColumn20
//
this.gridColumn20.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@ -1348,7 +1358,7 @@
this.gridColumn20.OptionsColumn.ReadOnly = true;
this.gridColumn20.OptionsFilter.AllowFilter = false;
this.gridColumn20.Visible = true;
this.gridColumn20.VisibleIndex = 0;
this.gridColumn20.VisibleIndex = 1;
this.gridColumn20.Width = 80;
//
// gridColumn22
@ -1364,7 +1374,7 @@
this.gridColumn22.OptionsColumn.ReadOnly = true;
this.gridColumn22.OptionsFilter.AllowFilter = false;
this.gridColumn22.Visible = true;
this.gridColumn22.VisibleIndex = 1;
this.gridColumn22.VisibleIndex = 2;
this.gridColumn22.Width = 40;
//
// gridColumn26
@ -1378,8 +1388,9 @@
this.gridColumn26.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn26.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn26.OptionsColumn.ReadOnly = true;
this.gridColumn26.OptionsFilter.AllowFilter = false;
this.gridColumn26.Visible = true;
this.gridColumn26.VisibleIndex = 2;
this.gridColumn26.VisibleIndex = 3;
this.gridColumn26.Width = 60;
//
// gridColumn27
@ -1393,8 +1404,9 @@
this.gridColumn27.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn27.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn27.OptionsColumn.ReadOnly = true;
this.gridColumn27.OptionsFilter.AllowFilter = false;
this.gridColumn27.Visible = true;
this.gridColumn27.VisibleIndex = 3;
this.gridColumn27.VisibleIndex = 4;
this.gridColumn27.Width = 60;
//
// gridColumn28
@ -1410,7 +1422,7 @@
this.gridColumn28.OptionsColumn.ReadOnly = true;
this.gridColumn28.OptionsFilter.AllowFilter = false;
this.gridColumn28.Visible = true;
this.gridColumn28.VisibleIndex = 4;
this.gridColumn28.VisibleIndex = 5;
this.gridColumn28.Width = 60;
//
// gridColumn23
@ -1428,7 +1440,7 @@
this.gridColumn23.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Count, "BloodCode", "合计：{0} 个血袋")});
this.gridColumn23.Visible = true;
this.gridColumn23.VisibleIndex = 5;
this.gridColumn23.VisibleIndex = 6;
this.gridColumn23.Width = 100;
//
// gridColumn24
@ -1444,7 +1456,7 @@
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.OptionsFilter.AllowFilter = false;
this.gridColumn24.Visible = true;
this.gridColumn24.VisibleIndex = 6;
this.gridColumn24.VisibleIndex = 7;
this.gridColumn24.Width = 80;
//
// gridColumn25
@ -1460,23 +1472,9 @@
this.gridColumn25.OptionsColumn.ReadOnly = true;
this.gridColumn25.OptionsFilter.AllowFilter = false;
this.gridColumn25.Visible = true;
this.gridColumn25.VisibleIndex = 7;
this.gridColumn25.VisibleIndex = 8;
this.gridColumn25.Width = 160;
//
// gridColumn29
//
this.gridColumn29.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn29.AppearanceCell.Options.UseFont = true;
this.gridColumn29.Caption = "职业";
this.gridColumn29.FieldName = "Occupation";
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 = 8;
//
// gridColumn30
//
this.gridColumn30.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@ -1488,6 +1486,7 @@
this.gridColumn30.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn30.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn30.OptionsColumn.ReadOnly = true;
this.gridColumn30.OptionsFilter.AllowFilter = false;
this.gridColumn30.Visible = true;
this.gridColumn30.VisibleIndex = 9;
this.gridColumn30.Width = 200;
@ -1501,54 +1500,11 @@
this.gridColumn31.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn31.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn31.OptionsColumn.ReadOnly = true;
this.gridColumn31.OptionsFilter.AllowFilter = false;
this.gridColumn31.Visible = true;
this.gridColumn31.VisibleIndex = 10;
this.gridColumn31.Width = 200;
//
// gridColumn38
//
this.gridColumn38.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn38.AppearanceCell.Options.UseFont = true;
this.gridColumn38.Caption = "备注";
this.gridColumn38.FieldName = "Description";
this.gridColumn38.Name = "gridColumn38";
this.gridColumn38.OptionsColumn.AllowEdit = false;
this.gridColumn38.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn38.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn38.OptionsColumn.ReadOnly = true;
this.gridColumn38.Visible = true;
this.gridColumn38.VisibleIndex = 12;
//
// gridColumn39
//
this.gridColumn39.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn39.AppearanceCell.Options.UseFont = true;
this.gridColumn39.Caption = "建档时间";
this.gridColumn39.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.gridColumn39.FieldName = "CreateTime";
this.gridColumn39.Name = "gridColumn39";
this.gridColumn39.OptionsColumn.AllowEdit = false;
this.gridColumn39.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn39.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn39.OptionsColumn.ReadOnly = true;
this.gridColumn39.Visible = true;
this.gridColumn39.VisibleIndex = 13;
this.gridColumn39.Width = 130;
//
// gridColumn40
//
this.gridColumn40.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn40.AppearanceCell.Options.UseFont = true;
this.gridColumn40.Caption = "建档人";
this.gridColumn40.FieldName = "Creator";
this.gridColumn40.Name = "gridColumn40";
this.gridColumn40.OptionsColumn.AllowEdit = false;
this.gridColumn40.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn40.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn40.OptionsColumn.ReadOnly = true;
this.gridColumn40.Visible = true;
this.gridColumn40.VisibleIndex = 14;
//
// gridColumn41
//
this.gridColumn41.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@ -1560,28 +1516,11 @@
this.gridColumn41.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn41.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn41.OptionsColumn.ReadOnly = true;
this.gridColumn41.OptionsFilter.AllowFilter = false;
this.gridColumn41.Visible = true;
this.gridColumn41.VisibleIndex = 15;
this.gridColumn41.VisibleIndex = 11;
this.gridColumn41.Width = 40;
//
// gridColumn42
//
this.gridColumn42.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn42.AppearanceCell.Options.UseFont = true;
this.gridColumn42.Caption = "身份证照片";
this.gridColumn42.ColumnEdit = this.repositoryItemImageEdit1;
this.gridColumn42.FieldName = "Photo";
this.gridColumn42.Name = "gridColumn42";
this.gridColumn42.Visible = true;
this.gridColumn42.VisibleIndex = 11;
//
// 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";
//
// gridColumn54
//
this.gridColumn54.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@ -1589,8 +1528,11 @@
this.gridColumn54.Caption = "PID";
this.gridColumn54.FieldName = "PID";
this.gridColumn54.Name = "gridColumn54";
this.gridColumn54.OptionsColumn.AllowEdit = false;
this.gridColumn54.OptionsColumn.ReadOnly = true;
this.gridColumn54.OptionsFilter.AllowFilter = false;
this.gridColumn54.Visible = true;
this.gridColumn54.VisibleIndex = 16;
this.gridColumn54.VisibleIndex = 12;
//
// gridColumn56
//
@ -1599,8 +1541,23 @@
this.gridColumn56.Caption = "OID";
this.gridColumn56.FieldName = "OID";
this.gridColumn56.Name = "gridColumn56";
this.gridColumn56.OptionsColumn.AllowEdit = false;
this.gridColumn56.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn56.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn56.OptionsColumn.AllowMove = false;
this.gridColumn56.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn56.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn56.OptionsColumn.ReadOnly = true;
this.gridColumn56.OptionsFilter.AllowFilter = false;
this.gridColumn56.Visible = true;
this.gridColumn56.VisibleIndex = 17;
this.gridColumn56.VisibleIndex = 13;
//
// 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";
//
// panel10
//
@ -1667,7 +1624,7 @@
this.splitter2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(132)))), ((int)(((byte)(162)))), ((int)(((byte)(202)))));
this.splitter2.Dock = System.Windows.Forms.DockStyle.Top;
this.splitter2.Location = new System.Drawing.Point(0, 184);
this.splitter2.Margin = new System.Windows.Forms.Padding(1, 1, 1, 1);
this.splitter2.Margin = new System.Windows.Forms.Padding(1);
this.splitter2.Name = "splitter2";
this.splitter2.Size = new System.Drawing.Size(1196, 5);
this.splitter2.TabIndex = 132;
@ -1909,7 +1866,7 @@
this.TpGroupFeeItem.Controls.Add(this.panel4);
this.TpGroupFeeItem.Image = global::PEIS.Properties.Resources.收费项目;
this.TpGroupFeeItem.Name = "TpGroupFeeItem";
this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 922);
this.TpGroupFeeItem.Size = new System.Drawing.Size(1196, 736);
this.TpGroupFeeItem.Text = "分组项目";
//
// panel5
@ -1922,7 +1879,7 @@
this.panel5.Location = new System.Drawing.Point(0, 192);
this.panel5.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panel5.Name = "panel5";
this.panel5.Size = new System.Drawing.Size(1196, 730);
this.panel5.Size = new System.Drawing.Size(1196, 544);
this.panel5.TabIndex = 139;
//
// DgcGroupFeeItem
@ -1933,7 +1890,7 @@
this.DgcGroupFeeItem.Name = "DgcGroupFeeItem";
this.DgcGroupFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemMemoEdit1});
this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 725);
this.DgcGroupFeeItem.Size = new System.Drawing.Size(732, 539);
this.DgcGroupFeeItem.TabIndex = 137;
this.DgcGroupFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvGroupFeeItem});
@ -2133,7 +2090,7 @@
this.splitter4.Dock = System.Windows.Forms.DockStyle.Right;
this.splitter4.Location = new System.Drawing.Point(732, 5);
this.splitter4.Name = "splitter4";
this.splitter4.Size = new System.Drawing.Size(4, 725);
this.splitter4.Size = new System.Drawing.Size(4, 539);
this.splitter4.TabIndex = 142;
this.splitter4.TabStop = false;
//
@ -2144,7 +2101,7 @@
this.panel9.Location = new System.Drawing.Point(736, 5);
this.panel9.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.panel9.Name = "panel9";
this.panel9.Size = new System.Drawing.Size(460, 725);
this.panel9.Size = new System.Drawing.Size(460, 539);
this.panel9.TabIndex = 141;
//
// tabControl1
@ -2156,17 +2113,17 @@
this.tabControl1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
this.tabControl1.Size = new System.Drawing.Size(460, 725);
this.tabControl1.Size = new System.Drawing.Size(460, 539);
this.tabControl1.TabIndex = 139;
//
// TpPack
//
this.TpPack.Controls.Add(this.DgcPack);
this.TpPack.Location = new System.Drawing.Point(4, 24);
this.TpPack.Location = new System.Drawing.Point(4, 23);
this.TpPack.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.TpPack.Name = "TpPack";
this.TpPack.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.TpPack.Size = new System.Drawing.Size(452, 708);
this.TpPack.Size = new System.Drawing.Size(452, 512);
this.TpPack.TabIndex = 1;
this.TpPack.Text = "套餐";
this.TpPack.UseVisualStyleBackColor = true;
@ -2177,7 +2134,7 @@
this.DgcPack.Location = new System.Drawing.Point(2, 3);
this.DgcPack.MainView = this.DgvPack;
this.DgcPack.Name = "DgcPack";
this.DgcPack.Size = new System.Drawing.Size(448, 702);
this.DgcPack.Size = new System.Drawing.Size(448, 506);
this.DgcPack.TabIndex = 122;
this.DgcPack.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvPack,
@ -2338,11 +2295,11 @@
//
this.TpFeeItem.Controls.Add(this.DgcFeeItem);
this.TpFeeItem.Controls.Add(this.FeeItemSearch);
this.TpFeeItem.Location = new System.Drawing.Point(4, 24);
this.TpFeeItem.Location = new System.Drawing.Point(4, 23);
this.TpFeeItem.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.TpFeeItem.Name = "TpFeeItem";
this.TpFeeItem.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.TpFeeItem.Size = new System.Drawing.Size(452, 708);
this.TpFeeItem.Size = new System.Drawing.Size(452, 512);
this.TpFeeItem.TabIndex = 0;
this.TpFeeItem.Text = "收费项目";
this.TpFeeItem.UseVisualStyleBackColor = true;
@ -2355,7 +2312,7 @@
this.DgcFeeItem.Name = "DgcFeeItem";
this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemCheckEdit1});
this.DgcFeeItem.Size = new System.Drawing.Size(448, 680);
this.DgcFeeItem.Size = new System.Drawing.Size(448, 484);
this.DgcFeeItem.TabIndex = 137;
this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.DgvFeeItem,
@ -4434,7 +4391,7 @@
this.menuStrip1.Location = new System.Drawing.Point(0, 0);
this.menuStrip1.Name = "menuStrip1";
this.menuStrip1.Padding = new System.Windows.Forms.Padding(2, 2, 0, 2);
this.menuStrip1.Size = new System.Drawing.Size(893, 44);
this.menuStrip1.Size = new System.Drawing.Size(789, 44);
this.menuStrip1.TabIndex = 129;
this.menuStrip1.Text = "menuStrip1";
//
@ -4563,6 +4520,7 @@
this.TsmiBatchCtrl.Name = "TsmiBatchCtrl";
this.TsmiBatchCtrl.Size = new System.Drawing.Size(104, 40);
this.TsmiBatchCtrl.Text = "批量操作";
this.TsmiBatchCtrl.Visible = false;
//
// splitterControl1
//
@ -4695,7 +4653,7 @@
this.DgvEnrollment.GridControl = this.DgcEnrollment;
this.DgvEnrollment.GroupCount = 1;
this.DgvEnrollment.GroupFormat = "";
this.DgvEnrollment.IndicatorWidth = 75;
this.DgvEnrollment.IndicatorWidth = 70;
this.DgvEnrollment.Name = "DgvEnrollment";
this.DgvEnrollment.OptionsFilter.AllowFilterEditor = false;
this.DgvEnrollment.OptionsMenu.EnableColumnMenu = false;
@ -4929,6 +4887,23 @@
this.gridColumn96.VisibleIndex = 9;
this.gridColumn96.Width = 160;
//
// gridColumn105
//
this.gridColumn105.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn105.AppearanceCell.Options.UseFont = true;
this.gridColumn105.Caption = "联系方式";
this.gridColumn105.FieldName = "Tel1";
this.gridColumn105.Name = "gridColumn105";
this.gridColumn105.OptionsColumn.AllowEdit = false;
this.gridColumn105.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.AllowMove = false;
this.gridColumn105.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.ReadOnly = true;
this.gridColumn105.OptionsFilter.AllowFilter = false;
this.gridColumn105.Visible = true;
this.gridColumn105.VisibleIndex = 11;
//
// gridColumn104
//
this.gridColumn104.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
@ -5184,23 +5159,6 @@
//
this.gridView8.Name = "gridView8";
//
// gridColumn105
//
this.gridColumn105.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 12F);
this.gridColumn105.AppearanceCell.Options.UseFont = true;
this.gridColumn105.Caption = "联系方式";
this.gridColumn105.FieldName = "Tel1";
this.gridColumn105.Name = "gridColumn105";
this.gridColumn105.OptionsColumn.AllowEdit = false;
this.gridColumn105.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.AllowMerge = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.AllowMove = false;
this.gridColumn105.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
this.gridColumn105.OptionsColumn.ReadOnly = true;
this.gridColumn105.OptionsFilter.AllowFilter = false;
this.gridColumn105.Visible = true;
this.gridColumn105.VisibleIndex = 11;
//
// EnrollmentOrgForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
@ -5489,14 +5447,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
private DevExpress.XtraEditors.Repository.RepositoryItemImageEdit repositoryItemImageEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
@ -5667,5 +5620,6 @@
private System.Windows.Forms.ToolStripMenuItem FastExportTime;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn104;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn105;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn106;
}
}

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

@ -1,5 +1,4 @@
using DevExpress.Utils;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraGrid.Views.Grid.ViewInfo;
using DevExpress.XtraPrinting.Native;
@ -1458,32 +1457,32 @@ namespace PEIS.View.Enrollment
e.Info.DisplayText = (e.RowHandle + 1).ToString();
}
private void DgvGroupFeeItem_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
private void DgvGroupFeeItem_MouseDown(object sender, MouseEventArgs e)
{
_hInfo = DgvGroupFeeItem.CalcHitInfo(e.X, e.Y);
}
private void DgvFeeItem_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
private void DgvFeeItem_MouseDown(object sender, MouseEventArgs e)
{
_hInfo = DgvFeeItem.CalcHitInfo(e.X, e.Y);
}
private void DgvPack_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
private void DgvPack_MouseDown(object sender, MouseEventArgs e)
{
_hInfo = DgvPack.CalcHitInfo(e.X, e.Y);
}
private void DgvGroupPatient_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
private void DgvGroupPatient_MouseDown(object sender, MouseEventArgs e)
{
_hInfo = DgvGroupPatient.CalcHitInfo(e.X, e.Y);
}
private void DgvPatient_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
private void DgvPatient_MouseDown(object sender, MouseEventArgs e)
{
_hInfo = DgvPatient.CalcHitInfo(e.X, e.Y);
}
private void DgvEnrollmentFeeItem_MouseDown(object sender, System.Windows.Forms.MouseEventArgs e)
private void DgvEnrollmentFeeItem_MouseDown(object sender, MouseEventArgs e)
{
_hInfo = DgvEnrollmentFeeItem.CalcHitInfo(e.X, e.Y);
}

465
PEIS/View/Enrollment/EnrollmentPersonForm.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

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

@ -23,7 +23,7 @@ namespace PEIS.View.Enrollment
public partial class EnrollmentPersonForm : ViewBase, IEnrollmentPersonView
{
List<Pack> _lstPack = null;
List<EnrollmentPatient> _lstRegItems = null;
List<EnrollmentPatient> _lstRegItems = null, _lstRegItems2 = null;
List<EnrollmentFeeItem> _lstEFeeItem = null, _lstCopyFeeItem = null;
List<EnrollmentCheckCost> _lstCheckCost = null;
List<FeeItem> _lstFeeItem = null, _lstPackFeeItem = null;
@ -137,6 +137,7 @@ namespace PEIS.View.Enrollment
DgvCopyItem.CustomColumnDisplayText += DgvCopyItem_CustomColumnDisplayText;
DgvRegItem2.SelectionChanged += DgvRegItem2_SelectionChanged;
NameSearch2.KeyDown += NameSearch2_KeyDown;
#region 判断双击位置
DgvPack.MouseDown += DgvPack_MouseDown;
@ -145,7 +146,6 @@ namespace PEIS.View.Enrollment
#endregion
}
private void DgvEFeeItem_MouseDown(object sender, MouseEventArgs e)
{
eInfo = DgvEFeeItem.CalcHitInfo(e.X, e.Y);
@ -223,7 +223,7 @@ namespace PEIS.View.Enrollment
ThreadPool.QueueUserWorkItem(state =>
{
OnGetRegItems();
OnGetRegItems(0);
OnGetPackItem(); // 获取体检套餐
OnGetFeeItem(); // 获取收费项目
});
@ -235,14 +235,14 @@ namespace PEIS.View.Enrollment
private void NameSearch_KeyDown(object sender, KeyEventArgs e) // 模糊检索
{
if (e.KeyCode == Keys.Enter) OnGetRegItems();
if (e.KeyCode == Keys.Enter) OnGetRegItems(0);
}
private void TsmiRegRefresh_Click(object sender, EventArgs e) // 刷新按钮
{
// 使当前控件获得焦点，避免日期选择器修改后未生效
menuStrip1.Focus();
OnGetRegItems();
OnGetRegItems(0);
}
private void DgvRegItem_SelectionChanged(object sender, DevExpress.Data.SelectionChangedEventArgs e) // 登记列表切换
@ -303,7 +303,7 @@ namespace PEIS.View.Enrollment
{
NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(null, false);
enrollmentPersonForm.ShowDialog();
OnGetRegItems();
OnGetRegItems(0);
}
private void TsmiRegEdit_Click(object sender, EventArgs e) // 编辑登记信息
@ -311,7 +311,7 @@ namespace PEIS.View.Enrollment
if (_lstRegItems == null || _lstRegItems.Count() == 0) return;
NewEnrollmentPersonForm enrollmentPersonForm = new NewEnrollmentPersonForm(_chooseRegItem, true);
enrollmentPersonForm.ShowDialog();
OnGetRegItems();
OnGetRegItems(0);
}
private void TsmiRegCancel_Click(object sender, EventArgs e) // 取消登记
@ -331,7 +331,7 @@ namespace PEIS.View.Enrollment
if (Global.Msg("warn", "确定取消登记该信息？") == DialogResult.No) return;
OnCancelRegInfo(_chooseRegItem.ID);
OnGetRegItems();
OnGetRegItems(0);
}
#endregion
@ -604,7 +604,7 @@ namespace PEIS.View.Enrollment
//CostToHis(_chooseRegItem.ID);
OnSendToDept(_chooseRegItem.ID);
OnGetRegItems();
OnGetRegItems(0);
OnGetCheckCost(_chooseRegItem.ID);
}
@ -755,9 +755,13 @@ namespace PEIS.View.Enrollment
{
if (_chooseRegItem == null || _chooseRegItem.SignTime == null) return;
OnRecallDept(_chooseRegItem.ID);
OnGetRegItems();
OnGetRegItems(0);
}
private void NameSearch2_KeyDown(object sender, KeyEventArgs e)
{
if (e.KeyCode == Keys.Enter) OnGetRegItems(1);
}
#endregion
@ -765,42 +769,47 @@ namespace PEIS.View.Enrollment
// 获取登记列表
public event EventHandler<Args<dynamic>> GetRegItems;
public void ShowRegItems(List<EnrollmentPatient> items)
public void ShowRegItems(List<EnrollmentPatient> items, int code)
{
items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : "");
Invoke(new Action(() => _lstRegItems = items));
Invoke(new Action(() => { DgcRegItem.DataSource = null; DgcRegItem2.DataSource = null; }));
Invoke(new Action(() => { DgcRegItem.DataSource = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true); }));
Invoke(new Action(() =>
{
var list = new List<EnrollmentPatient>();
DgcRegItem2.DataSource = list.Concat(items);
}));
if (code == 0) {
items.ForEach(a => a.Sex = a.Sex.Equals("1") ? "男" : a.Sex.Equals("2") ? "女" : "");
Invoke(new Action(() => _lstRegItems = items));
Invoke(new Action(() => DgcRegItem.DataSource = null));
Invoke(new Action(() => { DgcRegItem.DataSource = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true); }));
if (_lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).Count() != 0)
{
Invoke(new Action(() => _chooseRegItem = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).ToList()[0]));
Invoke(new Action(() => OnGetRegInfo(_chooseRegItem.ID)));
Invoke(new Action(() => OnGetExamFeeItem(_chooseRegItem.ID, "0")));
Invoke(new Action(() => OnGetCheckCost(_chooseRegItem.ID)));
if (_lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).Count() != 0)
{
Invoke(new Action(() => _chooseRegItem = _lstRegItems.Where(a => a?.Name.Contains(NameSearch.Text) == true || a?.ID.ToString().Contains(NameSearch.Text) == true).ToList()[0]));
Invoke(new Action(() => OnGetRegInfo(_chooseRegItem.ID)));
Invoke(new Action(() => OnGetExamFeeItem(_chooseRegItem.ID, "0")));
Invoke(new Action(() => OnGetCheckCost(_chooseRegItem.ID)));
}
else
{
DgcEFeeItem.DataSource = _lstEFeeItem = null;
DgcCheckCost.DataSource = _lstCheckCost = null;
_chooseRegItem = null;
RegDataBinds(_chooseRegItem);
}
}
else
{
DgcEFeeItem.DataSource = _lstEFeeItem = null;
DgcCheckCost.DataSource = _lstCheckCost = null;
DgcCopyItem.DataSource = _lstCopyFeeItem = null;
_chooseRegItem = null;
RegDataBinds(_chooseRegItem);
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); }));
if (_lstRegItems2.Where(a => a?.Name.Contains(NameSearch2.Text) == true || a?.ID.ToString().Contains(NameSearch2.Text) == true).Count() == 0) DgcCopyItem.DataSource = _lstCopyFeeItem = null;
}
DgvRegItem.ExpandAllGroups();
Invoke(new Action(() => DgvRegItem.BestFitColumns()));
Invoke(new Action(() => { DgvRegItem.BestFitColumns(); DgvRegItem2.BestFitColumns(); }));
}
protected virtual void OnGetRegItems()
protected virtual void OnGetRegItems(int code)
{
dynamic searchData = new ExpandoObject();
searchData.begDate = BegDate.Value.ToShortDateString();
searchData.endDate = EndDate.Value.ToShortDateString();
searchData.name = NameSearch.Text;
searchData.name = code == 0 ? NameSearch.Text : NameSearch2.Text;
searchData.code = code;
GetRegItems?.Invoke(this, new Args<dynamic>()
{
Item = searchData

16
PEIS/View/Enrollment/EnrollmentPersonForm.resx
Unescape View File

@ -250,7 +250,7 @@
<data name="新建NToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAERSURBVDhPrZDbSgJRGIXnpewd6jXsjSQvIrwoI0RQMChU
0iiDPCGiE3ZCRkvR8VzTeBhnyR5/ccaZNnPhB4t9sdf6Ln5hb8QeathNJFVFKF5C8DqL4ksDVHWGDf7j
LHyPg6NjviSaFqlu5yQYR+KpupaIkrMknCxT3Y7v/NYYb0ITK1c3BarbWWhLQ7IR0cTKReyZ6lZ0XYei
ztHpK4bAc+h1FgQijzSxMptrGIxVSO0xX3AaStFki7bUMVFmaMm/eJMGfIH/MkGzLep0AXn4h/r3CJV3
@ -261,7 +261,7 @@
<data name="打开OToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJHSURBVDhPxZBdSNNhFMb/F110ZZEVhVBgeeHNICiiuggp
olAUyyxI0oSaH1QYC3N+tKnp5ubm1JUua5uuqdNKMwr7kApFItTUkWZqVhSVYmao5Nevvy7UoYR3HXh4
4XCe33nOKyy3lAY7l9RWMo0O/raWXxEyo5spVYTNvOGyfIRPfW+ptOkXqaPl6T83hcRmExSdgzAz3NVm
YWyoYla/B+1M9JtxWLPpaH22JORIjI6gKAMB0jyEimIdo4OlbuaprwVMOOMovammpDADc34qppwUrmnl
@ -277,7 +277,7 @@
<data name="保存SToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIySURBVDhPrZLfS5NRGMfff6H7boIuuq2pMZyL1eAt11CW
DcOKsB9vpFmaLtNExco0av6CbIVLJ61Wk3BSkT/AFCkRZSpZmrmiJQ41xSaCwdfznL15XEUX0Reem5f3
8znnec4j/Zc8fxYGla91CS3eRTx0z6OpMYS7jmnU1X6B/VYA18snUVoyjsKCt8jLHcH5c36ouCQR2NUJ
1Nas4G9ZXlmFKbULh1Kf8lJxSfI+WeCCyopv6q+/h+DQ/DJ2WV5Ao1FgPegRAveDOS4oLfmq/h6dn/DH
@ -293,7 +293,7 @@
<data name="打印PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIpSURBVDhPtZL/T1JRGMb5p1itrVZbbRpqZbawnBENV1I0
jGlByTSyJTXJwq2oKZQb1KAv6JCYWSxvBrkkZUq4CeQEiRABFeLL072Xa0zRra31bO8v57zP5znnPYf1
X+TxhWF6O7VtGYcnwbSWijKPOLzYrPSvLPwLS3huGUMlT7o9wGD9grVUBj+icdid03S9tDmgNxNwTgVQ
J+rA8XNtWwM+uuZATMwxmQVRycuJFNyzIRitDlScugKzjSgFRGJJaIwEsrk8AsHIhnSL/Ssck37UNipQ
@ -308,7 +308,7 @@
<data name="打印预览VToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGCSURBVDhPnZK9S0JRGMb9F1xb2gqaq6mhwCGDtvYIIyLI
cJOE1paoIYpMKUjFRDH87lpoakGlIZF9DA2hZJEQhJXl1xPn3HPV29WQfvBwOfA+P95zuDJ39A6/4wyl
YOOSMHvOcHGThuwvSKEVRvsR+pQqWD3R1pK98DUbl7Jm5hA8SfESd6S5xH5wycalrO4E0D8yWQuriLH6
E2xcSqlcoRJBxCpiTO5TNi4m/ZgDF4nDsOulsfujyGRzUsmWM8YqdcggKbveS3A88bEkslRye58RSzZt
@ -321,7 +321,7 @@
<data name="剪切TToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGDSURBVDhPrZFNSwJRGIX9NYGbFoUlFElY1EJQKEYhCJsi
LaVsERnRF5iCaSZJO1toCDVGFkgoFpWQWWRR2aIvUxm1BKN1wSnHCFw4TOCzue+9nPNw4eVVnav4Izzb
QfxeGZ5TWaxT/rK3irzmC7CsusvC1G4IkbNLboIiDieF4GGUKeTeClDpppF8eeEu2PIfwfrzizSdw3Hk
EnKlFpkMzV2wH77AosOFTV8A+vkl9CiHuJeLJNNZjM8tYWB0FkTvMAwmy/8ERTR6CwjlGAi1Ccence6C
@ -334,7 +334,7 @@
<data name="复制CToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHkSURBVDhPvZHfS1NhHIf3p5QypLr2D4goMwoMCi/qIugH
Xe1Cr7qKDIMkZixwNhfWLGWbnuki0kXKzLU023KubBNPJrbRdOzocm6e2dPOO21mMS+CHvjcvOf9PF++
79H9M+7RT2iRRsIi9sEAXe43yAvf2LpSHq28G9uAnytNT4jMLewtcQ2Ht2pF8ps/aOt+gccX5lxD694S
+1BQFD1RkN5DSFa4Z3uONKbgHE3h8KZ4OJTC1J8UiSzmfhd2uf1CoJHbyKOsZokl0kKwm+aeJaov+wjO
@ -348,7 +348,7 @@
<data name="粘贴PToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAAHYcAAB2HAY/l8WUAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAJSSURBVDhPtZJrSJNRGMdf6IN9KbpQn/pUEH2JIoLqQ0Zh
FqYZRmJG1iKmUqKyLB2pqSm6vC1Nm5GXoeatEsVJ0RASR3eNzegikRq5lrV3857Fr/d9ddlICoL+8OfA
Oef/e57zcIT/os7WLMw302muSGJ2689qqi7A44q8IzjtNYzarzHQm8tZtT8FmRqu6LToMxN+B8qhCbGR
KVcDE85ajKUaxoaryEuL4UVXIudPB5Ko2oy98xjDptXERuz3hsgAOTzlqqMk6yjdllzE90UM9Wp5azlB

2
PEIS/View/Enrollment/IEnrollmentPersonView.cs
Unescape View File

@ -28,7 +28,7 @@ namespace PEIS.View.Enrollment
{
// 获取登记列表
event EventHandler<Args<dynamic>> GetRegItems;
void ShowRegItems(List<EnrollmentPatient> items);
void ShowRegItems(List<EnrollmentPatient> items, int code);
// 获取登记信息
event EventHandler<Args<EnrollmentPatient>> GetRegInfo;

Write Preview
Loading…
Cancel
Save