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

1、团体导出模板更改，2、订单合并显示，3、证件类型允许修改

Browse Source
dhzzyy
lsm 8 months ago
parent 094158650a
commit eaf1693c92
6 changed files with 173 additions and 163 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. 6
      PEIS/Model/Enrollment/EnrollmentOrgModel.cs
  2. 6
      PEIS/ReportFiles/CostCount.frx
  3. 7
      PEIS/ReportFiles/OrgExcel.frx
  4. 11
      PEIS/View/Enrollment/EnrollmentOrgForm.cs
  5. 295
      PEIS/View/Enrollment/NewEnrollmentPersonForm.Designer.cs
  6. 11
      PEIS/View/Enrollment/NewEnrollmentPersonForm.cs

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

@ -113,15 +113,13 @@ namespace PEIS.Model.Enrollment
a.Tel1,
c.DeptName,
a.SignTime,
d.Fee
(SELECT SUM(Fee) FROM Enrollment_CheckCost WHERE a.ID = EID AND a.OEID = OEID AND DeleteTime IS NULL) AS Fee
FROM
Enrollment_Patient a
LEFT JOIN Base_Patient b ON a.PID = b.ID
LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = b.ID
LEFT JOIN Enrollment_CheckCost d ON a.ID = d.EID AND a.OEID = d.OEID
WHERE
a.OEID = {oeID} AND d.DeleteTime IS NULL
ORDER BY a.SignTime");
a.OEID = {oeID} ORDER BY a.SignTime");
}
}
}

6
PEIS/ReportFiles/CostCount.frx
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/27/2023 00:02:11" ReportInfo.Modified="08/28/2024 10:33:14" ReportInfo.CreatorVersion="2022.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/27/2023 00:02:11" ReportInfo.Modified="09/12/2024 15:33:19" ReportInfo.CreatorVersion="2022.1.0.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -175,7 +175,7 @@ namespace FastReport
<TableColumn Name="Column160" Width="78.9"/>
<TableColumn Name="Column161" Width="47.91"/>
<TableColumn Name="Column162" Width="75.6"/>
<TableRow Name="Row52" Height="28.35">
<TableRow Name="Row52" MinHeight="28.35" Height="28.35" AutoSize="true">
<TableCell Name="Cell197" Border.Lines="All" Text="[P.FeeItemName]" VertAlign="Center" Font="微软雅黑, 10pt" ColSpan="3"/>
<TableCell Name="Cell198" Border.Lines="All" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell199" Border.Lines="All" VertAlign="Center" Font="微软雅黑, 10pt"/>
@ -201,7 +201,7 @@ namespace FastReport
<TableColumn Name="Column172" Width="78.9"/>
<TableColumn Name="Column173" Width="47.91"/>
<TableColumn Name="Column174" Width="75.6"/>
<TableRow Name="Row53" Height="28.35">
<TableRow Name="Row53" MinHeight="28.35" Height="28.35" AutoSize="true">
<TableCell Name="Cell209" Border.Lines="All" Text="-[P.FeeItemName]-小计" VertAlign="Center" Font="微软雅黑, 10pt" ColSpan="3"/>
<TableCell Name="Cell210" Border.Lines="All" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell211" Border.Lines="All" VertAlign="Center" Font="微软雅黑, 10pt"/>

7
PEIS/ReportFiles/OrgExcel.frx
Unescape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/26/2023 17:47:58" ReportInfo.Modified="08/29/2024 10:00:30" ReportInfo.CreatorVersion="2022.1.0.0">
<Report ScriptLanguage="CSharp" ReportInfo.Created="06/26/2023 17:47:58" ReportInfo.Modified="09/12/2024 15:31:07" ReportInfo.CreatorVersion="2022.1.0.0">
<ScriptText>using System;
using System.Collections;
using System.Collections.Generic;
@ -32,6 +32,7 @@ namespace FastReport
<Parameter Name="TotalCount" DataType="System.String"/>
<Parameter Name="Yes" DataType="System.String"/>
<Parameter Name="No" DataType="System.String"/>
<Parameter Name="TotalFee" DataType="System.String"/>
</Dictionary>
<ReportPage Name="Page1" RawPaperSize="9" Watermark.Font="宋体, 60pt">
<ColumnHeaderBand Name="ColumnHeader1" Width="718.2" Height="56.7" PrintOn="FirstPage">
@ -94,9 +95,11 @@ namespace FastReport
</DataHeaderBand>
<DataFooterBand Name="DataFooter1" Top="138.3" Width="718.2" Height="28.35">
<TableObject Name="Table5" Width="718.2" Height="28.35" Fill.Color="InactiveBorder">
<TableColumn Name="Column35" Width="718.2"/>
<TableColumn Name="Column35" Width="578.34"/>
<TableColumn Name="Column68" Width="139.86"/>
<TableRow Name="Row5" Height="28.35" AutoSize="true">
<TableCell Name="Cell55" Border.Lines="All" Fill.Color="InactiveBorder" Text="-总计-：[TotalCount]人，已体检：[Yes]人，未体检：[No]人" VertAlign="Center" Font="微软雅黑, 10pt"/>
<TableCell Name="Cell88" Border.Lines="All" Text="[TotalFee]" HorzAlign="Right" VertAlign="Center" Font="微软雅黑, 10pt"/>
</TableRow>
</TableObject>
</DataFooterBand>

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

