From f7dd78b4dc0d23bbae04a8c4de7693d1eea34dfe Mon Sep 17 00:00:00 2001 From: LiJiaWen Date: Tue, 28 Apr 2026 15:34:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=81=A5=E5=BA=B7=E9=97=AE=E5=8D=B7=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=E5=92=8C=E4=B8=80=E4=BA=9B=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.新增健康问卷模块 2.读取Excel文件方法支持公式 3.允许创建重复的人员信息 --- PEIS/App.config | 4 +- PEIS/Entity/ExamReport.cs | 4 +- PEIS/Entity/HealthQuestionnaire.cs | 77 +++ .../Enrollment/EnrollmentPatientModel.cs | 1 + PEIS/Model/Exam/HealthQuestionnaireModel.cs | 75 +++ .../Exam/HealthQuestionnaireReportModel.cs | 44 ++ PEIS/PEIS.csproj | 14 +- .../Dhzzyy/HealthQuestionnaire.frx | 34 ++ PEIS/ReportFiles/PeopleCount.frx | 188 +++---- PEIS/Utils/DAOHelp.cs | 5 + PEIS/Utils/ExcelHelper.cs | 35 +- PEIS/Utils/ObjectData.cs | 8 +- PEIS/Utils/ReportHelper.cs | 59 +- PEIS/View/Base/NewPersonForm.cs | 14 +- .../Exam/HealthQuestionnaireForm.Designer.cs | 117 ++++ PEIS/View/Exam/HealthQuestionnaireForm.cs | 527 ++++++++++++++++++ PEIS/View/Exam/HealthQuestionnaireForm.resx | 120 ++++ PEIS/View/Exam/PartForm.Designer.cs | 22 +- PEIS/View/Exam/PartForm.cs | 22 +- PEIS/View/Exam/TotalForm.Designer.cs | 52 +- PEIS/View/Exam/TotalForm.cs | 4 +- PEIS/View/MainForm.Designer.cs | 114 ++-- PEIS/View/Setting/FeeItemForm.Designer.cs | 270 ++++----- 23 files changed, 1437 insertions(+), 373 deletions(-) create mode 100644 PEIS/Entity/HealthQuestionnaire.cs create mode 100644 PEIS/Model/Exam/HealthQuestionnaireModel.cs create mode 100644 PEIS/Model/Exam/HealthQuestionnaireReportModel.cs create mode 100644 PEIS/ReportFiles/Dhzzyy/HealthQuestionnaire.frx create mode 100644 PEIS/View/Exam/HealthQuestionnaireForm.Designer.cs create mode 100644 PEIS/View/Exam/HealthQuestionnaireForm.cs create mode 100644 PEIS/View/Exam/HealthQuestionnaireForm.resx diff --git a/PEIS/App.config b/PEIS/App.config index c275d0b..bc982f7 100644 --- a/PEIS/App.config +++ b/PEIS/App.config @@ -9,9 +9,9 @@ - + - + diff --git a/PEIS/Entity/ExamReport.cs b/PEIS/Entity/ExamReport.cs index ce973da..10563cf 100644 --- a/PEIS/Entity/ExamReport.cs +++ b/PEIS/Entity/ExamReport.cs @@ -9,7 +9,7 @@ namespace PEIS.Entity /// public partial class ExamReport : ObjectData { - public override String TableName => "Exam_Report"; + public override String TableName => "Exam_Report"; public Int64? EID { get; set; } public String Creator { get; set; } @@ -30,7 +30,7 @@ namespace PEIS.Entity Creator = Global.currentUser.Name; } - public override bool Save() + public override bool Save(bool _ = false) { System.IO.File.WriteAllBytes("PEIS_Report.pdf", this.Report); return DAOHelp.Execute( diff --git a/PEIS/Entity/HealthQuestionnaire.cs b/PEIS/Entity/HealthQuestionnaire.cs new file mode 100644 index 0000000..6deb5b8 --- /dev/null +++ b/PEIS/Entity/HealthQuestionnaire.cs @@ -0,0 +1,77 @@ +#region CopyRight + +/**************************************************************** + * Project：健康体检信息管理系统（PEIS） + * Author：张剑峰 + * CLR Version：4.0.30319.42000 + * CreateTime：2023-05-01 14:41:54 + * Version：v2.0 + * + * Description： + * + * History： + * +***************************************************************** + * Copyright @ 云南新八达科技有限公司 2023 All rights reserved +*****************************************************************/ + +#endregion CopyRight + +using System; +using System.Collections.Generic; +using PEIS.Utils; +using Newtonsoft.Json; + +namespace PEIS.Entity +{ + public class HealthQuestion + { + public string Id { get; set; } + public string Text { get; set; } + public string Type { get; set; } + public List Options { get; set; } + public bool IsRequired { get; set; } + public string UserInput { get; set; } + } + + public class HealthQuestionnaire : ObjectData + { + public override string TableName => "Exam_HealthQuestionnaire"; + + public long? EID { get; set; } + + public string QuestionnaireJson { get; set; } + + public DateTime? CreateTime { get; set; } + + public string CreatorCode { get; set; } + + public string Creator { get; set; } + + public DateTime? UpdateTime { get; set; } + + public string UpdaterCode { get; set; } + + public string Updater { get; set; } + + private List _questions; + + [RefFlag(true)] + public List Questions + { + get + { + if (_questions == null && !string.IsNullOrEmpty(QuestionnaireJson)) + { + _questions = JsonConvert.DeserializeObject>(QuestionnaireJson); + } + return _questions; + } + set + { + _questions = value; + QuestionnaireJson = JsonConvert.SerializeObject(value); + } + } + } +} diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index 42bc3f9..401c1fc 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs @@ -83,6 +83,7 @@ namespace PEIS.Model.Enrollment b.Marriage, c.DeptName AS GroupName, a.SignTime, + a.CreateTime, a.Tel1, a.SpellCode, a.Description, diff --git a/PEIS/Model/Exam/HealthQuestionnaireModel.cs b/PEIS/Model/Exam/HealthQuestionnaireModel.cs new file mode 100644 index 0000000..5f1485b --- /dev/null +++ b/PEIS/Model/Exam/HealthQuestionnaireModel.cs @@ -0,0 +1,75 @@ +#region CopyRight + +/**************************************************************** + * Project：健康体检信息管理系统（PEIS） + * Author：张剑峰 + * CLR Version：4.0.30319.42000 + * CreateTime：2023-05-01 14:41:54 + * Version：v2.0 + * + * Description： + * + * History： + * +***************************************************************** + * Copyright @ 云南新八达科技有限公司 2023 All rights reserved +*****************************************************************/ + +#endregion CopyRight + +using System; +using System.Collections.Generic; +using System.Linq; +using PEIS.Entity; +using PEIS.Utils; +using Newtonsoft.Json; + +namespace PEIS.Model.Exam +{ + public class HealthQuestionnaireModel + { + public HealthQuestionnaireModel() + { + } + + public List GetActiveTemplate() + { + string sql = $"SELECT * FROM Dict_Config WHERE [Key] = 'HealthQuestionnaireTemplate'"; + var configs = DAOHelp.Query(sql); + if (configs != null && configs.Count > 0) + { + var config = configs[0]; + if (!string.IsNullOrEmpty(config.Value)) + { + try + { + return JsonConvert.DeserializeObject>(config.Value); + } + catch + { + return null; + } + } + } + return null; + } + + public HealthQuestionnaire GetQuestionnaireByEId(long eid) + { + string sql = $"SELECT * FROM Exam_HealthQuestionnaire WHERE EID = {eid} ORDER BY CreateTime DESC"; + var questionnaires = DAOHelp.Query(sql); + return questionnaires.FirstOrDefault(); + } + + public bool SaveQuestionnaire(HealthQuestionnaire questionnaire) + { + return questionnaire.SaveOrUpdate(); + } + + public bool DeleteQuestionnaire(long id) + { + var questionnaire = new HealthQuestionnaire { ID = id }; + return questionnaire.Delete(); + } + } +} diff --git a/PEIS/Model/Exam/HealthQuestionnaireReportModel.cs b/PEIS/Model/Exam/HealthQuestionnaireReportModel.cs new file mode 100644 index 0000000..59c9232 --- /dev/null +++ b/PEIS/Model/Exam/HealthQuestionnaireReportModel.cs @@ -0,0 +1,44 @@ +#region CopyRight + +/**************************************************************** + * Project：健康体检信息管理系统（PEIS） + * Author：张剑峰 + * CLR Version：4.0.30319.42000 + * CreateTime：2023-05-01 14:41:54 + * Version：v2.0 + * + * Description：健康问卷报告数据模型 + * + * History： + * +***************************************************************** + * Copyright @ 云南新八达科技有限公司 2023 All rights reserved +*****************************************************************/ + +#endregion CopyRight + +using System; +using System.Collections.Generic; +using System.Linq; +using PEIS.Entity; +using PEIS.Utils; +using Newtonsoft.Json; + +namespace PEIS.Model.Exam +{ + public class HealthQuestionnaireReportModel + { + public string QuestionText { get; set; } + public string Answer { get; set; } + } + + public class HealthQuestionnaireReportData + { + public string EID { get; set; } + public string PatientName { get; set; } + public string Sex { get; set; } + public string Age { get; set; } + public string CreateTime { get; set; } + public List Questions { get; set; } + } +} \ No newline at end of file diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index ea3b18c..d5d5d0a 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -1,4 +1,4 @@ - + @@ -270,6 +270,7 @@ + Form @@ -319,6 +320,8 @@ + + @@ -457,6 +460,12 @@ PartForm.cs + + Form + + + HealthQuestionnaireForm.cs + Form @@ -689,6 +698,9 @@ EmploymentHisForm.cs + + HealthQuestionnaireForm.cs + PartForm.cs Designer diff --git a/PEIS/ReportFiles/Dhzzyy/HealthQuestionnaire.frx b/PEIS/ReportFiles/Dhzzyy/HealthQuestionnaire.frx new file mode 100644 index 0000000..1d36641 --- /dev/null +++ b/PEIS/ReportFiles/Dhzzyy/HealthQuestionnaire.frx @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PEIS/ReportFiles/PeopleCount.frx b/PEIS/ReportFiles/PeopleCount.frx index 84e75c4..d83ca37 100644 --- a/PEIS/ReportFiles/PeopleCount.frx +++ b/PEIS/ReportFiles/PeopleCount.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -22,10 +22,32 @@ namespace FastReport private void PeopleCount_AfterData(object sender, EventArgs e) { DataSourceBase rowData = Report.GetDataSource("P"); - Cell45.Text = rowData["FinishTime"] == null ? "否" : "是"; - Cell47.Text = rowData["CreateTime"] == null ? "" : rowData["CreateTime"].ToString().Substring(0,16); - Cell49.Text = rowData["SignTime"] == null ? "" : rowData["SignTime"].ToString().Substring(0,16); - Cell51.Text = rowData["Sex"] == null ? "" : rowData["Sex"].ToString().Equals("1") ? "男" : "女"; + if(Cell76.Text.Contains("签到")){ + Cell87.Text = rowData["SignTime"] == null ? "" : Convert.ToDateTime(rowData["SignTime"]).ToString("yyyy-MM-dd"); + } + + if(Cell76.Text.Contains("登记")){ + Cell87.Text = rowData["CreateTime"] == null ? "" : Convert.ToDateTime(rowData["CreateTime"]).ToString("yyyy-MM-dd"); + } + + if(Cell76.Text.Contains("完结")){ + Cell87.Text = rowData["FinishTime"] == null ? "" : Convert.ToDateTime(rowData["FinishTime"]).ToString("yyyy-MM-dd"); + } + } + + private void Text7_AfterData(object sender, EventArgs e) + { + if(Text7.Text.Contains("签到")){ + Cell76.Text = "签到日期"; + } + + if(Text7.Text.Contains("登记")){ + Cell76.Text = "登记日期"; + } + + if(Text7.Text.Contains("完结")){ + Cell76.Text = "完结日期"; + } } } } @@ -34,107 +56,85 @@ namespace FastReport + - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - diff --git a/PEIS/Utils/DAOHelp.cs b/PEIS/Utils/DAOHelp.cs index 0901cf3..e0b6354 100644 --- a/PEIS/Utils/DAOHelp.cs +++ b/PEIS/Utils/DAOHelp.cs @@ -147,6 +147,11 @@ namespace PEIS.Utils sqltext = sqltext + " select @@identity as ID"; DataRowCollection rows = GetDataBySQL(sqltext).Rows; n = Convert.ToInt32(rows[0][0]); + var prop = obj.GetType().GetProperty("ID"); + if (prop != null && prop.CanWrite) + { + prop.SetValue(obj, n, null); + } } else { diff --git a/PEIS/Utils/ExcelHelper.cs b/PEIS/Utils/ExcelHelper.cs index 4231874..272c0f8 100644 --- a/PEIS/Utils/ExcelHelper.cs +++ b/PEIS/Utils/ExcelHelper.cs @@ -106,25 +106,36 @@ namespace PEIS.Utils } private static BasePatient ReadRowToBasePatient(IRow dataRow) { - var sex = dataRow.GetCell(2)?.ToString() ?? ""; return new BasePatient() { // A-0-序号，B-1-姓名，C-2-性别，D-3-民族，E-4-婚姻，F-5-身份证号，G-6-住址，H-7-电话，I-8-部门，J-9备注 - Name = dataRow.GetCell(1)?.ToString().Replace(" ", "").Trim(), - Contactor1 = dataRow.GetCell(1)?.ToString().Replace(" ", "").Trim(), - Sex = sex.Contains("女") ? "2" : "1", - Nation = dataRow.GetCell(3)?.ToString().Replace(" ", "").Trim(), - Marriage = dataRow.GetCell(4)?.ToString().Replace(" ", "").Trim(), - CardNo = dataRow.GetCell(5)?.ToString().Replace(" ", "").Trim(), + Name = GetCellText(dataRow.GetCell(1)), + Contactor1 = GetCellText(dataRow.GetCell(1)), + Sex = GetCellText(dataRow.GetCell(2)).Contains("女") ? "2" : "1", + Nation = GetCellText(dataRow.GetCell(3)), + Marriage = GetCellText(dataRow.GetCell(4)), + CardNo = GetCellText(dataRow.GetCell(5)), CardType = "居民身份证", - Address1 = dataRow.GetCell(6)?.ToString().Replace(" ", "").Trim(), - Tel1 = dataRow.GetCell(7)?.ToString().Replace(" ", "").Trim(), - DeptName = dataRow.GetCell(8)?.ToString().Replace(" ", "").Trim(), - Description = dataRow.GetCell(9)?.ToString().Replace(" ", "").Trim(), - SpellCode = PingYinHelper.GetTotalPingYin(dataRow.GetCell(1)?.ToString().Replace(" ", "")).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(dataRow.GetCell(1)?.ToString().Replace(" ", "")).FirstPingYin[0] + Address1 = GetCellText(dataRow.GetCell(6)), + Tel1 = GetCellText(dataRow.GetCell(7)), + DeptName = GetCellText(dataRow.GetCell(8)), + Description = GetCellText(dataRow.GetCell(9)), + SpellCode = PingYinHelper.GetTotalPingYin(GetCellText(dataRow.GetCell(1))).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(GetCellText(dataRow.GetCell(1))).FirstPingYin[0] }; } + private static string GetCellText(ICell cell) + { + if (cell == null) return string.Empty; + switch (cell.CellType) + { + case CellType.Numeric: + return cell.NumericCellValue.ToString(); + default: + return cell.StringCellValue.Replace(" ", "").Trim(); + } + } + #endregion diff --git a/PEIS/Utils/ObjectData.cs b/PEIS/Utils/ObjectData.cs index aff067f..380f021 100644 --- a/PEIS/Utils/ObjectData.cs +++ b/PEIS/Utils/ObjectData.cs @@ -45,9 +45,9 @@ namespace PEIS.Utils } } - public virtual bool Save() + public virtual bool Save(bool isFillID = false) { - if (DAOHelp.Save(this) > 0) + if (DAOHelp.Save(this, isFillID) > 0) { return true; } @@ -74,7 +74,7 @@ namespace PEIS.Utils /// public virtual bool SaveOrUpdate() { - if (ID==0) + if (ID == 0) { if (DAOHelp.Save(this) > 0) { @@ -89,7 +89,7 @@ namespace PEIS.Utils } } - return false; + return false; } public virtual void GetById() diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index 5111aaa..dae773f 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -1,4 +1,4 @@ -#region CopyRight +#region CopyRight /**************************************************************** * Project：健康体检信息管理系统（PEIS） @@ -29,6 +29,7 @@ using System.Drawing.Imaging; using FastReport.Export.Pdf; using PEIS.Model.Exam; using PEIS.View.Exam; +using System.Web; namespace PEIS.Utils { @@ -592,14 +593,48 @@ namespace PEIS.Utils SetDataSource(ref rpt, lstPacsPhotos.Concat(lstExts.Where(w => w.ReportImg != null).Select(s => new Entity.Report { ReportImage = s.ReportImg })), "I", "PACSImage"); // 科室小结 SetDataSource(ref rpt, lstExamParts, "D", "DeptSummary"); + if (combineReport == null) { - rpt.Prepare(); //准备 + var b = rpt.Prepare(); //准备 } else { - rpt.Prepare(true); //合并报表 + var b = rpt.Prepare(true); //合并报表 } + + if (Global._hospital.Name == "德宏州中医医院") + { + // 附加健康问卷报告 + var healthQuestionnaire = new HealthQuestionnaireModel().GetQuestionnaireByEId(eid); + if (healthQuestionnaire != null && healthQuestionnaire.Questions != null && healthQuestionnaire.Questions.Count > 0) + { + var healthQuestionnaireReportPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", "HealthQuestionnaire.frx"); + if (File.Exists(healthQuestionnaireReportPath)) + { + rpt.Load(healthQuestionnaireReportPath); + + // 设置报告参数 + rpt.SetParameterValue("HospitalName", Global._hospital.Name); + rpt.SetParameterValue("EID", patient.ID.ToString()); + + // 转换问卷数据，添加题号 + int questionNumber = 1; + var questions = healthQuestionnaire.Questions.Select(q => new PEIS.Model.Exam.HealthQuestionnaireReportModel + { + QuestionText = $"{questionNumber++}. {q.Text}", + Answer = q.UserInput != null ? q.UserInput.ToString() : "" + }).ToList(); + + // 设置数据源 + SetDataSource(ref rpt, questions, "Q", "Questions"); + + // 附加到主报告 + var b = rpt.Prepare(true); + } + } + } + return rpt; } @@ -725,7 +760,7 @@ namespace PEIS.Utils // 登记信息 rpt.SetParameterValue("Name", regInfo.Name); - rpt.SetParameterValue("Age", regInfo.Age + regInfo.AgeClass); + rpt.SetParameterValue("Age", (regInfo.Age + regInfo.AgeClass).TrimStart('0')); rpt.SetParameterValue("Sex", "男".Equals(regInfo.Sex) ? "男" : "女".Equals(regInfo.Sex) ? "女" : @@ -742,9 +777,7 @@ namespace PEIS.Utils rpt.SetParameterValue("BirthDay", regInfo.Birthday?.ToShortDateString()); rpt.SetParameterValue("Address", regInfo.Address1); rpt.SetParameterValue("HospitalName", Global._hospital?.Name); - rpt.SetParameterValue("Url", - Global.GetWeChatPayUrl() + - Convert.ToBase64String(System.Text.Encoding.Default.GetBytes(regInfo.CardNo))); + rpt.SetParameterValue("Url", string.Format(Global.GetWeChatPayUrl(), Convert.ToBase64String(System.Text.Encoding.Default.GetBytes(regInfo.CardNo)), HttpUtility.UrlEncode(regInfo.CreateTime?.ToString("G")))); // 收费单 rpt.RegisterData(list, "C"); @@ -824,7 +857,7 @@ namespace PEIS.Utils // 登记信息 rpt.SetParameterValue("Name", regInfo.Name); - rpt.SetParameterValue("Age", regInfo.Age + regInfo.AgeClass); + rpt.SetParameterValue("Age", (regInfo.Age + regInfo.AgeClass).TrimStart('0')); rpt.SetParameterValue("Sex", "男".Equals(regInfo.Sex) ? "男" : "女".Equals(regInfo.Sex) ? "女" : @@ -840,9 +873,7 @@ namespace PEIS.Utils rpt.SetParameterValue("CardNo", regInfo.CardNo); rpt.SetParameterValue("HospitalName", Global._hospital?.Name); rpt.SetParameterValue("Remark", regInfo.Description); - rpt.SetParameterValue("Url", - Global.GetWeChatPayUrl() + - Convert.ToBase64String(System.Text.Encoding.Default.GetBytes(regInfo.CardNo))); + rpt.SetParameterValue("Url", string.Format(Global.GetWeChatPayUrl(), Convert.ToBase64String(System.Text.Encoding.Default.GetBytes(regInfo.CardNo)), HttpUtility.UrlEncode(regInfo.CreateTime?.ToString("G")))); if (string.IsNullOrEmpty(regInfo.Photo)) { @@ -1042,7 +1073,7 @@ namespace PEIS.Utils /// 登记信息 rpt.SetParameterValue("Name", patient.Name); - rpt.SetParameterValue("Age", patient.Age + patient.AgeClass); + rpt.SetParameterValue("Age", (patient.Age + patient.AgeClass).TrimStart('0')); rpt.SetParameterValue("Sex", "男".Equals(patient.Sex) ? "男" : "女".Equals(patient.Sex) ? "女" : @@ -1059,9 +1090,7 @@ namespace PEIS.Utils rpt.SetParameterValue("BirthDay", patient.Birthday?.ToShortDateString()); rpt.SetParameterValue("Address", patient.Address1); rpt.SetParameterValue("HospitalName", Global._hospital?.Name); - rpt.SetParameterValue("Url", - Global.GetWeChatPayUrl() + - Convert.ToBase64String(System.Text.Encoding.Default.GetBytes(patient.CardNo))); + rpt.SetParameterValue("Url", string.Format(Global.GetWeChatPayUrl(), Convert.ToBase64String(System.Text.Encoding.Default.GetBytes(patient.CardNo)), HttpUtility.UrlEncode(patient.CreateTime?.ToString("G")))); // 收费单 rpt.RegisterData(list.Where(w => w.CostTime == null && w.OEID == null).ToList(), "C"); diff --git a/PEIS/View/Base/NewPersonForm.cs b/PEIS/View/Base/NewPersonForm.cs index c37f501..60e31e4 100644 --- a/PEIS/View/Base/NewPersonForm.cs +++ b/PEIS/View/Base/NewPersonForm.cs @@ -291,8 +291,11 @@ namespace PEIS.View.Base OnIsExitBaseInfo(); if (_patient != null) { - Global.Msg("info", "该证件号已存在！"); - return; + DialogResult result = Global.Msg("warn", "该证件号已存在！\r\n是否仍要创建重复的人员信息?"); + if (result != DialogResult.Yes) + { + return; + } } @@ -320,11 +323,14 @@ namespace PEIS.View.Base SpellCode = PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin[0] }; - if (item.Save()) + if (item.Save(true)) { OnIsExitBaseInfo(); Global.Msg("info", "添加成功！"); - _action(_patient); + if (_action != null) + { + _action(item); + } } else { diff --git a/PEIS/View/Exam/HealthQuestionnaireForm.Designer.cs b/PEIS/View/Exam/HealthQuestionnaireForm.Designer.cs new file mode 100644 index 0000000..71fd999 --- /dev/null +++ b/PEIS/View/Exam/HealthQuestionnaireForm.Designer.cs @@ -0,0 +1,117 @@ +namespace PEIS.View.Exam +{ + partial class HealthQuestionnaireForm + { + private System.ComponentModel.IContainer components = null; + + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + private void InitializeComponent() + { + this.lblTitle = new System.Windows.Forms.Label(); + this.btnCancel = new System.Windows.Forms.Button(); + this.btnSave = new System.Windows.Forms.Button(); + this.panelMain = new System.Windows.Forms.Panel(); + this.panelBottom = new System.Windows.Forms.Panel(); + this.button1 = new System.Windows.Forms.Button(); + this.panelBottom.SuspendLayout(); + this.SuspendLayout(); + // + // lblTitle + // + this.lblTitle.AutoSize = true; + this.lblTitle.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.lblTitle.Location = new System.Drawing.Point(20, 20); + this.lblTitle.Name = "lblTitle"; + this.lblTitle.Size = new System.Drawing.Size(120, 25); + this.lblTitle.TabIndex = 0; + this.lblTitle.Text = "健康问卷调查"; + // + // btnCancel + // + this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnCancel.Location = new System.Drawing.Point(507, 28); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(100, 30); + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.UseVisualStyleBackColor = true; + // + // btnSave + // + this.btnSave.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); + this.btnSave.Location = new System.Drawing.Point(326, 28); + this.btnSave.Name = "btnSave"; + this.btnSave.Size = new System.Drawing.Size(100, 30); + this.btnSave.TabIndex = 0; + this.btnSave.Text = "保存"; + this.btnSave.UseVisualStyleBackColor = true; + // + // panelMain + // + this.panelMain.AutoScroll = true; + this.panelMain.Dock = System.Windows.Forms.DockStyle.Fill; + this.panelMain.Location = new System.Drawing.Point(0, 0); + this.panelMain.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelMain.Name = "panelMain"; + this.panelMain.Size = new System.Drawing.Size(933, 709); + this.panelMain.TabIndex = 2; + // + // panelBottom + // + this.panelBottom.Controls.Add(this.btnSave); + this.panelBottom.Controls.Add(this.btnCancel); + this.panelBottom.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panelBottom.Location = new System.Drawing.Point(0, 709); + this.panelBottom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.panelBottom.Name = "panelBottom"; + this.panelBottom.Size = new System.Drawing.Size(933, 70); + this.panelBottom.TabIndex = 1; + // + // button1 + // + this.button1.Location = new System.Drawing.Point(0, 0); + this.button1.Name = "button1"; + this.button1.Size = new System.Drawing.Size(933, 23); + this.button1.TabIndex = 0; + this.button1.Text = "button1"; + this.button1.UseVisualStyleBackColor = true; + // + // HealthQuestionnaireForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(933, 779); + this.Controls.Add(this.panelMain); + this.Controls.Add(this.panelBottom); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.Sizable; + this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.MaximizeBox = true; + this.MinimizeBox = true; + this.Name = "HealthQuestionnaireForm"; + this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen; + this.Text = "健康问卷调查"; + this.WindowState = System.Windows.Forms.FormWindowState.Maximized; + this.panelBottom.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.Label lblTitle; + private System.Windows.Forms.Button btnCancel; + private System.Windows.Forms.Button btnSave; + private System.Windows.Forms.Panel panelMain; + private System.Windows.Forms.Panel panelBottom; + private System.Windows.Forms.Button button1; + } +} diff --git a/PEIS/View/Exam/HealthQuestionnaireForm.cs b/PEIS/View/Exam/HealthQuestionnaireForm.cs new file mode 100644 index 0000000..cb6b460 --- /dev/null +++ b/PEIS/View/Exam/HealthQuestionnaireForm.cs @@ -0,0 +1,527 @@ +#region CopyRight + +/**************************************************************** + * Project：健康体检信息管理系统（PEIS） + * Author：张剑峰 + * CLR Version：4.0.30319.42000 + * CreateTime：2023-05-01 14:41:54 + * Version：v2.0 + * + * Description： + * + * History： + * +***************************************************************** + * Copyright @ 云南新八达科技有限公司 2023 All rights reserved +*****************************************************************/ + +#endregion CopyRight + +using System; +using System.Collections.Generic; +using System.Drawing; +using System.Linq; +using System.Windows.Forms; +using PEIS.Base; +using PEIS.Entity; +using PEIS.Model.Exam; +using PEIS.Utils; + +namespace PEIS.View.Exam +{ + public partial class HealthQuestionnaireForm : ViewBase + { + private readonly HealthQuestionnaireModel _model; + private List _questions; + private readonly Dictionary _questionControls; + private readonly Dictionary> _radioButtonGroups; + private readonly EnrollmentPatient _patient; + private HealthQuestionnaire _existingQuestionnaire; + + public HealthQuestionnaireForm(EnrollmentPatient patient) + { + InitializeComponent(); + _model = new HealthQuestionnaireModel(); + _questionControls = new Dictionary(); + _radioButtonGroups = new Dictionary>(); + _patient = patient; + Load += HealthQuestionnaireForm_Load; + btnSave.Click += BtnSave_Click; + btnCancel.Click += BtnCancel_Click; + Resize += HealthQuestionnaireForm_Resize; + } + + private void HealthQuestionnaireForm_Resize(object sender, EventArgs e) + { + if (_questions == null || _questions.Count == 0) + { + return; + } + GenerateQuestionControls(); + } + + private void HealthQuestionnaireForm_Load(object sender, EventArgs e) + { + LoadQuestionnaire(); + AutoFillPatientInfo(); + GenerateQuestionControls(); + } + + private void LoadQuestionnaire() + { + if (_patient != null && _patient.ID > 0) + { + _existingQuestionnaire = _model.GetQuestionnaireByEId(_patient.ID); + if (_existingQuestionnaire != null && _existingQuestionnaire.Questions != null) + { + _questions = _existingQuestionnaire.Questions; + return; + } + } + + _questions = _model.GetActiveTemplate(); + if (_questions == null || _questions.Count == 0) + { + Global.MsgWarn("没有可用的健康问卷模板，请在Dict_Config表中配置Key为'HealthQuestionnaireTemplate'的模板"); + Close(); + } + } + + private void AutoFillPatientInfo() + { + if (_patient == null || _questions == null) + { + return; + } + + foreach (var question in _questions) + { + if (!string.IsNullOrEmpty(question.UserInput)) + { + continue; + } + + string autoFillValue = GetAutoFillValue(question.Text); + if (!string.IsNullOrEmpty(autoFillValue)) + { + if (question.Type == "single_choice" && question.Options != null) + { + if (question.Options.Contains(autoFillValue)) + { + question.UserInput = autoFillValue; + } + } + else if (question.Type == "text_input") + { + question.UserInput = autoFillValue; + } + } + } + } + + private string GetAutoFillValue(string questionText) + { + if (string.IsNullOrEmpty(questionText) || _patient == null) + { + return null; + } + + string lowerText = questionText.ToLower(); + + if (lowerText.Contains("性别")) + { + return _patient.Sex == "1" ? "男" : _patient.Sex == "2" ? "女" : ""; + } + + if (lowerText.Contains("出生日期") || lowerText.Contains("生日")) + { + if (_patient.Birthday.HasValue) + { + return _patient.Birthday.Value.ToString("yyyy-MM-dd"); + } + if (!string.IsNullOrEmpty(_patient.CardNo) && _patient.CardNo.Length == 18) + { + return $"{_patient.CardNo.Substring(6, 4)}年{_patient.CardNo.Substring(10, 2)}月{_patient.CardNo.Substring(12, 2)}日"; + } + return null; + } + + if (lowerText.Contains("年龄")) + { + return _patient.Age > 0 ? _patient.Age.ToString() : ""; + } + + if (lowerText.Contains("民族")) + { + return _patient.Nation; + } + + if (lowerText.Contains("婚姻")) + { + return _patient.Marriage; + } + + if (lowerText.Contains("学历") || lowerText.Contains("文化程度")) + { + return _patient.Education; + } + + if (lowerText.Contains("职业")) + { + return _patient.Occupation; + } + + if (lowerText.Contains("电话") || lowerText.Contains("联系电话") || lowerText.Contains("手机")) + { + return _patient.Tel1; + } + + if (lowerText.Contains("地址") || lowerText.Contains("住址")) + { + return _patient.Address1; + } + + if (lowerText.Contains("身份证")) + { + return _patient.CardNo; + } + + return null; + } + + private void GenerateQuestionControls() + { + panelMain.Controls.Clear(); + _questionControls.Clear(); + _radioButtonGroups.Clear(); + + int padding = 20; + int gap = 20; + int panelWidth = (panelMain.Width - padding * 2 - gap) / 2; + int currentY = 20; + int questionIndex = 0; + + var questionsBySection = GroupQuestionsBySection(); + + foreach (var section in questionsBySection) + { + var sectionQuestions = section.Value; + + for (int i = 0; i < sectionQuestions.Count; i += 2) + { + var leftQuestion = sectionQuestions[i]; + var rightQuestion = (i + 1 < sectionQuestions.Count) ? sectionQuestions[i + 1] : null; + + int leftHeight = CalculatePanelHeight(leftQuestion); + int rightHeight = rightQuestion != null ? CalculatePanelHeight(rightQuestion) : 0; + int rowMaxHeight = Math.Max(leftHeight, rightHeight); + + var leftPanel = CreateQuestionPanel(leftQuestion, questionIndex + 1, padding, currentY, panelWidth, rowMaxHeight); + panelMain.Controls.Add(leftPanel); + questionIndex++; + + if (rightQuestion != null) + { + var rightPanel = CreateQuestionPanel(rightQuestion, questionIndex + 1, panelWidth + padding + gap, currentY, panelWidth, rowMaxHeight); + panelMain.Controls.Add(rightPanel); + questionIndex++; + } + + currentY += rowMaxHeight + 20; + } + + currentY += 20; + } + + panelMain.AutoScrollMinSize = new Size(0, currentY); + } + + private Dictionary> GroupQuestionsBySection() + { + var result = new Dictionary>(); + + foreach (var question in _questions) + { + string section = GetSectionFromId(question.Id); + if (!result.ContainsKey(section)) + { + result[section] = new List(); + } + result[section].Add(question); + } + + return result; + } + + private string GetSectionFromId(string id) + { + if (string.IsNullOrEmpty(id)) + { + return "A"; + } + + string section = ""; + foreach (char c in id) + { + if (char.IsLetter(c)) + { + section += c; + } + else + { + break; + } + } + + return string.IsNullOrEmpty(section) ? "A" : section; + } + + private Panel CreateQuestionPanel(HealthQuestion question, int questionNumber, int xPosition, int yPosition, int width, int height = 0) + { + int panelHeight = height > 0 ? height : CalculatePanelHeight(question); + var panel = new Panel + { + Location = new Point(xPosition, yPosition), + Size = new Size(width, panelHeight), + BackColor = Color.White, + Padding = new Padding(10) + }; + + var lblQuestion = new Label + { + Text = $"{questionNumber}. {question.Text}", + Location = new Point(10, 10), + Size = new Size(width - 40, 30), + Font = new Font("Microsoft YaHei", 10F, FontStyle.Bold), + AutoEllipsis = true + }; + + if (question.IsRequired) + { + lblQuestion.Text += " *"; + lblQuestion.ForeColor = Color.Red; + } + + panel.Controls.Add(lblQuestion); + + int controlYPosition = 50; + + if (question.Type == "single_choice") + { + var radioButtons = new List(); + var groupPanel = new Panel + { + Location = new Point(10, controlYPosition), + Size = new Size(width - 60, CalculateRadioButtonGroupHeight(question)), + AutoScroll = true + }; + + if (question.Options != null) + { + for (int i = 0; i < question.Options.Count; i++) + { + var option = question.Options[i]; + var radioButton = new RadioButton + { + Text = option, + Location = new Point(0, i * 30), + Size = new Size(width - 80, 25), + Font = new Font("Microsoft YaHei", 9F), + AutoEllipsis = true + }; + + if (!string.IsNullOrEmpty(question.UserInput) && question.UserInput == option) + { + radioButton.Checked = true; + } + + groupPanel.Controls.Add(radioButton); + radioButtons.Add(radioButton); + } + } + + panel.Controls.Add(groupPanel); + _radioButtonGroups[question.Id] = radioButtons; + } + else if (question.Type == "text_input") + { + var textBox = new TextBox + { + Location = new Point(10, controlYPosition), + Size = new Size(width - 60, 30), + Font = new Font("Microsoft YaHei", 9F) + }; + + if (!string.IsNullOrEmpty(question.UserInput)) + { + textBox.Text = question.UserInput; + } + + panel.Controls.Add(textBox); + _questionControls[question.Id] = textBox; + } + + return panel; + } + + private int CalculatePanelHeight(HealthQuestion question) + { + int height = 60; + + if (question.Type == "single_choice") + { + height += CalculateRadioButtonGroupHeight(question); + } + else if (question.Type == "text_input") + { + height += 40; + } + + return height; + } + + private int CalculateRadioButtonGroupHeight(HealthQuestion question) + { + if (question.Options == null || question.Options.Count == 0) + { + return 30; + } + + return Math.Min(question.Options.Count * 30, 120); + } + + private void BtnSave_Click(object sender, EventArgs e) + { + if (!ValidateQuestions()) + { + return; + } + + SaveAnswers(); + + var questionnaire = new HealthQuestionnaire + { + EID = _patient?.ID, + Questions = _questions, + CreateTime = DateTime.Now, + CreatorCode = Global.currentUser?.ID.ToString(), + Creator = Global.currentUser?.Name + }; + + if (_existingQuestionnaire != null) + { + questionnaire.ID = _existingQuestionnaire.ID; + questionnaire.UpdateTime = DateTime.Now; + questionnaire.UpdaterCode = Global.currentUser?.ID.ToString(); + questionnaire.Updater = Global.currentUser?.Name; + } + + if (_model.SaveQuestionnaire(questionnaire)) + { + Global.MsgInfo("健康问卷保存成功"); + DialogResult = DialogResult.OK; + Close(); + } + else + { + Global.MsgErr("健康问卷保存失败"); + } + } + + private bool ValidateQuestions() + { + foreach (var question in _questions) + { + if (!question.IsRequired) + { + continue; + } + + string answer = GetQuestionAnswer(question); + + if (string.IsNullOrEmpty(answer)) + { + Global.MsgWarn($"请回答问题：{question.Text}"); + FocusQuestion(question); + return false; + } + } + + return true; + } + + private void SaveAnswers() + { + foreach (var question in _questions) + { + question.UserInput = GetQuestionAnswer(question); + } + } + + private string GetQuestionAnswer(HealthQuestion question) + { + if (question.Type == "single_choice") + { + if (_radioButtonGroups.ContainsKey(question.Id)) + { + var radioButtons = _radioButtonGroups[question.Id]; + foreach (var radioButton in radioButtons) + { + if (radioButton.Checked) + { + return radioButton.Text; + } + } + } + return null; + } + else if (question.Type == "text_input") + { + if (_questionControls.ContainsKey(question.Id)) + { + var control = _questionControls[question.Id]; + if (control is TextBox textBox) + { + return textBox.Text.Trim(); + } + } + return null; + } + return null; + } + + private void FocusQuestion(HealthQuestion question) + { + if (question.Type == "single_choice") + { + if (_radioButtonGroups.ContainsKey(question.Id)) + { + var radioButtons = _radioButtonGroups[question.Id]; + if (radioButtons.Count > 0) + { + radioButtons[0].Focus(); + } + } + } + else if (question.Type == "text_input") + { + if (_questionControls.ContainsKey(question.Id)) + { + var control = _questionControls[question.Id]; + control.Focus(); + } + } + } + + private void BtnCancel_Click(object sender, EventArgs e) + { + DialogResult = DialogResult.Cancel; + Close(); + } + + protected override object CreatePresenter() + { + return null; + } + } +} diff --git a/PEIS/View/Exam/HealthQuestionnaireForm.resx b/PEIS/View/Exam/HealthQuestionnaireForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/PEIS/View/Exam/HealthQuestionnaireForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/PEIS/View/Exam/PartForm.Designer.cs b/PEIS/View/Exam/PartForm.Designer.cs index 26699b6..dbc64b1 100644 --- a/PEIS/View/Exam/PartForm.Designer.cs +++ b/PEIS/View/Exam/PartForm.Designer.cs @@ -1,4 +1,4 @@ -namespace PEIS.View.Exam +namespace PEIS.View.Exam { partial class PartForm { @@ -28,7 +28,6 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PartForm)); this.splitContainerBase = new System.Windows.Forms.SplitContainer(); this.panelPatients = new System.Windows.Forms.Panel(); @@ -77,7 +76,7 @@ this.dgvSign = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn(); this.dgcExamResult = new DevExpress.XtraGrid.GridControl(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); + this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(); this.menuGiveUp1 = new System.Windows.Forms.ToolStripMenuItem(); this.menuGiveUp2 = new System.Windows.Forms.ToolStripMenuItem(); this.menuGiveUp3 = new System.Windows.Forms.ToolStripMenuItem(); @@ -157,7 +156,7 @@ this.OpsPacsImg = new PEIS.View.UControl.OpMenuSimple(); this.panelPacsRptList = new System.Windows.Forms.Panel(); this.dgcRptPacs = new DevExpress.XtraGrid.GridControl(); - this.RptPacsMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.RptPacsMenuStrip = new System.Windows.Forms.ContextMenuStrip(); this.PrintRptPacsMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DgvRptPacs = new DevExpress.XtraGrid.Views.Grid.GridView(); this.colPacsTime = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -169,7 +168,7 @@ this.panelReport = new System.Windows.Forms.Panel(); this.picReportExt = new System.Windows.Forms.PictureBox(); this.dgcRptExt = new DevExpress.XtraGrid.GridControl(); - this.RptExtMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); + this.RptExtMenuStrip = new System.Windows.Forms.ContextMenuStrip(); this.PrintRptExtMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DeleteRptExtMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.DgvRptExt = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -234,6 +233,7 @@ this.tsmiReview = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiConclusion = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiSave = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiHealthQuestionnaire = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiOccupation = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiPick = new System.Windows.Forms.ToolStripMenuItem(); this.strip1 = new System.Windows.Forms.ToolStripMenuItem(); @@ -2898,6 +2898,7 @@ this.tsmiReview, this.tsmiConclusion, this.tsmiSave, + this.tsmiHealthQuestionnaire, this.tsmiOccupation, this.tsmiPick, this.strip1, @@ -2951,6 +2952,16 @@ this.tsmiSave.Size = new System.Drawing.Size(73, 40); this.tsmiSave.Text = "保存"; // + // tsmiHealthQuestionnaire + // + this.tsmiHealthQuestionnaire.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; + this.tsmiHealthQuestionnaire.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.tsmiHealthQuestionnaire.Image = global::PEIS.Properties.Resources.个人信息__1_; + this.tsmiHealthQuestionnaire.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None; + this.tsmiHealthQuestionnaire.Name = "tsmiHealthQuestionnaire"; + this.tsmiHealthQuestionnaire.Size = new System.Drawing.Size(105, 40); + this.tsmiHealthQuestionnaire.Text = "健康问卷"; + // // tsmiOccupation // this.tsmiOccupation.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right; @@ -3278,6 +3289,7 @@ public System.Windows.Forms.ToolStripMenuItem tsmiReview; public System.Windows.Forms.ToolStripMenuItem tsmiConclusion; public System.Windows.Forms.ToolStripMenuItem tsmiSave; + public System.Windows.Forms.ToolStripMenuItem tsmiHealthQuestionnaire; private System.Windows.Forms.ToolStripMenuItem strip3; private System.Windows.Forms.ToolStripMenuItem stripLblStatus; private System.Windows.Forms.ToolStripMenuItem strip2; diff --git a/PEIS/View/Exam/PartForm.cs b/PEIS/View/Exam/PartForm.cs index 010cab1..facd49c 100644 --- a/PEIS/View/Exam/PartForm.cs +++ b/PEIS/View/Exam/PartForm.cs @@ -1,4 +1,4 @@ -using DevExpress.XtraEditors; +using DevExpress.XtraEditors; using DevExpress.XtraEditors.Repository; using DevExpress.XtraGrid.Views.Base; using DevExpress.XtraGrid.Views.Grid; @@ -118,6 +118,8 @@ namespace PEIS.View.Exam tsmiPick.Click += TsmiPick_Click; // 菜单-职业问诊 tsmiOccupation.Click += TsmiOccupation_Click; + // 菜单-健康问卷 + tsmiHealthQuestionnaire.Click += TsmiHealthQuestionnaire_Click; //菜单-保存 tsmiSave.Click += TsmiSave_Click; //菜单-生成小结结论 @@ -1226,6 +1228,22 @@ namespace PEIS.View.Exam form.ShowDialog(); } + /// + /// 健康问卷 + /// + /// + /// + private void TsmiHealthQuestionnaire_Click(object sender, EventArgs e) + { + if (_patient.ID <= 0) + { + Global.MsgErr("请先选择体检者！"); + return; + } + HealthQuestionnaireForm form = new HealthQuestionnaireForm(_patient); + form.ShowDialog(); + } + /// /// 重新提取检查结果 @@ -1773,6 +1791,8 @@ namespace PEIS.View.Exam SetPatientInfo(item ?? _patient); // 是否显示职业问诊按钮 tsmiOccupation.Visible = item == null ? _patient.Type != null && _patient.Type.Contains("职业") : item.Type != null && item.Type.Contains("职业"); + // 是否显示健康问卷按钮（只对非职业体检人员显示） + tsmiHealthQuestionnaire.Visible = Global._hospital.Name != "德宏州中医医院" ? false : item == null ? _patient.Type == null || !_patient.Type.Contains("职业") : item.Type == null || !item.Type.Contains("职业"); OnGetDeptList(); } diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs index 22742d3..89ae623 100644 --- a/PEIS/View/Exam/TotalForm.Designer.cs +++ b/PEIS/View/Exam/TotalForm.Designer.cs @@ -112,6 +112,8 @@ this.OccupationalConclusion_3 = new System.Windows.Forms.RadioButton(); this.OccupationalConclusion_2 = new System.Windows.Forms.RadioButton(); this.OccupationalConclusion_1 = new System.Windows.Forms.RadioButton(); + this.OccupationalGroupBox = new System.Windows.Forms.GroupBox(); + this.OccupationalText = new System.Windows.Forms.TextBox(); this.panelAllConclusion = new System.Windows.Forms.Panel(); this.DgcAllConclusion = new DevExpress.XtraGrid.GridControl(); this.DgvAllConclusion = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -244,8 +246,6 @@ this.gridView6 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView7 = new DevExpress.XtraGrid.Views.Grid.GridView(); this.gridView8 = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.OccupationalGroupBox = new System.Windows.Forms.GroupBox(); - this.OccupationalText = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainerBase)).BeginInit(); this.splitContainerBase.Panel1.SuspendLayout(); this.splitContainerBase.Panel2.SuspendLayout(); @@ -286,6 +286,7 @@ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemRichTextEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); this.panelOccupational.SuspendLayout(); + this.OccupationalGroupBox.SuspendLayout(); this.panelAllConclusion.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcAllConclusion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvAllConclusion)).BeginInit(); @@ -343,7 +344,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView6)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView7)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView8)).BeginInit(); - this.OccupationalGroupBox.SuspendLayout(); this.SuspendLayout(); // // splitContainerBase @@ -1428,6 +1428,27 @@ this.OccupationalConclusion_1.Text = "目前未见异常"; this.OccupationalConclusion_1.UseVisualStyleBackColor = true; // + // OccupationalGroupBox + // + this.OccupationalGroupBox.Controls.Add(this.OccupationalText); + this.OccupationalGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom; + this.OccupationalGroupBox.Location = new System.Drawing.Point(0, 38); + this.OccupationalGroupBox.Name = "OccupationalGroupBox"; + this.OccupationalGroupBox.Size = new System.Drawing.Size(442, 109); + this.OccupationalGroupBox.TabIndex = 5; + this.OccupationalGroupBox.TabStop = false; + this.OccupationalGroupBox.Text = "职业健康检查处理意见"; + // + // OccupationalText + // + this.OccupationalText.AcceptsReturn = true; + this.OccupationalText.Dock = System.Windows.Forms.DockStyle.Fill; + this.OccupationalText.Location = new System.Drawing.Point(3, 18); + this.OccupationalText.Multiline = true; + this.OccupationalText.Name = "OccupationalText"; + this.OccupationalText.Size = new System.Drawing.Size(436, 88); + this.OccupationalText.TabIndex = 0; + // // panelAllConclusion // this.panelAllConclusion.AutoScroll = true; @@ -2992,27 +3013,6 @@ // this.gridView8.Name = "gridView8"; // - // OccupationalGroupBox - // - this.OccupationalGroupBox.Controls.Add(this.OccupationalText); - this.OccupationalGroupBox.Dock = System.Windows.Forms.DockStyle.Bottom; - this.OccupationalGroupBox.Location = new System.Drawing.Point(0, 38); - this.OccupationalGroupBox.Name = "OccupationalGroupBox"; - this.OccupationalGroupBox.Size = new System.Drawing.Size(442, 109); - this.OccupationalGroupBox.TabIndex = 5; - this.OccupationalGroupBox.TabStop = false; - this.OccupationalGroupBox.Text = "职业健康检查处理意见"; - // - // OccupationalText - // - this.OccupationalText.AcceptsReturn = true; - this.OccupationalText.Dock = System.Windows.Forms.DockStyle.Fill; - this.OccupationalText.Location = new System.Drawing.Point(3, 18); - this.OccupationalText.Multiline = true; - this.OccupationalText.Name = "OccupationalText"; - this.OccupationalText.Size = new System.Drawing.Size(436, 88); - this.OccupationalText.TabIndex = 0; - // // TotalForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); @@ -3067,6 +3067,8 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); this.panelOccupational.ResumeLayout(false); this.panelOccupational.PerformLayout(); + this.OccupationalGroupBox.ResumeLayout(false); + this.OccupationalGroupBox.PerformLayout(); this.panelAllConclusion.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.DgcAllConclusion)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvAllConclusion)).EndInit(); @@ -3129,8 +3131,6 @@ ((System.ComponentModel.ISupportInitialize)(this.gridView6)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView7)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView8)).EndInit(); - this.OccupationalGroupBox.ResumeLayout(false); - this.OccupationalGroupBox.PerformLayout(); this.ResumeLayout(false); } diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs index c2b9dae..4a92acd 100644 --- a/PEIS/View/Exam/TotalForm.cs +++ b/PEIS/View/Exam/TotalForm.cs @@ -468,7 +468,7 @@ namespace PEIS.View.Exam return; } - rpt.Show(); + rpt.ShowPrepared(); } } @@ -489,7 +489,7 @@ namespace PEIS.View.Exam return; } - rpt.Show(); + rpt.ShowPrepared(); } } diff --git a/PEIS/View/MainForm.Designer.cs b/PEIS/View/MainForm.Designer.cs index 2e316c5..96f27a6 100644 --- a/PEIS/View/MainForm.Designer.cs +++ b/PEIS/View/MainForm.Designer.cs @@ -53,6 +53,13 @@ namespace PEIS.View this.lblStep = new System.Windows.Forms.Label(); this.lblHospital = new System.Windows.Forms.Label(); this.NbcMain = new DevExpress.XtraNavBar.NavBarControl(); + this.NbgQuery = new DevExpress.XtraNavBar.NavBarGroup(); + this.NbiPeopleCount = new DevExpress.XtraNavBar.NavBarItem(); + this.navBarItem10 = new DevExpress.XtraNavBar.NavBarItem(); + this.navBarItem11 = new DevExpress.XtraNavBar.NavBarItem(); + this.navBarItem12 = new DevExpress.XtraNavBar.NavBarItem(); + this.navBarItem13 = new DevExpress.XtraNavBar.NavBarItem(); + this.navBarItem14 = new DevExpress.XtraNavBar.NavBarItem(); this.NbgReg = new DevExpress.XtraNavBar.NavBarGroup(); this.NbiEnrollmentSearch = new DevExpress.XtraNavBar.NavBarItem(); this.NbiEnrollmentPerson = new DevExpress.XtraNavBar.NavBarItem(); @@ -62,13 +69,6 @@ namespace PEIS.View this.NbgReport = new DevExpress.XtraNavBar.NavBarGroup(); this.NbiPReport = new DevExpress.XtraNavBar.NavBarItem(); this.NbiTReport = new DevExpress.XtraNavBar.NavBarItem(); - this.NbgQuery = new DevExpress.XtraNavBar.NavBarGroup(); - this.NbiPeopleCount = new DevExpress.XtraNavBar.NavBarItem(); - this.navBarItem10 = new DevExpress.XtraNavBar.NavBarItem(); - this.navBarItem11 = new DevExpress.XtraNavBar.NavBarItem(); - this.navBarItem12 = new DevExpress.XtraNavBar.NavBarItem(); - this.navBarItem13 = new DevExpress.XtraNavBar.NavBarItem(); - this.navBarItem14 = new DevExpress.XtraNavBar.NavBarItem(); this.NbgSetting = new DevExpress.XtraNavBar.NavBarGroup(); this.NbiFeeItem = new DevExpress.XtraNavBar.NavBarItem(); this.NbiPackage = new DevExpress.XtraNavBar.NavBarItem(); @@ -447,6 +447,56 @@ namespace PEIS.View this.NbcMain.Text = "navBarControl1"; this.NbcMain.View = new DevExpress.XtraNavBar.ViewInfo.Office3ViewInfoRegistrator(); // + // NbgQuery + // + this.NbgQuery.Caption = "查询统计"; + this.NbgQuery.Expanded = true; + this.NbgQuery.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] { + new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPeopleCount), + new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem10), + new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem11), + new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem12), + new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem13), + new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem14)}); + this.NbgQuery.Name = "NbgQuery"; + this.NbgQuery.Visible = false; + // + // NbiPeopleCount + // + this.NbiPeopleCount.Caption = "人次统计表"; + this.NbiPeopleCount.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiPeopleCount.LargeImage"))); + this.NbiPeopleCount.Name = "NbiPeopleCount"; + // + // navBarItem10 + // + this.navBarItem10.Caption = "订单统计表"; + this.navBarItem10.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem10.LargeImage"))); + this.navBarItem10.Name = "navBarItem10"; + // + // navBarItem11 + // + this.navBarItem11.Caption = "费用明细"; + this.navBarItem11.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem11.LargeImage"))); + this.navBarItem11.Name = "navBarItem11"; + // + // navBarItem12 + // + this.navBarItem12.Caption = "明细统计"; + this.navBarItem12.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem12.LargeImage"))); + this.navBarItem12.Name = "navBarItem12"; + // + // navBarItem13 + // + this.navBarItem13.Caption = "团体汇总表"; + this.navBarItem13.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem13.LargeImage"))); + this.navBarItem13.Name = "navBarItem13"; + // + // navBarItem14 + // + this.navBarItem14.Caption = "个人汇总表"; + this.navBarItem14.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem14.LargeImage"))); + this.navBarItem14.Name = "navBarItem14"; + // // NbgReg // this.NbgReg.Caption = "检前登记"; @@ -510,56 +560,6 @@ namespace PEIS.View this.NbiTReport.LargeImage = global::PEIS.Properties.Resources.团队报告; this.NbiTReport.Name = "NbiTReport"; // - // NbgQuery - // - this.NbgQuery.Caption = "查询统计"; - this.NbgQuery.Expanded = true; - this.NbgQuery.ItemLinks.AddRange(new DevExpress.XtraNavBar.NavBarItemLink[] { - new DevExpress.XtraNavBar.NavBarItemLink(this.NbiPeopleCount), - new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem10), - new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem11), - new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem12), - new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem13), - new DevExpress.XtraNavBar.NavBarItemLink(this.navBarItem14)}); - this.NbgQuery.Name = "NbgQuery"; - this.NbgQuery.Visible = false; - // - // NbiPeopleCount - // - this.NbiPeopleCount.Caption = "人次统计表"; - this.NbiPeopleCount.LargeImage = ((System.Drawing.Image)(resources.GetObject("NbiPeopleCount.LargeImage"))); - this.NbiPeopleCount.Name = "NbiPeopleCount"; - // - // navBarItem10 - // - this.navBarItem10.Caption = "订单统计表"; - this.navBarItem10.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem10.LargeImage"))); - this.navBarItem10.Name = "navBarItem10"; - // - // navBarItem11 - // - this.navBarItem11.Caption = "费用明细"; - this.navBarItem11.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem11.LargeImage"))); - this.navBarItem11.Name = "navBarItem11"; - // - // navBarItem12 - // - this.navBarItem12.Caption = "明细统计"; - this.navBarItem12.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem12.LargeImage"))); - this.navBarItem12.Name = "navBarItem12"; - // - // navBarItem13 - // - this.navBarItem13.Caption = "团体汇总表"; - this.navBarItem13.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem13.LargeImage"))); - this.navBarItem13.Name = "navBarItem13"; - // - // navBarItem14 - // - this.navBarItem14.Caption = "个人汇总表"; - this.navBarItem14.LargeImage = ((System.Drawing.Image)(resources.GetObject("navBarItem14.LargeImage"))); - this.navBarItem14.Name = "navBarItem14"; - // // NbgSetting // this.NbgSetting.Caption = "系统设置"; diff --git a/PEIS/View/Setting/FeeItemForm.Designer.cs b/PEIS/View/Setting/FeeItemForm.Designer.cs index df55590..61c3311 100644 --- a/PEIS/View/Setting/FeeItemForm.Designer.cs +++ b/PEIS/View/Setting/FeeItemForm.Designer.cs @@ -33,12 +33,12 @@ this.TbFeeItem4His = new DevExpress.XtraBars.Navigation.TabNavigationPage(); this.DgcHisFeeItem = new DevExpress.XtraGrid.GridControl(); this.DgvHisFeeItem = new DevExpress.XtraGrid.Views.Grid.GridView(); - this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn(); - this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn(); + this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn(); this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn(); @@ -155,14 +155,14 @@ this.tabPane1.Appearance.Options.UseBackColor = true; this.tabPane1.Controls.Add(this.TbFeeItem4His); this.tabPane1.Dock = System.Windows.Forms.DockStyle.Right; - this.tabPane1.Location = new System.Drawing.Point(1234, 0); - this.tabPane1.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7); + this.tabPane1.Location = new System.Drawing.Point(617, 0); + this.tabPane1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.tabPane1.Name = "tabPane1"; this.tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { this.TbFeeItem4His}); - this.tabPane1.RegularSize = new System.Drawing.Size(1012, 1366); + this.tabPane1.RegularSize = new System.Drawing.Size(506, 582); this.tabPane1.SelectedPage = this.TbFeeItem4His; - this.tabPane1.Size = new System.Drawing.Size(1012, 1366); + this.tabPane1.Size = new System.Drawing.Size(506, 582); this.tabPane1.TabAlignment = DevExpress.XtraEditors.Alignment.Near; this.tabPane1.TabIndex = 1; this.tabPane1.Text = "tabPane1"; @@ -176,23 +176,21 @@ this.TbFeeItem4His.Controls.Add(this.panel3); this.TbFeeItem4His.Image = global::PEIS.Properties.Resources.收费项目; this.TbFeeItem4His.ItemShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText; - this.TbFeeItem4His.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7); + this.TbFeeItem4His.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.TbFeeItem4His.Name = "TbFeeItem4His"; this.TbFeeItem4His.PageText = "HIS收费项目"; this.TbFeeItem4His.Properties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText; - this.TbFeeItem4His.Size = new System.Drawing.Size(978, 1273); + this.TbFeeItem4His.Size = new System.Drawing.Size(488, 524); // // DgcHisFeeItem // this.DgcHisFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcHisFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - this.DgcHisFeeItem.Location = new System.Drawing.Point(0, 67); + this.DgcHisFeeItem.Location = new System.Drawing.Point(0, 37); this.DgcHisFeeItem.MainView = this.DgvHisFeeItem; - this.DgcHisFeeItem.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcHisFeeItem.Name = "DgcHisFeeItem"; this.DgcHisFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit2}); - this.DgcHisFeeItem.Size = new System.Drawing.Size(978, 1206); + this.DgcHisFeeItem.Size = new System.Drawing.Size(488, 487); this.DgcHisFeeItem.TabIndex = 120; this.DgcHisFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvHisFeeItem}); @@ -231,39 +229,41 @@ this.DgvHisFeeItem.OptionsView.ShowIndicator = false; this.DgvHisFeeItem.RowHeight = 30; // - // gridColumn18 + // gridColumn51 // - this.gridColumn18.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gridColumn18.AppearanceCell.Options.UseFont = true; - this.gridColumn18.Caption = "项目类别"; - this.gridColumn18.FieldName = "ItemClass"; - this.gridColumn18.Name = "gridColumn18"; - this.gridColumn18.OptionsColumn.AllowEdit = false; - this.gridColumn18.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn18.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn18.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn18.OptionsColumn.ReadOnly = true; - this.gridColumn18.OptionsFilter.AllowFilter = false; - this.gridColumn18.Visible = true; - this.gridColumn18.VisibleIndex = 3; - this.gridColumn18.Width = 60; + this.gridColumn51.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.gridColumn51.AppearanceCell.Options.UseFont = true; + this.gridColumn51.Caption = "执行科室"; + this.gridColumn51.FieldName = "DeptName"; + this.gridColumn51.Name = "gridColumn51"; + this.gridColumn51.OptionsColumn.AllowEdit = false; + this.gridColumn51.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn51.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn51.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn51.OptionsColumn.ReadOnly = true; + this.gridColumn51.OptionsFilter.AllowFilter = false; + this.gridColumn51.Visible = true; + this.gridColumn51.VisibleIndex = 0; + this.gridColumn51.Width = 110; // - // gridColumn52 + // gridColumn5 // - this.gridColumn52.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gridColumn52.AppearanceCell.Options.UseFont = true; - this.gridColumn52.Caption = "类型"; - this.gridColumn52.FieldName = "UnitName"; - this.gridColumn52.Name = "gridColumn52"; - this.gridColumn52.OptionsColumn.AllowEdit = false; - this.gridColumn52.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn52.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn52.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn52.OptionsColumn.ReadOnly = true; - this.gridColumn52.OptionsFilter.AllowFilter = false; - this.gridColumn52.Visible = true; - this.gridColumn52.VisibleIndex = 5; - this.gridColumn52.Width = 50; + this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.gridColumn5.AppearanceCell.ForeColor = System.Drawing.Color.SeaGreen; + this.gridColumn5.AppearanceCell.Options.UseFont = true; + this.gridColumn5.AppearanceCell.Options.UseForeColor = true; + this.gridColumn5.Caption = "项目名称"; + this.gridColumn5.FieldName = "FeeItemName"; + this.gridColumn5.Name = "gridColumn5"; + this.gridColumn5.OptionsColumn.AllowEdit = false; + this.gridColumn5.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn5.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn5.OptionsColumn.ReadOnly = true; + this.gridColumn5.OptionsFilter.AllowFilter = false; + this.gridColumn5.Visible = true; + this.gridColumn5.VisibleIndex = 1; + this.gridColumn5.Width = 200; // // gridColumn17 // @@ -285,24 +285,22 @@ this.gridColumn17.VisibleIndex = 2; this.gridColumn17.Width = 80; // - // gridColumn5 + // gridColumn18 // - this.gridColumn5.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gridColumn5.AppearanceCell.ForeColor = System.Drawing.Color.SeaGreen; - this.gridColumn5.AppearanceCell.Options.UseFont = true; - this.gridColumn5.AppearanceCell.Options.UseForeColor = true; - this.gridColumn5.Caption = "项目名称"; - this.gridColumn5.FieldName = "FeeItemName"; - this.gridColumn5.Name = "gridColumn5"; - this.gridColumn5.OptionsColumn.AllowEdit = false; - this.gridColumn5.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn5.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn5.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn5.OptionsColumn.ReadOnly = true; - this.gridColumn5.OptionsFilter.AllowFilter = false; - this.gridColumn5.Visible = true; - this.gridColumn5.VisibleIndex = 1; - this.gridColumn5.Width = 200; + this.gridColumn18.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.gridColumn18.AppearanceCell.Options.UseFont = true; + this.gridColumn18.Caption = "项目类别"; + this.gridColumn18.FieldName = "ItemClass"; + this.gridColumn18.Name = "gridColumn18"; + this.gridColumn18.OptionsColumn.AllowEdit = false; + this.gridColumn18.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn18.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn18.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn18.OptionsColumn.ReadOnly = true; + this.gridColumn18.OptionsFilter.AllowFilter = false; + this.gridColumn18.Visible = true; + this.gridColumn18.VisibleIndex = 3; + this.gridColumn18.Width = 60; // // gridColumn50 // @@ -321,22 +319,22 @@ this.gridColumn50.VisibleIndex = 4; this.gridColumn50.Width = 60; // - // gridColumn51 + // gridColumn52 // - this.gridColumn51.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.gridColumn51.AppearanceCell.Options.UseFont = true; - this.gridColumn51.Caption = "执行科室"; - this.gridColumn51.FieldName = "DeptName"; - this.gridColumn51.Name = "gridColumn51"; - this.gridColumn51.OptionsColumn.AllowEdit = false; - this.gridColumn51.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn51.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn51.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; - this.gridColumn51.OptionsColumn.ReadOnly = true; - this.gridColumn51.OptionsFilter.AllowFilter = false; - this.gridColumn51.Visible = true; - this.gridColumn51.VisibleIndex = 0; - this.gridColumn51.Width = 110; + this.gridColumn52.AppearanceCell.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.gridColumn52.AppearanceCell.Options.UseFont = true; + this.gridColumn52.Caption = "类型"; + this.gridColumn52.FieldName = "UnitName"; + this.gridColumn52.Name = "gridColumn52"; + this.gridColumn52.OptionsColumn.AllowEdit = false; + this.gridColumn52.OptionsColumn.AllowGroup = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn52.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn52.OptionsColumn.Printable = DevExpress.Utils.DefaultBoolean.False; + this.gridColumn52.OptionsColumn.ReadOnly = true; + this.gridColumn52.OptionsFilter.AllowFilter = false; + this.gridColumn52.Visible = true; + this.gridColumn52.VisibleIndex = 5; + this.gridColumn52.Width = 50; // // gridColumn32 // @@ -393,18 +391,16 @@ this.panel3.Controls.Add(this.TxtHisFeeItem); this.panel3.Dock = System.Windows.Forms.DockStyle.Top; this.panel3.Location = new System.Drawing.Point(0, 0); - this.panel3.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(978, 67); + this.panel3.Size = new System.Drawing.Size(488, 37); this.panel3.TabIndex = 121; // // RbNormal // this.RbNormal.AutoSize = true; - this.RbNormal.Location = new System.Drawing.Point(696, 15); - this.RbNormal.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.RbNormal.Location = new System.Drawing.Point(348, 8); this.RbNormal.Name = "RbNormal"; - this.RbNormal.Size = new System.Drawing.Size(93, 35); + this.RbNormal.Size = new System.Drawing.Size(50, 21); this.RbNormal.TabIndex = 5; this.RbNormal.TabStop = true; this.RbNormal.Text = "普通"; @@ -413,10 +409,9 @@ // RbLis // this.RbLis.AutoSize = true; - this.RbLis.Location = new System.Drawing.Point(566, 15); - this.RbLis.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.RbLis.Location = new System.Drawing.Point(283, 8); this.RbLis.Name = "RbLis"; - this.RbLis.Size = new System.Drawing.Size(93, 35); + this.RbLis.Size = new System.Drawing.Size(50, 21); this.RbLis.TabIndex = 4; this.RbLis.TabStop = true; this.RbLis.Text = "检验"; @@ -425,10 +420,9 @@ // RbPacs // this.RbPacs.AutoSize = true; - this.RbPacs.Location = new System.Drawing.Point(436, 15); - this.RbPacs.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.RbPacs.Location = new System.Drawing.Point(218, 8); this.RbPacs.Name = "RbPacs"; - this.RbPacs.Size = new System.Drawing.Size(93, 35); + this.RbPacs.Size = new System.Drawing.Size(50, 21); this.RbPacs.TabIndex = 3; this.RbPacs.TabStop = true; this.RbPacs.Text = "检查"; @@ -437,10 +431,9 @@ // RbAll // this.RbAll.AutoSize = true; - this.RbAll.Location = new System.Drawing.Point(306, 15); - this.RbAll.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.RbAll.Location = new System.Drawing.Point(153, 8); this.RbAll.Name = "RbAll"; - this.RbAll.Size = new System.Drawing.Size(93, 35); + this.RbAll.Size = new System.Drawing.Size(50, 21); this.RbAll.TabIndex = 2; this.RbAll.TabStop = true; this.RbAll.Text = "所有"; @@ -448,10 +441,9 @@ // // TxtHisFeeItem // - this.TxtHisFeeItem.Location = new System.Drawing.Point(12, 13); - this.TxtHisFeeItem.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.TxtHisFeeItem.Location = new System.Drawing.Point(6, 7); this.TxtHisFeeItem.Name = "TxtHisFeeItem"; - this.TxtHisFeeItem.Size = new System.Drawing.Size(260, 39); + this.TxtHisFeeItem.Size = new System.Drawing.Size(132, 23); this.TxtHisFeeItem.TabIndex = 0; // // splitterControl1 @@ -459,10 +451,9 @@ this.splitterControl1.Appearance.BackColor = System.Drawing.Color.White; this.splitterControl1.Appearance.Options.UseBackColor = true; this.splitterControl1.Dock = System.Windows.Forms.DockStyle.Right; - this.splitterControl1.Location = new System.Drawing.Point(1224, 0); - this.splitterControl1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.splitterControl1.Location = new System.Drawing.Point(612, 0); this.splitterControl1.Name = "splitterControl1"; - this.splitterControl1.Size = new System.Drawing.Size(10, 1366); + this.splitterControl1.Size = new System.Drawing.Size(5, 582); this.splitterControl1.TabIndex = 2; this.splitterControl1.TabStop = false; // @@ -472,7 +463,6 @@ this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; this.splitContainer1.Location = new System.Drawing.Point(0, 0); - this.splitContainer1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.splitContainer1.Name = "splitContainer1"; this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; // @@ -484,23 +474,21 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1224, 1366); - this.splitContainer1.SplitterDistance = 878; - this.splitContainer1.SplitterWidth = 9; + this.splitContainer1.Size = new System.Drawing.Size(612, 582); + this.splitContainer1.SplitterDistance = 93; + this.splitContainer1.SplitterWidth = 5; this.splitContainer1.TabIndex = 3; // // DgcFeeItem // this.DgcFeeItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcFeeItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - this.DgcFeeItem.Location = new System.Drawing.Point(0, 75); + this.DgcFeeItem.Location = new System.Drawing.Point(0, 41); this.DgcFeeItem.MainView = this.DgvFeeItem; - this.DgcFeeItem.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcFeeItem.Name = "DgcFeeItem"; this.DgcFeeItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1, this.repositoryItemMemoEdit1}); - this.DgcFeeItem.Size = new System.Drawing.Size(1222, 801); + this.DgcFeeItem.Size = new System.Drawing.Size(610, 50); this.DgcFeeItem.TabIndex = 121; this.DgcFeeItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvFeeItem}); @@ -740,9 +728,9 @@ this.MenuFee.Dock = System.Windows.Forms.DockStyle.Top; this.MenuFee.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.MenuFee.Location = new System.Drawing.Point(0, 0); - this.MenuFee.Margin = new System.Windows.Forms.Padding(6, 11, 6, 11); + this.MenuFee.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.MenuFee.Name = "MenuFee"; - this.MenuFee.Size = new System.Drawing.Size(1222, 75); + this.MenuFee.Size = new System.Drawing.Size(610, 41); this.MenuFee.TabIndex = 1; // // splitContainer2 @@ -751,7 +739,6 @@ this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; this.splitContainer2.Location = new System.Drawing.Point(0, 0); - this.splitContainer2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.splitContainer2.Name = "splitContainer2"; // // splitContainer2.Panel1 @@ -766,22 +753,20 @@ this.splitContainer2.Panel2.Controls.Add(this.splitter1); this.splitContainer2.Panel2.Controls.Add(this.panelControl1); this.splitContainer2.Panel2.Controls.Add(this.panel2); - this.splitContainer2.Size = new System.Drawing.Size(1224, 479); - this.splitContainer2.SplitterDistance = 763; - this.splitContainer2.SplitterWidth = 10; + this.splitContainer2.Size = new System.Drawing.Size(612, 484); + this.splitContainer2.SplitterDistance = 150; + this.splitContainer2.SplitterWidth = 5; this.splitContainer2.TabIndex = 0; // // DgcRptItem // this.DgcRptItem.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcRptItem.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - this.DgcRptItem.Location = new System.Drawing.Point(0, 75); + this.DgcRptItem.Location = new System.Drawing.Point(0, 41); this.DgcRptItem.MainView = this.DgvRptItem; - this.DgcRptItem.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcRptItem.Name = "DgcRptItem"; this.DgcRptItem.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit4}); - this.DgcRptItem.Size = new System.Drawing.Size(761, 402); + this.DgcRptItem.Size = new System.Drawing.Size(148, 441); this.DgcRptItem.TabIndex = 122; this.DgcRptItem.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvRptItem}); @@ -937,18 +922,17 @@ this.panel1.Controls.Add(this.label1); this.panel1.Dock = System.Windows.Forms.DockStyle.Top; this.panel1.Location = new System.Drawing.Point(0, 0); - this.panel1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(761, 75); + this.panel1.Size = new System.Drawing.Size(148, 41); this.panel1.TabIndex = 0; // // MenuRpt // this.MenuRpt.Dock = System.Windows.Forms.DockStyle.Fill; - this.MenuRpt.Location = new System.Drawing.Point(148, 0); - this.MenuRpt.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7); + this.MenuRpt.Location = new System.Drawing.Point(74, 0); + this.MenuRpt.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.MenuRpt.Name = "MenuRpt"; - this.MenuRpt.Size = new System.Drawing.Size(613, 75); + this.MenuRpt.Size = new System.Drawing.Size(74, 41); this.MenuRpt.TabIndex = 1; // // label1 @@ -956,9 +940,8 @@ this.label1.Dock = System.Windows.Forms.DockStyle.Left; this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Location = new System.Drawing.Point(0, 0); - this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(148, 75); + this.label1.Size = new System.Drawing.Size(74, 41); this.label1.TabIndex = 0; this.label1.Text = "检查项目"; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -966,14 +949,12 @@ // DgcSign // this.DgcSign.Dock = System.Windows.Forms.DockStyle.Fill; - this.DgcSign.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); - this.DgcSign.Location = new System.Drawing.Point(0, 75); + this.DgcSign.Location = new System.Drawing.Point(0, 41); this.DgcSign.MainView = this.DgvSign; - this.DgcSign.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.DgcSign.Name = "DgcSign"; this.DgcSign.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.CmbConclusionSearch}); - this.DgcSign.Size = new System.Drawing.Size(449, 215); + this.DgcSign.Size = new System.Drawing.Size(455, 338); this.DgcSign.TabIndex = 123; this.DgcSign.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvSign}); @@ -1215,10 +1196,9 @@ // splitter1 // this.splitter1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.splitter1.Location = new System.Drawing.Point(0, 290); - this.splitter1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.splitter1.Location = new System.Drawing.Point(0, 379); this.splitter1.Name = "splitter1"; - this.splitter1.Size = new System.Drawing.Size(449, 5); + this.splitter1.Size = new System.Drawing.Size(455, 3); this.splitter1.TabIndex = 126; this.splitter1.TabStop = false; // @@ -1230,10 +1210,9 @@ this.panelControl1.Controls.Add(this.panelSuggestion); this.panelControl1.Controls.Add(this.label3); this.panelControl1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelControl1.Location = new System.Drawing.Point(0, 295); - this.panelControl1.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.panelControl1.Location = new System.Drawing.Point(0, 382); this.panelControl1.Name = "panelControl1"; - this.panelControl1.Size = new System.Drawing.Size(449, 182); + this.panelControl1.Size = new System.Drawing.Size(455, 100); this.panelControl1.TabIndex = 124; // // panelSuggestion @@ -1241,10 +1220,9 @@ this.panelSuggestion.AutoScroll = true; this.panelSuggestion.Controls.Add(this.LblSuggestion); this.panelSuggestion.Dock = System.Windows.Forms.DockStyle.Fill; - this.panelSuggestion.Location = new System.Drawing.Point(88, 0); - this.panelSuggestion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); + this.panelSuggestion.Location = new System.Drawing.Point(44, 0); this.panelSuggestion.Name = "panelSuggestion"; - this.panelSuggestion.Size = new System.Drawing.Size(361, 182); + this.panelSuggestion.Size = new System.Drawing.Size(411, 100); this.panelSuggestion.TabIndex = 10; // // LblSuggestion @@ -1252,12 +1230,11 @@ this.LblSuggestion.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.LblSuggestion.Dock = System.Windows.Forms.DockStyle.Fill; this.LblSuggestion.Location = new System.Drawing.Point(0, 0); - this.LblSuggestion.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.LblSuggestion.Multiline = true; this.LblSuggestion.Name = "LblSuggestion"; this.LblSuggestion.ReadOnly = true; this.LblSuggestion.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.LblSuggestion.Size = new System.Drawing.Size(361, 182); + this.LblSuggestion.Size = new System.Drawing.Size(411, 100); this.LblSuggestion.TabIndex = 0; // // label3 @@ -1265,9 +1242,8 @@ this.label3.Dock = System.Windows.Forms.DockStyle.Left; this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Location = new System.Drawing.Point(0, 0); - this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(88, 182); + this.label3.Size = new System.Drawing.Size(44, 100); this.label3.TabIndex = 9; this.label3.Text = "总检建议"; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1279,18 +1255,17 @@ this.panel2.Controls.Add(this.label2); this.panel2.Dock = System.Windows.Forms.DockStyle.Top; this.panel2.Location = new System.Drawing.Point(0, 0); - this.panel2.Margin = new System.Windows.Forms.Padding(6, 5, 6, 5); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(449, 75); + this.panel2.Size = new System.Drawing.Size(455, 41); this.panel2.TabIndex = 1; // // MenuSign // this.MenuSign.Dock = System.Windows.Forms.DockStyle.Fill; - this.MenuSign.Location = new System.Drawing.Point(116, 0); - this.MenuSign.Margin = new System.Windows.Forms.Padding(6, 11, 6, 11); + this.MenuSign.Location = new System.Drawing.Point(58, 0); + this.MenuSign.Margin = new System.Windows.Forms.Padding(3, 6, 3, 6); this.MenuSign.Name = "MenuSign"; - this.MenuSign.Size = new System.Drawing.Size(333, 75); + this.MenuSign.Size = new System.Drawing.Size(397, 41); this.MenuSign.TabIndex = 2; // // label2 @@ -1298,9 +1273,8 @@ this.label2.Dock = System.Windows.Forms.DockStyle.Left; this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Location = new System.Drawing.Point(0, 0); - this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(116, 75); + this.label2.Size = new System.Drawing.Size(58, 41); this.label2.TabIndex = 1; this.label2.Text = "体征词"; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1346,13 +1320,13 @@ // // FeeItemForm // - this.AutoScaleDimensions = new System.Drawing.SizeF(14F, 31F); + this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(2246, 1366); + this.ClientSize = new System.Drawing.Size(1123, 582); this.Controls.Add(this.splitContainer1); this.Controls.Add(this.splitterControl1); this.Controls.Add(this.tabPane1); - this.Margin = new System.Windows.Forms.Padding(8, 7, 8, 7); + this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4); this.Name = "FeeItemForm"; this.Text = "收费项目"; ((System.ComponentModel.ISupportInitialize)(this.tabPane1)).EndInit();