@ -870,6 +870,7 @@ namespace PEIS.View.Enrollment
rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count());
rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count());
rpt.SetParameterValue("OrgName", DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString());
rpt.SetParameterValue("TotalFee", _lstExcelEPatient.Sum(s => s.Fee));
// 人员数据
rpt.RegisterData(_lstExcelEPatient, "O");
@ -929,12 +930,14 @@ namespace PEIS.View.Enrollment
var reportFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "OrgExcel.frx");
rpt.Load(reportFile);
rpt.SetParameterValue("TotalCount", _lstExcelEPatient.Count());
rpt.SetParameterValue("No", _lstExcelEPatient.Where(w => w.SignTime == null).ToList().Count());
rpt.SetParameterValue("Yes", _lstExcelEPatient.Where(w => w.SignTime != null).ToList().Count());
var list = _lstExcelEPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date);
rpt.SetParameterValue("TotalCount", list.Count());
rpt.SetParameterValue("No", list.Where(w => w.SignTime == null).ToList().Count());
rpt.SetParameterValue("Yes", list.Where(w => w.SignTime != null).ToList().Count());
rpt.SetParameterValue("OrgName", DgvOrg.GetRowCellValue(DgvOrg.GetSelectedRows()[0], "Name").ToString());
rpt.SetParameterValue("TotalFee", list.Sum(s => s.Fee));
var list = _lstExcelEPatient.Where(w => w.SignTime > begTime.Value.Date && w.SignTime < endTime.Value.AddDays(1).Date);
// 人员数据
rpt.RegisterData(list, "O");
DataBand checkCost = rpt.Report.FindObject("OrgExcel") as DataBand;

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

@ -69,10 +69,10 @@
this.ExamTypeComboBox = new System.Windows.Forms.ComboBox();
this.CameraPlayer = new AForge.Controls.VideoSourcePlayer();
this.TakePhotoBtn = new System.Windows.Forms.Button();
this.CardType = new System.Windows.Forms.TextBox();
this.NewBaseBtn = new System.Windows.Forms.Button();
this.label6 = new System.Windows.Forms.Label();
this.ExamDate = new System.Windows.Forms.DateTimePicker();
this.CardTypeComboBox = new System.Windows.Forms.ComboBox();
((System.ComponentModel.ISupportInitialize)(this.Photo)).BeginInit();
this.SexGroupBox.SuspendLayout();
this.SuspendLayout();
@ -81,30 +81,30 @@
//
this.label4.AutoSize = true;
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F);
this.label4.Location = new System.Drawing.Point(38, 233);
this.label4.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label4.Location = new System.Drawing.Point(19, 128);
this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(110, 31);
this.label4.Size = new System.Drawing.Size(56, 17);
this.label4.TabIndex = 116;
this.label4.Text = "证件类型";
//
// IDCard
//
this.IDCard.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.IDCard.Location = new System.Drawing.Point(170, 302);
this.IDCard.Margin = new System.Windows.Forms.Padding(5);
this.IDCard.Location = new System.Drawing.Point(85, 166);
this.IDCard.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.IDCard.Name = "IDCard";
this.IDCard.ReadOnly = true;
this.IDCard.Size = new System.Drawing.Size(348, 39);
this.IDCard.Size = new System.Drawing.Size(176, 23);
this.IDCard.TabIndex = 100;
//
// CancelBtn
//
this.CancelBtn.Image = ((System.Drawing.Image)(resources.GetObject("CancelBtn.Image")));
this.CancelBtn.Location = new System.Drawing.Point(608, 1009);
this.CancelBtn.Margin = new System.Windows.Forms.Padding(5);
this.CancelBtn.Location = new System.Drawing.Point(304, 553);
this.CancelBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.CancelBtn.Name = "CancelBtn";
this.CancelBtn.Size = new System.Drawing.Size(157, 62);
this.CancelBtn.Size = new System.Drawing.Size(78, 34);
this.CancelBtn.TabIndex = 18;
this.CancelBtn.Text = "取消";
this.CancelBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@ -114,10 +114,10 @@
// ConfirmBtn
//
this.ConfirmBtn.Image = ((System.Drawing.Image)(resources.GetObject("ConfirmBtn.Image")));
this.ConfirmBtn.Location = new System.Drawing.Point(297, 1009);
this.ConfirmBtn.Margin = new System.Windows.Forms.Padding(5);
this.ConfirmBtn.Location = new System.Drawing.Point(148, 553);
this.ConfirmBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.ConfirmBtn.Name = "ConfirmBtn";
this.ConfirmBtn.Size = new System.Drawing.Size(154, 62);
this.ConfirmBtn.Size = new System.Drawing.Size(77, 34);
this.ConfirmBtn.TabIndex = 17;
this.ConfirmBtn.Text = "确认";
this.ConfirmBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@ -127,10 +127,10 @@
// ReadIDCard
//
this.ReadIDCard.Image = ((System.Drawing.Image)(resources.GetObject("ReadIDCard.Image")));
this.ReadIDCard.Location = new System.Drawing.Point(616, 26);
this.ReadIDCard.Margin = new System.Windows.Forms.Padding(5);
this.ReadIDCard.Location = new System.Drawing.Point(308, 14);
this.ReadIDCard.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.ReadIDCard.Name = "ReadIDCard";
this.ReadIDCard.Size = new System.Drawing.Size(208, 62);
this.ReadIDCard.Size = new System.Drawing.Size(104, 34);
this.ReadIDCard.TabIndex = 13;
this.ReadIDCard.Text = "读取身份证";
this.ReadIDCard.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@ -140,49 +140,49 @@
// Company
//
this.Company.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Company.Location = new System.Drawing.Point(170, 848);
this.Company.Margin = new System.Windows.Forms.Padding(5);
this.Company.Location = new System.Drawing.Point(85, 465);
this.Company.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Company.Name = "Company";
this.Company.Size = new System.Drawing.Size(870, 39);
this.Company.Size = new System.Drawing.Size(437, 23);
this.Company.TabIndex = 11;
//
// label3
//
this.label3.AutoSize = true;
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F);
this.label3.Location = new System.Drawing.Point(38, 853);
this.label3.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label3.Location = new System.Drawing.Point(19, 468);
this.label3.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(90, 31);
this.label3.Size = new System.Drawing.Size(48, 17);
this.label3.TabIndex = 112;
this.label3.Text = "单 位";
//
// Tel2
//
this.Tel2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Tel2.Location = new System.Drawing.Point(700, 690);
this.Tel2.Margin = new System.Windows.Forms.Padding(5);
this.Tel2.Location = new System.Drawing.Point(350, 378);
this.Tel2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Tel2.Name = "Tel2";
this.Tel2.Size = new System.Drawing.Size(340, 39);
this.Tel2.Size = new System.Drawing.Size(172, 23);
this.Tel2.TabIndex = 9;
//
// Tel1
//
this.Tel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Tel1.Location = new System.Drawing.Point(700, 612);
this.Tel1.Margin = new System.Windows.Forms.Padding(5);
this.Tel1.Location = new System.Drawing.Point(350, 336);
this.Tel1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Tel1.Name = "Tel1";
this.Tel1.Size = new System.Drawing.Size(340, 39);
this.Tel1.Size = new System.Drawing.Size(172, 23);
this.Tel1.TabIndex = 8;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.label2.Location = new System.Drawing.Point(554, 698);
this.label2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label2.Location = new System.Drawing.Point(277, 383);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(124, 31);
this.label2.Size = new System.Drawing.Size(63, 17);
this.label2.TabIndex = 111;
this.label2.Text = "联系电话2";
//
@ -190,40 +190,40 @@
//
this.label1.AutoSize = true;
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.label1.Location = new System.Drawing.Point(554, 620);
this.label1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label1.Location = new System.Drawing.Point(277, 340);
this.label1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(124, 31);
this.label1.Size = new System.Drawing.Size(63, 17);
this.label1.TabIndex = 110;
this.label1.Text = "联系电话1";
//
// Description
//
this.Description.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Description.Location = new System.Drawing.Point(170, 922);
this.Description.Margin = new System.Windows.Forms.Padding(5);
this.Description.Location = new System.Drawing.Point(85, 506);
this.Description.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Description.Name = "Description";
this.Description.Size = new System.Drawing.Size(870, 39);
this.Description.Size = new System.Drawing.Size(437, 23);
this.Description.TabIndex = 12;
//
// RemarkLabel
//
this.RemarkLabel.AutoSize = true;
this.RemarkLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.RemarkLabel.Location = new System.Drawing.Point(38, 930);
this.RemarkLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.RemarkLabel.Location = new System.Drawing.Point(19, 510);
this.RemarkLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.RemarkLabel.Name = "RemarkLabel";
this.RemarkLabel.Size = new System.Drawing.Size(90, 31);
this.RemarkLabel.Size = new System.Drawing.Size(48, 17);
this.RemarkLabel.TabIndex = 107;
this.RemarkLabel.Text = "备 注";
//
// Photo
//
this.Photo.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.Photo.Location = new System.Drawing.Point(834, 23);
this.Photo.Margin = new System.Windows.Forms.Padding(5);
this.Photo.Location = new System.Drawing.Point(417, 13);
this.Photo.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Photo.Name = "Photo";
this.Photo.Size = new System.Drawing.Size(207, 258);
this.Photo.Size = new System.Drawing.Size(104, 142);
this.Photo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.Photo.TabIndex = 109;
this.Photo.TabStop = false;
@ -231,38 +231,38 @@
// Address1
//
this.Address1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Address1.Location = new System.Drawing.Point(170, 766);
this.Address1.Margin = new System.Windows.Forms.Padding(5);
this.Address1.Location = new System.Drawing.Point(85, 420);
this.Address1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Address1.Name = "Address1";
this.Address1.Size = new System.Drawing.Size(870, 39);
this.Address1.Size = new System.Drawing.Size(437, 23);
this.Address1.TabIndex = 10;
//
// Contactor2
//
this.Contactor2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Contactor2.Location = new System.Drawing.Point(700, 535);
this.Contactor2.Margin = new System.Windows.Forms.Padding(5);
this.Contactor2.Location = new System.Drawing.Point(350, 293);
this.Contactor2.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Contactor2.Name = "Contactor2";
this.Contactor2.Size = new System.Drawing.Size(340, 39);
this.Contactor2.Size = new System.Drawing.Size(172, 23);
this.Contactor2.TabIndex = 7;
//
// Contactor1
//
this.Contactor1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Contactor1.Location = new System.Drawing.Point(700, 457);
this.Contactor1.Margin = new System.Windows.Forms.Padding(5);
this.Contactor1.Location = new System.Drawing.Point(350, 251);
this.Contactor1.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Contactor1.Name = "Contactor1";
this.Contactor1.Size = new System.Drawing.Size(340, 39);
this.Contactor1.Size = new System.Drawing.Size(172, 23);
this.Contactor1.TabIndex = 6;
//
// ContactLabel1
//
this.ContactLabel1.AutoSize = true;
this.ContactLabel1.Font = new System.Drawing.Font("微软雅黑", 9F);
this.ContactLabel1.Location = new System.Drawing.Point(554, 465);
this.ContactLabel1.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.ContactLabel1.Location = new System.Drawing.Point(277, 255);
this.ContactLabel1.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.ContactLabel1.Name = "ContactLabel1";
this.ContactLabel1.Size = new System.Drawing.Size(100, 31);
this.ContactLabel1.Size = new System.Drawing.Size(51, 17);
this.ContactLabel1.TabIndex = 106;
this.ContactLabel1.Text = "联系人1";
//
@ -270,10 +270,10 @@
//
this.AddressLabel.AutoSize = true;
this.AddressLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.AddressLabel.Location = new System.Drawing.Point(38, 775);
this.AddressLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.AddressLabel.Location = new System.Drawing.Point(19, 425);
this.AddressLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.AddressLabel.Name = "AddressLabel";
this.AddressLabel.Size = new System.Drawing.Size(110, 31);
this.AddressLabel.Size = new System.Drawing.Size(56, 17);
this.AddressLabel.TabIndex = 105;
this.AddressLabel.Text = "联系地址";
//
@ -281,39 +281,39 @@
//
this.OccupationComboBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.OccupationComboBox.FormattingEnabled = true;
this.OccupationComboBox.Location = new System.Drawing.Point(170, 611);
this.OccupationComboBox.Margin = new System.Windows.Forms.Padding(5);
this.OccupationComboBox.Location = new System.Drawing.Point(85, 335);
this.OccupationComboBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.OccupationComboBox.Name = "OccupationComboBox";
this.OccupationComboBox.Size = new System.Drawing.Size(348, 39);
this.OccupationComboBox.Size = new System.Drawing.Size(176, 25);
this.OccupationComboBox.TabIndex = 3;
//
// EducationComboBox
//
this.EducationComboBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.EducationComboBox.FormattingEnabled = true;
this.EducationComboBox.Location = new System.Drawing.Point(170, 688);
this.EducationComboBox.Margin = new System.Windows.Forms.Padding(5);
this.EducationComboBox.Location = new System.Drawing.Point(85, 377);
this.EducationComboBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.EducationComboBox.Name = "EducationComboBox";
this.EducationComboBox.Size = new System.Drawing.Size(348, 39);
this.EducationComboBox.Size = new System.Drawing.Size(176, 25);
this.EducationComboBox.TabIndex = 4;
//
// MaritalComboBox
//
this.MaritalComboBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.MaritalComboBox.FormattingEnabled = true;
this.MaritalComboBox.Location = new System.Drawing.Point(170, 533);
this.MaritalComboBox.Margin = new System.Windows.Forms.Padding(5);
this.MaritalComboBox.Location = new System.Drawing.Point(85, 292);
this.MaritalComboBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.MaritalComboBox.Name = "MaritalComboBox";
this.MaritalComboBox.Size = new System.Drawing.Size(348, 39);
this.MaritalComboBox.Size = new System.Drawing.Size(176, 25);
this.MaritalComboBox.TabIndex = 2;
//
// Nation
//
this.Nation.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.Nation.Location = new System.Drawing.Point(170, 457);
this.Nation.Margin = new System.Windows.Forms.Padding(5);
this.Nation.Location = new System.Drawing.Point(85, 251);
this.Nation.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Nation.Name = "Nation";
this.Nation.Size = new System.Drawing.Size(348, 39);
this.Nation.Size = new System.Drawing.Size(176, 23);
this.Nation.TabIndex = 100;
//
// BirthdayDateTimePicker
@ -323,10 +323,10 @@
this.BirthdayDateTimePicker.Enabled = false;
this.BirthdayDateTimePicker.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.BirthdayDateTimePicker.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.BirthdayDateTimePicker.Location = new System.Drawing.Point(170, 374);
this.BirthdayDateTimePicker.Margin = new System.Windows.Forms.Padding(5);
this.BirthdayDateTimePicker.Location = new System.Drawing.Point(85, 205);
this.BirthdayDateTimePicker.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.BirthdayDateTimePicker.Name = "BirthdayDateTimePicker";
this.BirthdayDateTimePicker.Size = new System.Drawing.Size(348, 39);
this.BirthdayDateTimePicker.Size = new System.Drawing.Size(176, 23);
this.BirthdayDateTimePicker.TabIndex = 100;
this.BirthdayDateTimePicker.Value = new System.DateTime(2023, 6, 22, 0, 0, 0, 0);
//
@ -336,11 +336,11 @@
this.SexGroupBox.Controls.Add(this.Male);
this.SexGroupBox.Enabled = false;
this.SexGroupBox.Font = new System.Drawing.Font("微软雅黑", 9F);
this.SexGroupBox.Location = new System.Drawing.Point(33, 104);
this.SexGroupBox.Margin = new System.Windows.Forms.Padding(5);
this.SexGroupBox.Location = new System.Drawing.Point(16, 57);
this.SexGroupBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.SexGroupBox.Name = "SexGroupBox";
this.SexGroupBox.Padding = new System.Windows.Forms.Padding(5);
this.SexGroupBox.Size = new System.Drawing.Size(487, 101);
this.SexGroupBox.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.SexGroupBox.Size = new System.Drawing.Size(244, 55);
this.SexGroupBox.TabIndex = 83;
this.SexGroupBox.TabStop = false;
this.SexGroupBox.Tag = "";
@ -349,10 +349,10 @@
// Female
//
this.Female.AutoSize = true;
this.Female.Location = new System.Drawing.Point(348, 42);
this.Female.Margin = new System.Windows.Forms.Padding(5);
this.Female.Location = new System.Drawing.Point(174, 23);
this.Female.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Female.Name = "Female";
this.Female.Size = new System.Drawing.Size(69, 35);
this.Female.Size = new System.Drawing.Size(38, 21);
this.Female.TabIndex = 3;
this.Female.Text = "女";
this.Female.UseVisualStyleBackColor = true;
@ -361,10 +361,10 @@
//
this.Male.AutoSize = true;
this.Male.Checked = true;
this.Male.Location = new System.Drawing.Point(137, 42);
this.Male.Margin = new System.Windows.Forms.Padding(5);
this.Male.Location = new System.Drawing.Point(68, 23);
this.Male.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Male.Name = "Male";
this.Male.Size = new System.Drawing.Size(69, 35);
this.Male.Size = new System.Drawing.Size(38, 21);
this.Male.TabIndex = 2;
this.Male.TabStop = true;
this.Male.Text = "男";
@ -373,20 +373,20 @@
// NameTextBox
//
this.NameTextBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.NameTextBox.Location = new System.Drawing.Point(170, 23);
this.NameTextBox.Margin = new System.Windows.Forms.Padding(5);
this.NameTextBox.Location = new System.Drawing.Point(85, 13);
this.NameTextBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.NameTextBox.Name = "NameTextBox";
this.NameTextBox.Size = new System.Drawing.Size(348, 39);
this.NameTextBox.Size = new System.Drawing.Size(176, 23);
this.NameTextBox.TabIndex = 1;
//
// NameLabel
//
this.NameLabel.AutoSize = true;
this.NameLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.NameLabel.Location = new System.Drawing.Point(38, 31);
this.NameLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.NameLabel.Location = new System.Drawing.Point(19, 17);
this.NameLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.NameLabel.Name = "NameLabel";
this.NameLabel.Size = new System.Drawing.Size(90, 31);
this.NameLabel.Size = new System.Drawing.Size(48, 17);
this.NameLabel.TabIndex = 103;
this.NameLabel.Text = "姓 名";
//
@ -394,10 +394,10 @@
//
this.BIrthdayLabel.AutoSize = true;
this.BIrthdayLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.BIrthdayLabel.Location = new System.Drawing.Point(38, 388);
this.BIrthdayLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.BIrthdayLabel.Location = new System.Drawing.Point(19, 213);
this.BIrthdayLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.BIrthdayLabel.Name = "BIrthdayLabel";
this.BIrthdayLabel.Size = new System.Drawing.Size(110, 31);
this.BIrthdayLabel.Size = new System.Drawing.Size(56, 17);
this.BIrthdayLabel.TabIndex = 102;
this.BIrthdayLabel.Text = "出生日期";
//
@ -405,10 +405,10 @@
//
this.NationLabel.AutoSize = true;
this.NationLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.NationLabel.Location = new System.Drawing.Point(38, 465);
this.NationLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.NationLabel.Location = new System.Drawing.Point(19, 255);
this.NationLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.NationLabel.Name = "NationLabel";
this.NationLabel.Size = new System.Drawing.Size(90, 31);
this.NationLabel.Size = new System.Drawing.Size(48, 17);
this.NationLabel.TabIndex = 101;
this.NationLabel.Text = "民 族";
//
@ -416,10 +416,10 @@
//
this.MaritalLabel.AutoSize = true;
this.MaritalLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.MaritalLabel.Location = new System.Drawing.Point(38, 543);
this.MaritalLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.MaritalLabel.Location = new System.Drawing.Point(19, 298);
this.MaritalLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.MaritalLabel.Name = "MaritalLabel";
this.MaritalLabel.Size = new System.Drawing.Size(110, 31);
this.MaritalLabel.Size = new System.Drawing.Size(56, 17);
this.MaritalLabel.TabIndex = 100;
this.MaritalLabel.Text = "婚姻状况";
//
@ -427,10 +427,10 @@
//
this.EducationLabel.AutoSize = true;
this.EducationLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.EducationLabel.Location = new System.Drawing.Point(38, 698);
this.EducationLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.EducationLabel.Location = new System.Drawing.Point(19, 383);
this.EducationLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.EducationLabel.Name = "EducationLabel";
this.EducationLabel.Size = new System.Drawing.Size(110, 31);
this.EducationLabel.Size = new System.Drawing.Size(56, 17);
this.EducationLabel.TabIndex = 99;
this.EducationLabel.Text = "教育程度";
//
@ -438,10 +438,10 @@
//
this.ProfessionLabel.AutoSize = true;
this.ProfessionLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.ProfessionLabel.Location = new System.Drawing.Point(38, 620);
this.ProfessionLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.ProfessionLabel.Location = new System.Drawing.Point(19, 340);
this.ProfessionLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.ProfessionLabel.Name = "ProfessionLabel";
this.ProfessionLabel.Size = new System.Drawing.Size(90, 31);
this.ProfessionLabel.Size = new System.Drawing.Size(48, 17);
this.ProfessionLabel.TabIndex = 98;
this.ProfessionLabel.Text = "职 业";
//
@ -449,10 +449,10 @@
//
this.ContactLabel2.AutoSize = true;
this.ContactLabel2.Font = new System.Drawing.Font("微软雅黑", 9F);
this.ContactLabel2.Location = new System.Drawing.Point(554, 543);
this.ContactLabel2.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.ContactLabel2.Location = new System.Drawing.Point(277, 298);
this.ContactLabel2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.ContactLabel2.Name = "ContactLabel2";
this.ContactLabel2.Size = new System.Drawing.Size(100, 31);
this.ContactLabel2.Size = new System.Drawing.Size(51, 17);
this.ContactLabel2.TabIndex = 104;
this.ContactLabel2.Text = "联系人2";
//
@ -460,10 +460,10 @@
//
this.IDCardLabel.AutoSize = true;
this.IDCardLabel.Font = new System.Drawing.Font("微软雅黑", 9F);
this.IDCardLabel.Location = new System.Drawing.Point(38, 310);
this.IDCardLabel.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.IDCardLabel.Location = new System.Drawing.Point(19, 170);
this.IDCardLabel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.IDCardLabel.Name = "IDCardLabel";
this.IDCardLabel.Size = new System.Drawing.Size(110, 31);
this.IDCardLabel.Size = new System.Drawing.Size(56, 17);
this.IDCardLabel.TabIndex = 108;
this.IDCardLabel.Text = "证件号码";
//
@ -471,10 +471,10 @@
//
this.label5.AutoSize = true;
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F);
this.label5.Location = new System.Drawing.Point(554, 388);
this.label5.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label5.Location = new System.Drawing.Point(277, 213);
this.label5.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(110, 31);
this.label5.Size = new System.Drawing.Size(56, 17);
this.label5.TabIndex = 117;
this.label5.Text = "体检类别";
//
@ -482,18 +482,18 @@
//
this.ExamTypeComboBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ExamTypeComboBox.FormattingEnabled = true;
this.ExamTypeComboBox.Location = new System.Drawing.Point(700, 380);
this.ExamTypeComboBox.Margin = new System.Windows.Forms.Padding(5);
this.ExamTypeComboBox.Location = new System.Drawing.Point(350, 208);
this.ExamTypeComboBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.ExamTypeComboBox.Name = "ExamTypeComboBox";
this.ExamTypeComboBox.Size = new System.Drawing.Size(340, 39);
this.ExamTypeComboBox.Size = new System.Drawing.Size(172, 25);
this.ExamTypeComboBox.TabIndex = 5;
//
// CameraPlayer
//
this.CameraPlayer.Location = new System.Drawing.Point(1069, 23);
this.CameraPlayer.Margin = new System.Windows.Forms.Padding(5);
this.CameraPlayer.Location = new System.Drawing.Point(534, 13);
this.CameraPlayer.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.CameraPlayer.Name = "CameraPlayer";
this.CameraPlayer.Size = new System.Drawing.Size(835, 883);
this.CameraPlayer.Size = new System.Drawing.Size(418, 484);
this.CameraPlayer.TabIndex = 16;
this.CameraPlayer.Text = "videoSourcePlayer1";
this.CameraPlayer.VideoSource = null;
@ -501,33 +501,23 @@
// TakePhotoBtn
//
this.TakePhotoBtn.Image = ((System.Drawing.Image)(resources.GetObject("TakePhotoBtn.Image")));
this.TakePhotoBtn.Location = new System.Drawing.Point(1069, 936);
this.TakePhotoBtn.Margin = new System.Windows.Forms.Padding(5);
this.TakePhotoBtn.Location = new System.Drawing.Point(534, 513);
this.TakePhotoBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.TakePhotoBtn.Name = "TakePhotoBtn";
this.TakePhotoBtn.Size = new System.Drawing.Size(835, 62);
this.TakePhotoBtn.Size = new System.Drawing.Size(418, 34);
this.TakePhotoBtn.TabIndex = 15;
this.TakePhotoBtn.Text = "拍摄";
this.TakePhotoBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
this.TakePhotoBtn.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageBeforeText;
this.TakePhotoBtn.UseVisualStyleBackColor = true;
//
// CardType
//
this.CardType.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.CardType.Location = new System.Drawing.Point(170, 225);
this.CardType.Margin = new System.Windows.Forms.Padding(5);
this.CardType.Name = "CardType";
this.CardType.ReadOnly = true;
this.CardType.Size = new System.Drawing.Size(348, 39);
this.CardType.TabIndex = 100;
//
// NewBaseBtn
//
this.NewBaseBtn.Image = ((System.Drawing.Image)(resources.GetObject("NewBaseBtn.Image")));
this.NewBaseBtn.Location = new System.Drawing.Point(616, 104);
this.NewBaseBtn.Margin = new System.Windows.Forms.Padding(5);
this.NewBaseBtn.Location = new System.Drawing.Point(308, 57);
this.NewBaseBtn.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.NewBaseBtn.Name = "NewBaseBtn";
this.NewBaseBtn.Size = new System.Drawing.Size(208, 62);
this.NewBaseBtn.Size = new System.Drawing.Size(104, 34);
this.NewBaseBtn.TabIndex = 14;
this.NewBaseBtn.Text = "新建体检者";
this.NewBaseBtn.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@ -538,10 +528,10 @@
//
this.label6.AutoSize = true;
this.label6.Font = new System.Drawing.Font("微软雅黑", 9F);
this.label6.Location = new System.Drawing.Point(554, 312);
this.label6.Margin = new System.Windows.Forms.Padding(5, 0, 5, 0);
this.label6.Location = new System.Drawing.Point(277, 171);
this.label6.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(110, 31);
this.label6.Size = new System.Drawing.Size(56, 17);
this.label6.TabIndex = 118;
this.label6.Text = "体检日期";
//
@ -551,25 +541,36 @@
this.ExamDate.CustomFormat = " yyyy 年 MM 月 dd 日";
this.ExamDate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.ExamDate.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
this.ExamDate.Location = new System.Drawing.Point(700, 302);
this.ExamDate.Margin = new System.Windows.Forms.Padding(5);
this.ExamDate.Location = new System.Drawing.Point(350, 166);
this.ExamDate.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.ExamDate.Name = "ExamDate";
this.ExamDate.Size = new System.Drawing.Size(340, 39);
this.ExamDate.Size = new System.Drawing.Size(172, 23);
this.ExamDate.TabIndex = 5;
this.ExamDate.Value = new System.DateTime(2023, 6, 22, 0, 0, 0, 0);
//
// CardTypeComboBox
//
this.CardTypeComboBox.Enabled = false;
this.CardTypeComboBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
this.CardTypeComboBox.FormattingEnabled = true;
this.CardTypeComboBox.Location = new System.Drawing.Point(89, 125);
this.CardTypeComboBox.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.CardTypeComboBox.Name = "CardTypeComboBox";
this.CardTypeComboBox.Size = new System.Drawing.Size(172, 25);
this.CardTypeComboBox.TabIndex = 119;
//
// NewEnrollmentPersonForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F);
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.AutoScroll = true;
this.AutoSize = true;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1945, 1100);
this.ClientSize = new System.Drawing.Size(972, 603);
this.Controls.Add(this.CardTypeComboBox);
this.Controls.Add(this.ExamDate);
this.Controls.Add(this.label6);
this.Controls.Add(this.NewBaseBtn);
this.Controls.Add(this.CardType);
this.Controls.Add(this.TakePhotoBtn);
this.Controls.Add(this.CameraPlayer);
this.Controls.Add(this.ExamTypeComboBox);
@ -609,9 +610,9 @@
this.Controls.Add(this.ContactLabel2);
this.Controls.Add(this.IDCardLabel);
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
this.Margin = new System.Windows.Forms.Padding(5);
this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.Name = "NewEnrollmentPersonForm";
this.Padding = new System.Windows.Forms.Padding(5);
this.Padding = new System.Windows.Forms.Padding(2, 3, 2, 3);
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
this.Text = "新增登记信息";
((System.ComponentModel.ISupportInitialize)(this.Photo)).EndInit();
@ -664,9 +665,9 @@
private System.Windows.Forms.ComboBox ExamTypeComboBox;
private AForge.Controls.VideoSourcePlayer CameraPlayer;
private System.Windows.Forms.Button TakePhotoBtn;
private System.Windows.Forms.TextBox CardType;
private System.Windows.Forms.Button NewBaseBtn;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.DateTimePicker ExamDate;
private System.Windows.Forms.ComboBox CardTypeComboBox;
}
}

11
PEIS/View/Enrollment/NewEnrollmentPersonForm.cs
Unescape View File

@ -63,6 +63,7 @@ namespace PEIS.View.Enrollment
SexGroupBox.Enabled = true;
IDCard.ReadOnly = false;
BirthdayDateTimePicker.Enabled = true;
CardTypeComboBox.Enabled = true;
}
}
@ -156,7 +157,7 @@ namespace PEIS.View.Enrollment
NameTextBox.Text = item?.Name;
Male.Checked = item?.Sex == "1";
Female.Checked = item?.Sex == "2";
CardType.Text = item?.CardType;
CardTypeComboBox.Text = item?.CardType;
IDCard.Text = item?.CardNo;
Nation.Text = item?.Nation;
BirthdayDateTimePicker.Value = item?.Birthday ?? DateTime.Now;
@ -259,7 +260,7 @@ namespace PEIS.View.Enrollment
Birthday = BirthdayDateTimePicker.Value,
Age = Convert.ToInt64(CalculateAge()[0]),
AgeClass = CalculateAge()[1],
CardType = CardType.Text.Trim(),
CardType = CardTypeComboBox.SelectedValue?.ToString(),
CardNo = IDCard.Text.Trim(),
Marriage = MaritalComboBox.SelectedValue?.ToString(),
Occupation = OccupationComboBox.SelectedValue?.ToString(),
@ -316,6 +317,10 @@ namespace PEIS.View.Enrollment
ExamTypeComboBox.DisplayMember = "Value";
ExamTypeComboBox.ValueMember = "Value";
CardTypeComboBox.DataSource = Global._lstConfig.Where(w => w.Key == "CardType").ToList();
CardTypeComboBox.DisplayMember = "Value";
CardTypeComboBox.ValueMember = "Value";
SelectPerson(new BasePatient(_regInfo));
}));
}
@ -531,7 +536,7 @@ namespace PEIS.View.Enrollment
{
GetPid?.Invoke(this, new Args<BasePatient>
{
Name = CardType.Text.Trim(),
Name = CardTypeComboBox.Text.Trim(),
Code = IDCard.Text.Trim()
});
}

Write Preview
Loading…
Cancel
Save