From 695d766843a0dee018a22bc18f341e80c0ebc5d2 Mon Sep 17 00:00:00 2001 From: JokerMagic Date: Wed, 13 Aug 2025 09:58:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=B8=9A=E4=BD=93=E6=A3=80=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.修改报告首页内容 2.修改问诊项目 3.增加职业总检结论 4.修改以上报告内容涉及到的相关模块 --- PEIS/Entity/ExamCareerConclusion.cs | 33 ++ PEIS/Entity/ExamCareerHisInq.cs | 26 +- PEIS/Event/Args.cs | 1 + PEIS/Model/BaseOrgModel.cs | 13 +- PEIS/Model/Exam/TotalModel.cs | 25 +- PEIS/Model/ReportModel.cs | 8 +- PEIS/PEIS.csproj | 48 +- PEIS/Presenter/TotalPresenter.cs | 14 +- PEIS/ReportFiles/CAPReport.frx | 398 ++++++++-------- PEIS/Utils/ReportHelper.cs | 144 ++++-- PEIS/View/Exam/CareerHisInqForm.Designer.cs | 433 +++++++++--------- PEIS/View/Exam/CareerHisInqForm.resx | 23 +- .../View/Exam/CareerHisInqStmForm.Designer.cs | 16 +- PEIS/View/Exam/CareerHisInqStmForm.resx | 20 +- PEIS/View/Exam/ITotalView.cs | 19 +- PEIS/View/Exam/TotalForm.Designer.cs | 182 ++++++-- PEIS/View/Exam/TotalForm.cs | 57 ++- PEIS/View/Exam/TotalForm.resx | 2 +- PEIS/View/UControl/OpMenuSimple.Designer.cs | 4 +- PEIS/View/UControl/OpMenuSimple.resx | 42 +- 20 files changed, 916 insertions(+), 592 deletions(-) create mode 100644 PEIS/Entity/ExamCareerConclusion.cs diff --git a/PEIS/Entity/ExamCareerConclusion.cs b/PEIS/Entity/ExamCareerConclusion.cs new file mode 100644 index 0000000..8de4a3c --- /dev/null +++ b/PEIS/Entity/ExamCareerConclusion.cs @@ -0,0 +1,33 @@ +using PEIS.Utils; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace PEIS.Entity +{ + /// + /// 职业体检结论 + /// + public class ExamCareerConclusion : ObjectData + { + public override String TableName => "Exam_CareerConclusion"; + /// + /// 体检ID + /// + public Int64 EID { get; set; } + /// + /// 职业体检结论(1.目前未见异常 2.复查 3.疑似职业病 4.职业禁忌症 5.其他疾病或异常) + /// + public int OccupationalConclusion { get; set; } + } + + public class CareerConclusionReportModele : ExamCareerConclusion + { + public bool Conclusion_1 { get; set; } = false; + public bool Conclusion_2 { get; set; } = false; + public bool Conclusion_3 { get; set; } = false; + public bool Conclusion_4 { get; set; } = false; + public bool Conclusion_5 { get; set; } = false; + } +} diff --git a/PEIS/Entity/ExamCareerHisInq.cs b/PEIS/Entity/ExamCareerHisInq.cs index a480b0a..cb9e4f7 100644 --- a/PEIS/Entity/ExamCareerHisInq.cs +++ b/PEIS/Entity/ExamCareerHisInq.cs @@ -21,14 +21,38 @@ namespace PEIS.Entity /// public string PastHistory { get; set; } /// - /// 现病史 + /// 现病史(急慢性职业病史) /// public string PreHisIllness { get; set; } /// + /// 诊断日期 + /// + public string PreHisIllnessDate { get; set; } + /// + /// 诊断证明书编号 + /// + public string PreHisIllnessNo { get; set; } + /// + /// 诊断单位 + /// + public string PreHisIllnessOrg { get; set; } + /// + /// 是否痊愈 + /// + public string PreHisIllnessIsHeal { get; set; } + /// /// 家族史 /// public string FamilyHistory { get; set; } /// + /// 服药史、药物过敏史 + /// + public string DrugHistory { get; set; } + /// + /// 药物禁忌或其他 + /// + public string DrugTaboo { get; set; } + /// /// 手术史 /// public string SurgicalHistory { get; set; } diff --git a/PEIS/Event/Args.cs b/PEIS/Event/Args.cs index f804b82..7ac9439 100644 --- a/PEIS/Event/Args.cs +++ b/PEIS/Event/Args.cs @@ -50,6 +50,7 @@ namespace PEIS.Event public String DeptCode { get; set; } public Int64 Eid{ get; set; } public Int64 Pid { get; set; } + public int OccupationalConclusion { get; set; } public Args() { diff --git a/PEIS/Model/BaseOrgModel.cs b/PEIS/Model/BaseOrgModel.cs index 00cf163..dd8d2e8 100644 --- a/PEIS/Model/BaseOrgModel.cs +++ b/PEIS/Model/BaseOrgModel.cs @@ -19,6 +19,7 @@ using System; using System.Collections.Generic; +using System.Linq; using PEIS.Entity; using PEIS.Utils; @@ -26,11 +27,19 @@ namespace PEIS.Model { internal class BaseOrgModel : IModel { - public List GetItems() + public List GetItems() { return DAOHelp.GetDataBySQL($"select * from Base_Org Order by id desc"); } + public BaseOrg GetOrgByID(Int64? orgID) + { + if (orgID == null) + return null; + + return DAOHelp.GetDataBySQL($"select * from Base_Org WHERE ID = {orgID}")?.FirstOrDefault(); + } + public List GetPatient(Int64 orgID) { return DAOHelp.GetDataBySQL($"SELECT a.*, b.Name,b.Birthday,b.CardType, b.CardNo,b.Education, b.Marriage,b.Nation, b.Tel1,b.Address1, b.Tel2, CASE b.Sex WHEN 1 THEN '男' WHEN 2 THEN '女' ELSE '' END AS Sex FROM Base_OrgPatient a LEFT JOIN Base_Patient b ON a.PID = b.ID WHERE OID = {orgID} ORDER BY a.Seq"); @@ -45,7 +54,7 @@ namespace PEIS.Model { var item = DAOHelp.GetDataBySQL($@"SELECT * FROM Base_OrgPatient WHERE OID = {oid} AND PID = {pid} "); - if(item.Count != 0) + if (item.Count != 0) { Global.Msg("info", "该成员已应用到分组！"); return; diff --git a/PEIS/Model/Exam/TotalModel.cs b/PEIS/Model/Exam/TotalModel.cs index 4d30cb6..ddcf7dd 100644 --- a/PEIS/Model/Exam/TotalModel.cs +++ b/PEIS/Model/Exam/TotalModel.cs @@ -326,7 +326,7 @@ namespace PEIS.Model try { Task task = new Task(() => ReportHelper.SaveReport(id)); - task.Start(); + task.Start(); Debug.WriteLine($"{id}保存体检报告成功！"); } catch (AggregateException ae) @@ -359,6 +359,29 @@ namespace PEIS.Model return DAOHelp.ExecuteSql($@"UPDATE Enrollment_Patient SET isWeChatView={isView} WHERE ID = {eid}") > 0; } + /// + /// 获取职业体检结论 + /// + /// + /// + public List GetExamCareerConclusion(Int64 eid) + { + return DAOHelp.GetDataBySQL($@"SELECT * FROM Exam_CareerConclusion WHERE eid = {eid}")?.ToList(); + } + + /// + /// 保存职业体检结论 + /// + /// + /// + /// + public List SaveExamCareerConclusion(Int64 eid, int conclusion) + { + DAOHelp.ExecuteSql($@"DELETE Exam_CareerConclusion WHERE eid = {eid}"); + DAOHelp.Save(new ExamCareerConclusion() { EID = eid, OccupationalConclusion = conclusion }); + return GetExamCareerConclusion(eid); + } + #endregion MyMethod } } \ No newline at end of file diff --git a/PEIS/Model/ReportModel.cs b/PEIS/Model/ReportModel.cs index acbbb0c..497c2aa 100644 --- a/PEIS/Model/ReportModel.cs +++ b/PEIS/Model/ReportModel.cs @@ -65,7 +65,13 @@ namespace PEIS.Model a.CardNo, COALESCE(a.OrgName, a.Company) AS OrgName, COALESCE ( a.Nation, b.Nation ) AS Nation, - c.DeptName + c.DeptName, + a.OID, + a.PID, + a.HazardFactors, + a.WorkYears, + a.JobTypes, + a.HazardYears FROM Enrollment_Patient a LEFT JOIN Base_Patient b ON a.pid = b.id diff --git a/PEIS/PEIS.csproj b/PEIS/PEIS.csproj index 500f9e3..a85b10f 100644 --- a/PEIS/PEIS.csproj +++ b/PEIS/PEIS.csproj @@ -198,6 +198,7 @@ + @@ -762,38 +763,37 @@ True - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest @@ -801,7 +801,7 @@ - Always + PreserveNewest @@ -830,7 +830,7 @@ - Always + PreserveNewest @@ -846,34 +846,34 @@ - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest - Always + PreserveNewest diff --git a/PEIS/Presenter/TotalPresenter.cs b/PEIS/Presenter/TotalPresenter.cs index b0f84ce..fa48995 100644 --- a/PEIS/Presenter/TotalPresenter.cs +++ b/PEIS/Presenter/TotalPresenter.cs @@ -40,7 +40,7 @@ namespace PEIS.Presenter View.GetPatient += (send, args) => { View.ShowPatient(new TotalModel().GetPatient(args.ID)); - }; + }; //2.检查结果 View.GetExamResultList += (send, args) => { @@ -51,7 +51,7 @@ namespace PEIS.Presenter { View.ShowSummary(new TotalModel().GetSummary(args.ID)); }; - + //4.结论词 View.GetExamConclusion += (send, args) => { @@ -81,6 +81,16 @@ namespace PEIS.Presenter { View.ShowReportExtList(new PartModel().GetReportExtList(args.ID)); }; + + //8.职业体检结论 + View.GetExamCareerConclusion += (send, args) => + { + View.ShowExamCareerConclusion(new TotalModel().GetExamCareerConclusion(args.ID)); + }; + View.SaveExamCareerConclusion += (send, args) => + { + View.ShowExamCareerConclusion(new TotalModel().SaveExamCareerConclusion(args.ID, args.OccupationalConclusion)); + }; } } } \ No newline at end of file diff --git a/PEIS/ReportFiles/CAPReport.frx b/PEIS/ReportFiles/CAPReport.frx index ccf099c..e1b56a3 100644 --- a/PEIS/ReportFiles/CAPReport.frx +++ b/PEIS/ReportFiles/CAPReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -46,12 +46,12 @@ namespace FastReport Text132.Text = rowData["IsDeptGiveUp"].ToString() == "1" ? "是" : ""; Text134.Text = rowData["GiveUpTime"] == null ? "" : "是"; } - - private void Picture3_BeforePrint(object sender, EventArgs e) + + + private void Avatar_BeforePrint(object sender, EventArgs e) { - //Picture3.Image = Base64ToImage((string)Report.GetParameterValue("Avatar")); - Picture6.Image = Base64ToImage((string)Report.GetParameterValue("Avatar")); - } + Avatar.Image = Base64ToImage((string)Report.GetParameterValue("Avatar")); + } private void Cell171_AfterData(object sender, EventArgs e) { @@ -145,8 +145,7 @@ namespace FastReport } } - - + } } @@ -169,46 +168,195 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -252,146 +400,6 @@ namespace FastReport - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -465,7 +473,7 @@ namespace FastReport - + @@ -586,7 +594,7 @@ namespace FastReport - + @@ -602,8 +610,9 @@ namespace FastReport - - + + + @@ -617,10 +626,19 @@ namespace FastReport - - + + + + + + + + + + + - + diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index ddb0322..28758cf 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -28,11 +28,12 @@ using System.Drawing; using System.Drawing.Imaging; using FastReport.Export.Pdf; using PEIS.Model.Exam; +using PEIS.View.Exam; namespace PEIS.Utils { public static class ReportHelper - { + { /// /// PDF to Image /// @@ -112,14 +113,14 @@ namespace PEIS.Utils /// /// 体检号 /// - public static FastReport.Report GetReport(Int64 eid,String paramFile = null) + public static FastReport.Report GetReport(Int64 eid, String paramFile = null) { try { var patient = new ReportModel().GetPatientInfo(eid); if (patient == null) return null; var fileName = DAOHelp.GetDataBySQL($"SELECT Description FROM Dict_Config where Value='{patient.Type}'").FirstOrDefault()?.Description ?? "PReport.frx"; - var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles",string.IsNullOrEmpty(paramFile) ? fileName : paramFile); + var filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "ReportFiles", string.IsNullOrEmpty(paramFile) ? fileName : paramFile); if (!File.Exists(filePath)) { MessageBox.Show($@"未找到报告单模板文件：{fileName}", @"获取报告单失败"); @@ -254,32 +255,50 @@ namespace PEIS.Utils var examCareerHisInq = new CareerHisInqModel().GetExamCareerHisInqByEid(eid); var examEmploymentHis = new CareerHisInqModel().GetEmploymentHises(eid); - // 登记信息 + var examCareerConclusions = new TotalModel().GetExamCareerConclusion(eid); + + // 基础信息 + rpt.SetParameterValue("TeamName", patient.OrgName); + if (patient.OID != null) + { + var org = new BaseOrgModel().GetOrgByID(patient.OID); + rpt.SetParameterValue("TeamAddress", org.Address); + } + else + { + rpt.SetParameterValue("TeamAddress", ""); + } + rpt.SetParameterValue("PatientID", patient.PID); + rpt.SetParameterValue("ExamID", patient.ID.ToString()); rpt.SetParameterValue("PatientName", patient.Name); - rpt.SetParameterValue("CardNo", patient.CardNo); - rpt.SetParameterValue("Nation", patient.Nation); - rpt.SetParameterValue("Age", patient.Age + patient.AgeClass); rpt.SetParameterValue("Sex", patient.Sex == "1" ? "男" : patient.Sex == "2" ? "女" : ""); - rpt.SetParameterValue("ExamID", patient.ID.ToString()); - rpt.SetParameterValue("ExamDate", patient.SignTime?.ToShortDateString()); + rpt.SetParameterValue("Age", patient.Age + patient.AgeClass); rpt.SetParameterValue("Marriage", patient.Marriage); - rpt.SetParameterValue("TeamName", patient.OrgName); - rpt.SetParameterValue("GroupName", patient.GroupName); - rpt.SetParameterValue("Company", patient.Company); - rpt.SetParameterValue("ExamType", patient.Type); - rpt.SetParameterValue("Address", patient.Address1); + rpt.SetParameterValue("IDCard", patient.CardNo); + rpt.SetParameterValue("JobTypes", patient.JobTypes); + rpt.SetParameterValue("WorkYears", patient.WorkYears); + rpt.SetParameterValue("HazardYears", patient.HazardYears); + rpt.SetParameterValue("HazardFactors", patient.HazardFactors); + rpt.SetParameterValue("EnrollmentType", patient.JobStatus); + rpt.SetParameterValue("ExamDate", patient.SignTime?.ToShortDateString()); rpt.SetParameterValue("Tel", patient.Tel1); + + //rpt.SetParameterValue("Nation", patient.Nation); + //rpt.SetParameterValue("GroupName", patient.GroupName); + //rpt.SetParameterValue("Company", patient.Company); + //rpt.SetParameterValue("ExamType", patient.Type); + //rpt.SetParameterValue("Address", patient.Address1); + + //rpt.SetParameterValue("DeptName", patient.DeptName); + //rpt.SetParameterValue("HospitalAddress", "无"); + //rpt.SetParameterValue("HospitalCertificate", "无"); + //rpt.SetParameterValue("HospitalTel", Global._hospital.Tel); + + rpt.SetParameterValue("HospitalName", Global._hospital.Name); + rpt.SetParameterValue("FinishPerson", patient.Finisher); rpt.SetParameterValue("FinishDate", patient.FinishTime?.ToShortDateString()); - rpt.SetParameterValue("HospitalName", Global._hospital.Name); - rpt.SetParameterValue("DeptName", patient.DeptName); - - rpt.SetParameterValue("EnrollmentType", patient.JobStatus); - rpt.SetParameterValue("IDCard", patient.CardNo); - rpt.SetParameterValue("HospitalAddress", "无"); - rpt.SetParameterValue("HospitalCertificate", "无"); - rpt.SetParameterValue("HospitalTel", Global._hospital.Tel); if (string.IsNullOrEmpty(patient.Photo)) { @@ -299,43 +318,53 @@ namespace PEIS.Utils } } - List testList = new List() - { - //new { PatientName="张三1",Sex="男",IDCard="530128199403243610",MaritalStatus="已婚",HDTAge="10年",HDAge="5年",HDStr="高温、高压"}, - }; + List examEmployments = new List(); foreach (var item in examEmploymentHis) { - testList.Add(new + ExamEmploymentHisView examEmployment = new ExamEmploymentHisView(); + if (item.StartTime != null && item.EndTime != null) { - PatientName = patient.Name, - Sex = patient.Sex == "1" ? "男" : patient.Sex == "2" ? "女" : "", - IDCard = patient.CardNo, - MaritalStatus = patient.Marriage, - HDTAge = "", - HDAge = "", - HDStr = item.HarmfulFactors - }); + examEmployment.StartEndTime = $"{item.StartTime.Year}年{item.StartTime.Month}月至{item.EndTime.Year}年{item.EndTime.Month}月"; + } + examEmployment.ID = item.ID; + examEmployment.PID = item.PID; + examEmployment.WorkUnit = item.WorkUnit; + examEmployment.Workshop = item.Workshop; + examEmployment.WorkType = item.WorkType; + examEmployment.HarmfulFactors = item.HarmfulFactors; + examEmployment.ProtectiveMeasures = item.ProtectiveMeasures; + examEmployments.Add(examEmployment); } - List symptoms = new List(); - for (int i = 0; i < lstSymptom.Count; i = i + 2) + //计算显示表格行数 + int rowCount = (int)Math.Ceiling((lstSymptom.Count + 1) / 2.0); + for (int i = 0; i < rowCount; i++) { SymptomReportModele sm = new SymptomReportModele(); sm.SMName0 = $"{lstSymptom[i].DispOrder}、{lstSymptom[i].SMName}"; sm.SMValue0 = lstSymptom[i].SMValue; - if ((i + 1) < lstSymptom.Count) + if ((i + rowCount) < lstSymptom.Count) { - sm.SMName1 = $"{lstSymptom[i + 1].DispOrder}、{lstSymptom[i + 1].SMName}"; - sm.SMValue1 = lstSymptom[i + 1].SMValue; + sm.SMName1 = $"{lstSymptom[i + rowCount].DispOrder}、{lstSymptom[i + rowCount].SMName}"; + sm.SMValue1 = lstSymptom[i + rowCount].SMValue; } symptoms.Add(sm); } + symptoms.Last().SMName1 = "医生签名:"; var careerHisInq = new List(); ECInqReportModele eCInqReport = new ECInqReportModele(); if (examCareerHisInq != null) { eCInqReport.PastHistory = string.IsNullOrEmpty(examCareerHisInq.PastHistory) ? "/" : examCareerHisInq.PastHistory; + eCInqReport.PreHisIllness = string.IsNullOrEmpty(examCareerHisInq.PreHisIllness) ? "/" : examCareerHisInq.PreHisIllness; + eCInqReport.PreHisIllnessDate = string.IsNullOrEmpty(examCareerHisInq.PreHisIllnessDate) ? "/" : examCareerHisInq.PreHisIllnessDate; + eCInqReport.PreHisIllnessOrg = string.IsNullOrEmpty(examCareerHisInq.PreHisIllnessOrg) ? "/" : examCareerHisInq.PreHisIllnessOrg; + eCInqReport.PreHisIllnessNo = string.IsNullOrEmpty(examCareerHisInq.PreHisIllnessNo) ? "/" : examCareerHisInq.PreHisIllnessNo; + eCInqReport.PreHisIllnessIsHeal = string.IsNullOrEmpty(examCareerHisInq.PreHisIllnessIsHeal) ? "/" : examCareerHisInq.PreHisIllnessIsHeal; + eCInqReport.FamilyHistory = string.IsNullOrEmpty(examCareerHisInq.FamilyHistory) ? "/" : examCareerHisInq.FamilyHistory; + eCInqReport.DrugHistory = string.IsNullOrEmpty(examCareerHisInq.DrugHistory) ? "/" : examCareerHisInq.DrugHistory; + eCInqReport.DrugTaboo = string.IsNullOrEmpty(examCareerHisInq.DrugTaboo) ? "/" : examCareerHisInq.DrugTaboo; eCInqReport.Menarche = string.IsNullOrEmpty(examCareerHisInq.Menarche) ? "/" : examCareerHisInq.Menarche; eCInqReport.MenarchePeriod = string.IsNullOrEmpty(examCareerHisInq.MenarchePeriod) ? "/" : examCareerHisInq.MenarchePeriod; eCInqReport.MenarcheCycle = string.IsNullOrEmpty(examCareerHisInq.MenarcheCycle) ? "/" : examCareerHisInq.MenarcheCycle; @@ -362,6 +391,14 @@ namespace PEIS.Utils else { eCInqReport.PastHistory = "/"; + eCInqReport.PreHisIllness = "/"; + eCInqReport.PreHisIllnessDate = "/"; + eCInqReport.PreHisIllnessOrg = "/"; + eCInqReport.PreHisIllnessNo = "/"; + eCInqReport.PreHisIllnessIsHeal = "/"; + eCInqReport.FamilyHistory = "/"; + eCInqReport.DrugHistory = "/"; + eCInqReport.DrugTaboo = "/"; eCInqReport.Menarche = "/"; eCInqReport.MenarchePeriod = "/"; eCInqReport.MenarcheCycle = "/"; @@ -389,21 +426,40 @@ namespace PEIS.Utils string Conclusion = string.Empty; string Suggestion = string.Empty; - if (lstConclusions!=null&& lstConclusions.Count>0) + if (lstConclusions != null && lstConclusions.Count > 0) { for (int i = 0; i < lstConclusions.Count; i++) { - Conclusion +=$"{(i + 1)}、{lstConclusions[i].Conclusion}。" + "\r\n"; - Suggestion+= $"{lstConclusions[i].Suggestion}" + "\r\n" ; + Conclusion += $"{(i + 1)}、{lstConclusions[i].Conclusion}。" + "\r\n"; + Suggestion += $"{(i + 1)}、{lstConclusions[i].Conclusion}。" + "\r\n" + $"{lstConclusions[i].Suggestion}" + "\r\n"; } } rpt.SetParameterValue("Conclusion", Conclusion); rpt.SetParameterValue("Suggestion", Suggestion); + List lstCareerConclusions = new List(); + CareerConclusionReportModele careerConclusion = new CareerConclusionReportModele(); + if (examCareerConclusions != null && examCareerConclusions.Any()) + { + if (examCareerConclusions.First().OccupationalConclusion == 1) + careerConclusion.Conclusion_1 = true; + else if (examCareerConclusions.First().OccupationalConclusion == 2) + careerConclusion.Conclusion_2 = true; + else if (examCareerConclusions.First().OccupationalConclusion == 3) + careerConclusion.Conclusion_3 = true; + else if (examCareerConclusions.First().OccupationalConclusion == 4) + careerConclusion.Conclusion_4 = true; + else if (examCareerConclusions.First().OccupationalConclusion == 5) + careerConclusion.Conclusion_5 = true; + } + lstCareerConclusions.Add(careerConclusion); + // 收费列表 SetDataSource(ref rpt, lstEFeeItems, "F", "FeeItems"); // 总结结论词 SetDataSource(ref rpt, lstConclusions, "C", "Conclusion"); + // 职业体检结论 + SetDataSource(ref rpt, lstCareerConclusions, "CC", "CareerConclusion"); //一般检查 SetDataSource(ref rpt, lstGeneral, "G", "General"); //PACS @@ -413,7 +469,7 @@ namespace PEIS.Utils // PacsImage SetDataSource(ref rpt, lstPacsPhotos, "I", "PACSImage"); // 职业史 - SetDataSource(ref rpt, testList, "CAH", "CAItems"); + SetDataSource(ref rpt, examEmployments, "CAH", "CAItems"); //问诊 SetDataSource(ref rpt, careerHisInq, "CAC", "CareerHisInq"); //症状 diff --git a/PEIS/View/Exam/CareerHisInqForm.Designer.cs b/PEIS/View/Exam/CareerHisInqForm.Designer.cs index 6fbb296..df45085 100644 --- a/PEIS/View/Exam/CareerHisInqForm.Designer.cs +++ b/PEIS/View/Exam/CareerHisInqForm.Designer.cs @@ -66,10 +66,6 @@ this.SmokeState_3 = new System.Windows.Forms.RadioButton(); this.Symptom = new System.Windows.Forms.TextBox(); this.label44 = new System.Windows.Forms.Label(); - this.Other = new System.Windows.Forms.TextBox(); - this.label43 = new System.Windows.Forms.Label(); - this.SleepCondition = new System.Windows.Forms.TextBox(); - this.label42 = new System.Windows.Forms.Label(); this.label41 = new System.Windows.Forms.Label(); this.DrinkYears = new System.Windows.Forms.TextBox(); this.label40 = new System.Windows.Forms.Label(); @@ -105,14 +101,7 @@ this.Menarche = new System.Windows.Forms.TextBox(); this.label22 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label(); - this.SpouseOctionhealth = new System.Windows.Forms.TextBox(); - this.label20 = new System.Windows.Forms.Label(); - this.SpouseRadiationHis = new System.Windows.Forms.TextBox(); - this.label19 = new System.Windows.Forms.Label(); - this.MarriageDate = new System.Windows.Forms.TextBox(); - this.label18 = new System.Windows.Forms.Label(); - this.label17 = new System.Windows.Forms.Label(); - this.SurgicalHistory = new System.Windows.Forms.TextBox(); + this.DrugHistory = new System.Windows.Forms.TextBox(); this.label16 = new System.Windows.Forms.Label(); this.FamilyHistory = new System.Windows.Forms.TextBox(); this.label15 = new System.Windows.Forms.Label(); @@ -139,6 +128,16 @@ this.CancelBtn = new System.Windows.Forms.Button(); this.ConfirmBtn = new System.Windows.Forms.Button(); this.superTabControl1 = new FastReport.DevComponents.DotNetBar.SuperTabControl(); + this.label1 = new System.Windows.Forms.Label(); + this.PreHisIllnessDate = new System.Windows.Forms.TextBox(); + this.label17 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.PreHisIllnessNo = new System.Windows.Forms.TextBox(); + this.PreHisIllnessOrg = new System.Windows.Forms.TextBox(); + this.PreHisIllnessIsHeal = new System.Windows.Forms.TextBox(); + this.label20 = new System.Windows.Forms.Label(); + this.DrugTaboo = new System.Windows.Forms.TextBox(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.advPropertyGrid1)).BeginInit(); this.panelMain.SuspendLayout(); @@ -417,21 +416,27 @@ 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(1126, 706); + this.panelMain.Size = new System.Drawing.Size(1126, 678); this.panelMain.TabIndex = 2; // // groupBox1 // this.groupBox1.BackColor = System.Drawing.Color.White; + this.groupBox1.Controls.Add(this.DrugTaboo); + this.groupBox1.Controls.Add(this.label20); + this.groupBox1.Controls.Add(this.PreHisIllnessIsHeal); + this.groupBox1.Controls.Add(this.PreHisIllnessOrg); + this.groupBox1.Controls.Add(this.PreHisIllnessNo); + this.groupBox1.Controls.Add(this.label19); + this.groupBox1.Controls.Add(this.label18); + this.groupBox1.Controls.Add(this.label17); + this.groupBox1.Controls.Add(this.PreHisIllnessDate); + this.groupBox1.Controls.Add(this.label1); this.groupBox1.Controls.Add(this.btnSymptom); this.groupBox1.Controls.Add(this.panelDrink); this.groupBox1.Controls.Add(this.panelSmoke); this.groupBox1.Controls.Add(this.Symptom); this.groupBox1.Controls.Add(this.label44); - this.groupBox1.Controls.Add(this.Other); - this.groupBox1.Controls.Add(this.label43); - this.groupBox1.Controls.Add(this.SleepCondition); - this.groupBox1.Controls.Add(this.label42); this.groupBox1.Controls.Add(this.label41); this.groupBox1.Controls.Add(this.DrinkYears); this.groupBox1.Controls.Add(this.label40); @@ -467,14 +472,7 @@ this.groupBox1.Controls.Add(this.Menarche); this.groupBox1.Controls.Add(this.label22); this.groupBox1.Controls.Add(this.label21); - this.groupBox1.Controls.Add(this.SpouseOctionhealth); - this.groupBox1.Controls.Add(this.label20); - this.groupBox1.Controls.Add(this.SpouseRadiationHis); - this.groupBox1.Controls.Add(this.label19); - this.groupBox1.Controls.Add(this.MarriageDate); - this.groupBox1.Controls.Add(this.label18); - this.groupBox1.Controls.Add(this.label17); - this.groupBox1.Controls.Add(this.SurgicalHistory); + this.groupBox1.Controls.Add(this.DrugHistory); this.groupBox1.Controls.Add(this.label16); this.groupBox1.Controls.Add(this.FamilyHistory); this.groupBox1.Controls.Add(this.label15); @@ -488,14 +486,14 @@ this.groupBox1.Margin = new System.Windows.Forms.Padding(19, 4, 3, 4); this.groupBox1.Name = "groupBox1"; this.groupBox1.Padding = new System.Windows.Forms.Padding(19, 4, 3, 4); - this.groupBox1.Size = new System.Drawing.Size(1126, 467); + this.groupBox1.Size = new System.Drawing.Size(1126, 439); this.groupBox1.TabIndex = 2; this.groupBox1.TabStop = false; this.groupBox1.Text = "问诊"; // // btnSymptom // - this.btnSymptom.Location = new System.Drawing.Point(975, 433); + this.btnSymptom.Location = new System.Drawing.Point(1022, 381); this.btnSymptom.Name = "btnSymptom"; this.btnSymptom.Size = new System.Drawing.Size(75, 26); this.btnSymptom.TabIndex = 94; @@ -507,7 +505,7 @@ this.panelDrink.Controls.Add(this.DrinkState_1); this.panelDrink.Controls.Add(this.DrinkState_2); this.panelDrink.Controls.Add(this.DrinkState_3); - this.panelDrink.Location = new System.Drawing.Point(134, 325); + this.panelDrink.Location = new System.Drawing.Point(182, 321); this.panelDrink.Name = "panelDrink"; this.panelDrink.Size = new System.Drawing.Size(220, 40); this.panelDrink.TabIndex = 79; @@ -552,7 +550,7 @@ this.panelSmoke.Controls.Add(this.SmokeState_1); this.panelSmoke.Controls.Add(this.SmokeState_2); this.panelSmoke.Controls.Add(this.SmokeState_3); - this.panelSmoke.Location = new System.Drawing.Point(134, 284); + this.panelSmoke.Location = new System.Drawing.Point(182, 280); this.panelSmoke.Name = "panelSmoke"; this.panelSmoke.Size = new System.Drawing.Size(220, 40); this.panelSmoke.TabIndex = 73; @@ -594,7 +592,7 @@ // // Symptom // - this.Symptom.Location = new System.Drawing.Point(134, 435); + this.Symptom.Location = new System.Drawing.Point(181, 383); this.Symptom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Symptom.Name = "Symptom"; this.Symptom.Size = new System.Drawing.Size(840, 23); @@ -603,54 +601,17 @@ // label44 // this.label44.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label44.Location = new System.Drawing.Point(22, 435); + this.label44.Location = new System.Drawing.Point(23, 383); this.label44.Name = "label44"; - this.label44.Size = new System.Drawing.Size(105, 24); + this.label44.Size = new System.Drawing.Size(152, 23); this.label44.TabIndex = 92; - this.label44.Text = "十一、症状："; - this.label44.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // Other - // - this.Other.Location = new System.Drawing.Point(134, 405); - this.Other.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Other.Name = "Other"; - this.Other.Size = new System.Drawing.Size(916, 23); - this.Other.TabIndex = 91; - // - // label43 - // - this.label43.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label43.Location = new System.Drawing.Point(22, 405); - this.label43.Name = "label43"; - this.label43.Size = new System.Drawing.Size(105, 24); - this.label43.TabIndex = 90; - this.label43.Text = "十、其 他："; - this.label43.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // SleepCondition - // - this.SleepCondition.Location = new System.Drawing.Point(134, 375); - this.SleepCondition.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.SleepCondition.Name = "SleepCondition"; - this.SleepCondition.Size = new System.Drawing.Size(916, 23); - this.SleepCondition.TabIndex = 89; - this.SleepCondition.Text = "良好"; - // - // label42 - // - this.label42.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label42.Location = new System.Drawing.Point(22, 375); - this.label42.Name = "label42"; - this.label42.Size = new System.Drawing.Size(105, 24); - this.label42.TabIndex = 88; - this.label42.Text = "九、睡眠情况："; - this.label42.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.label44.Text = "八、症状："; + this.label44.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label41 // this.label41.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label41.Location = new System.Drawing.Point(571, 333); + this.label41.Location = new System.Drawing.Point(619, 329); this.label41.Name = "label41"; this.label41.Size = new System.Drawing.Size(20, 24); this.label41.TabIndex = 87; @@ -659,7 +620,7 @@ // // DrinkYears // - this.DrinkYears.Location = new System.Drawing.Point(505, 333); + this.DrinkYears.Location = new System.Drawing.Point(553, 329); this.DrinkYears.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.DrinkYears.Name = "DrinkYears"; this.DrinkYears.Size = new System.Drawing.Size(65, 23); @@ -668,7 +629,7 @@ // label40 // this.label40.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label40.Location = new System.Drawing.Point(440, 333); + this.label40.Location = new System.Drawing.Point(488, 329); this.label40.Name = "label40"; this.label40.Size = new System.Drawing.Size(70, 24); this.label40.TabIndex = 85; @@ -677,7 +638,7 @@ // // DrinkQuantity // - this.DrinkQuantity.Location = new System.Drawing.Point(372, 333); + this.DrinkQuantity.Location = new System.Drawing.Point(420, 329); this.DrinkQuantity.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.DrinkQuantity.Name = "DrinkQuantity"; this.DrinkQuantity.Size = new System.Drawing.Size(65, 23); @@ -686,7 +647,7 @@ // label39 // this.label39.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label39.Location = new System.Drawing.Point(662, 290); + this.label39.Location = new System.Drawing.Point(710, 286); this.label39.Name = "label39"; this.label39.Size = new System.Drawing.Size(20, 24); this.label39.TabIndex = 78; @@ -695,7 +656,7 @@ // // SmokeMonths // - this.SmokeMonths.Location = new System.Drawing.Point(595, 292); + this.SmokeMonths.Location = new System.Drawing.Point(643, 288); this.SmokeMonths.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.SmokeMonths.Name = "SmokeMonths"; this.SmokeMonths.Size = new System.Drawing.Size(65, 23); @@ -704,7 +665,7 @@ // label38 // this.label38.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label38.Location = new System.Drawing.Point(571, 291); + this.label38.Location = new System.Drawing.Point(619, 287); this.label38.Name = "label38"; this.label38.Size = new System.Drawing.Size(20, 24); this.label38.TabIndex = 76; @@ -713,7 +674,7 @@ // // SmokeYears // - this.SmokeYears.Location = new System.Drawing.Point(505, 292); + this.SmokeYears.Location = new System.Drawing.Point(553, 288); this.SmokeYears.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.SmokeYears.Name = "SmokeYears"; this.SmokeYears.Size = new System.Drawing.Size(65, 23); @@ -722,7 +683,7 @@ // label37 // this.label37.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label37.Location = new System.Drawing.Point(440, 292); + this.label37.Location = new System.Drawing.Point(488, 288); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(65, 24); this.label37.TabIndex = 74; @@ -731,7 +692,7 @@ // // SmokeQuantity // - this.SmokeQuantity.Location = new System.Drawing.Point(372, 293); + this.SmokeQuantity.Location = new System.Drawing.Point(420, 289); this.SmokeQuantity.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.SmokeQuantity.Name = "SmokeQuantity"; this.SmokeQuantity.Size = new System.Drawing.Size(65, 23); @@ -740,16 +701,16 @@ // label36 // this.label36.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label36.Location = new System.Drawing.Point(22, 310); + this.label36.Location = new System.Drawing.Point(23, 290); this.label36.Name = "label36"; - this.label36.Size = new System.Drawing.Size(105, 24); + this.label36.Size = new System.Drawing.Size(152, 46); this.label36.TabIndex = 66; - this.label36.Text = "八、烟酒史："; - this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.label36.Text = "七、烟酒史："; + this.label36.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // PrematureDelivery // - this.PrematureDelivery.Location = new System.Drawing.Point(470, 259); + this.PrematureDelivery.Location = new System.Drawing.Point(513, 237); this.PrematureDelivery.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.PrematureDelivery.Name = "PrematureDelivery"; this.PrematureDelivery.Size = new System.Drawing.Size(65, 23); @@ -758,7 +719,7 @@ // label35 // this.label35.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label35.Location = new System.Drawing.Point(410, 260); + this.label35.Location = new System.Drawing.Point(453, 238); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(60, 24); this.label35.TabIndex = 64; @@ -768,7 +729,7 @@ // label34 // this.label34.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label34.Location = new System.Drawing.Point(810, 260); + this.label34.Location = new System.Drawing.Point(853, 238); this.label34.Name = "label34"; this.label34.Size = new System.Drawing.Size(20, 24); this.label34.TabIndex = 63; @@ -777,7 +738,7 @@ // // AbnormalFetus // - this.AbnormalFetus.Location = new System.Drawing.Point(740, 259); + this.AbnormalFetus.Location = new System.Drawing.Point(783, 237); this.AbnormalFetus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.AbnormalFetus.Name = "AbnormalFetus"; this.AbnormalFetus.Size = new System.Drawing.Size(65, 23); @@ -786,7 +747,7 @@ // label33 // this.label33.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label33.Location = new System.Drawing.Point(670, 260); + this.label33.Location = new System.Drawing.Point(713, 238); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(70, 24); this.label33.TabIndex = 61; @@ -795,7 +756,7 @@ // // Stillbirth // - this.Stillbirth.Location = new System.Drawing.Point(600, 259); + this.Stillbirth.Location = new System.Drawing.Point(643, 237); this.Stillbirth.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Stillbirth.Name = "Stillbirth"; this.Stillbirth.Size = new System.Drawing.Size(65, 23); @@ -804,7 +765,7 @@ // label32 // this.label32.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label32.Location = new System.Drawing.Point(540, 260); + this.label32.Location = new System.Drawing.Point(583, 238); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(60, 24); this.label32.TabIndex = 59; @@ -813,7 +774,7 @@ // // Abortion // - this.Abortion.Location = new System.Drawing.Point(340, 259); + this.Abortion.Location = new System.Drawing.Point(383, 237); this.Abortion.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Abortion.Name = "Abortion"; this.Abortion.Size = new System.Drawing.Size(65, 23); @@ -822,7 +783,7 @@ // label31 // this.label31.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label31.Location = new System.Drawing.Point(282, 260); + this.label31.Location = new System.Drawing.Point(325, 238); this.label31.Name = "label31"; this.label31.Size = new System.Drawing.Size(60, 24); this.label31.TabIndex = 57; @@ -831,7 +792,7 @@ // // ExistingChildren // - this.ExistingChildren.Location = new System.Drawing.Point(215, 259); + this.ExistingChildren.Location = new System.Drawing.Point(258, 237); this.ExistingChildren.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.ExistingChildren.Name = "ExistingChildren"; this.ExistingChildren.Size = new System.Drawing.Size(65, 23); @@ -840,7 +801,7 @@ // label30 // this.label30.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label30.Location = new System.Drawing.Point(134, 260); + this.label30.Location = new System.Drawing.Point(181, 238); this.label30.Name = "label30"; this.label30.Size = new System.Drawing.Size(82, 24); this.label30.TabIndex = 55; @@ -850,17 +811,17 @@ // label29 // this.label29.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label29.Location = new System.Drawing.Point(22, 259); + this.label29.Location = new System.Drawing.Point(23, 237); this.label29.Name = "label29"; - this.label29.Size = new System.Drawing.Size(105, 24); + this.label29.Size = new System.Drawing.Size(152, 23); this.label29.TabIndex = 54; - this.label29.Text = "七、生育史："; - this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.label29.Text = "六、生育史："; + this.label29.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // label28 // this.label28.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label28.Location = new System.Drawing.Point(845, 215); + this.label28.Location = new System.Drawing.Point(898, 191); this.label28.Name = "label28"; this.label28.Size = new System.Drawing.Size(26, 24); this.label28.TabIndex = 53; @@ -869,7 +830,7 @@ // // LastMenstrualPod // - this.LastMenstrualPod.Location = new System.Drawing.Point(684, 215); + this.LastMenstrualPod.Location = new System.Drawing.Point(732, 192); this.LastMenstrualPod.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.LastMenstrualPod.Name = "LastMenstrualPod"; this.LastMenstrualPod.Size = new System.Drawing.Size(160, 23); @@ -878,7 +839,7 @@ // label27 // this.label27.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label27.Location = new System.Drawing.Point(548, 215); + this.label27.Location = new System.Drawing.Point(584, 191); this.label27.Name = "label27"; this.label27.Size = new System.Drawing.Size(146, 24); this.label27.TabIndex = 51; @@ -888,7 +849,7 @@ // label26 // this.label26.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label26.Location = new System.Drawing.Point(498, 225); + this.label26.Location = new System.Drawing.Point(519, 204); this.label26.Name = "label26"; this.label26.Size = new System.Drawing.Size(26, 24); this.label26.TabIndex = 50; @@ -897,7 +858,7 @@ // // MenarcheCycle // - this.MenarcheCycle.Location = new System.Drawing.Point(432, 225); + this.MenarcheCycle.Location = new System.Drawing.Point(453, 205); this.MenarcheCycle.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.MenarcheCycle.Name = "MenarcheCycle"; this.MenarcheCycle.Size = new System.Drawing.Size(65, 23); @@ -906,9 +867,9 @@ // label25 // this.label25.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label25.Location = new System.Drawing.Point(382, 225); + this.label25.Location = new System.Drawing.Point(403, 204); this.label25.Name = "label25"; - this.label25.Size = new System.Drawing.Size(51, 24); + this.label25.Size = new System.Drawing.Size(51, 23); this.label25.TabIndex = 48; this.label25.Text = "周期"; this.label25.TextAlign = System.Drawing.ContentAlignment.MiddleRight; @@ -916,7 +877,7 @@ // label24 // this.label24.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label24.Location = new System.Drawing.Point(498, 195); + this.label24.Location = new System.Drawing.Point(519, 180); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(26, 24); this.label24.TabIndex = 47; @@ -925,7 +886,7 @@ // // MenarchePeriod // - this.MenarchePeriod.Location = new System.Drawing.Point(432, 195); + this.MenarchePeriod.Location = new System.Drawing.Point(453, 181); this.MenarchePeriod.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.MenarchePeriod.Name = "MenarchePeriod"; this.MenarchePeriod.Size = new System.Drawing.Size(65, 23); @@ -934,16 +895,16 @@ // label23 // this.label23.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label23.Location = new System.Drawing.Point(382, 195); + this.label23.Location = new System.Drawing.Point(403, 180); this.label23.Name = "label23"; - this.label23.Size = new System.Drawing.Size(51, 24); + this.label23.Size = new System.Drawing.Size(51, 23); this.label23.TabIndex = 45; this.label23.Text = "经期"; this.label23.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // Menarche // - this.Menarche.Location = new System.Drawing.Point(173, 215); + this.Menarche.Location = new System.Drawing.Point(230, 192); this.Menarche.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.Menarche.Name = "Menarche"; this.Menarche.Size = new System.Drawing.Size(160, 23); @@ -952,9 +913,9 @@ // label22 // this.label22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label22.Location = new System.Drawing.Point(134, 215); + this.label22.Location = new System.Drawing.Point(181, 192); this.label22.Name = "label22"; - this.label22.Size = new System.Drawing.Size(45, 24); + this.label22.Size = new System.Drawing.Size(46, 23); this.label22.TabIndex = 43; this.label22.Text = "(初潮"; this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -962,99 +923,35 @@ // label21 // this.label21.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label21.Location = new System.Drawing.Point(22, 215); + this.label21.Location = new System.Drawing.Point(23, 180); this.label21.Name = "label21"; - this.label21.Size = new System.Drawing.Size(105, 24); + this.label21.Size = new System.Drawing.Size(152, 46); this.label21.TabIndex = 42; - this.label21.Text = "六、月经史："; - this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // SpouseOctionhealth - // - this.SpouseOctionhealth.Location = new System.Drawing.Point(280, 165); - this.SpouseOctionhealth.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.SpouseOctionhealth.Name = "SpouseOctionhealth"; - this.SpouseOctionhealth.Size = new System.Drawing.Size(770, 23); - this.SpouseOctionhealth.TabIndex = 41; - // - // label20 - // - this.label20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label20.Location = new System.Drawing.Point(134, 165); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(149, 24); - this.label20.TabIndex = 40; - this.label20.Text = "配偶职业及健康状况："; - this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // SpouseRadiationHis - // - this.SpouseRadiationHis.Location = new System.Drawing.Point(573, 135); - this.SpouseRadiationHis.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.SpouseRadiationHis.Name = "SpouseRadiationHis"; - this.SpouseRadiationHis.Size = new System.Drawing.Size(478, 23); - this.SpouseRadiationHis.TabIndex = 39; - // - // label19 - // - this.label19.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label19.Location = new System.Drawing.Point(449, 135); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(117, 24); - this.label19.TabIndex = 38; - this.label19.Text = "配偶放射历史："; - this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleRight; - // - // MarriageDate - // - this.MarriageDate.Location = new System.Drawing.Point(215, 135); - this.MarriageDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.MarriageDate.Name = "MarriageDate"; - this.MarriageDate.Size = new System.Drawing.Size(160, 23); - this.MarriageDate.TabIndex = 37; - // - // label18 - // - this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label18.Location = new System.Drawing.Point(134, 135); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(82, 24); - this.label18.TabIndex = 36; - this.label18.Text = "结婚日期："; - this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // label17 - // - this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label17.Location = new System.Drawing.Point(22, 150); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(105, 24); - this.label17.TabIndex = 35; - this.label17.Text = "五、结婚史："; - this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.label21.Text = "五、月经史："; + this.label21.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // SurgicalHistory + // DrugHistory // - this.SurgicalHistory.Location = new System.Drawing.Point(134, 105); - this.SurgicalHistory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.SurgicalHistory.Name = "SurgicalHistory"; - this.SurgicalHistory.Size = new System.Drawing.Size(916, 23); - this.SurgicalHistory.TabIndex = 33; - this.SurgicalHistory.Text = "无"; + this.DrugHistory.Location = new System.Drawing.Point(181, 140); + this.DrugHistory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.DrugHistory.Name = "DrugHistory"; + this.DrugHistory.Size = new System.Drawing.Size(477, 23); + this.DrugHistory.TabIndex = 33; + this.DrugHistory.Text = "无"; // // label16 // this.label16.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label16.Location = new System.Drawing.Point(22, 105); + this.label16.Location = new System.Drawing.Point(23, 140); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(105, 24); + this.label16.Size = new System.Drawing.Size(152, 23); this.label16.TabIndex = 32; - this.label16.Text = "四、手术史："; + this.label16.Text = "四、服药史、药物过敏史："; this.label16.TextAlign = System.Drawing.ContentAlignment.MiddleRight; // // FamilyHistory // - this.FamilyHistory.Location = new System.Drawing.Point(134, 75); + this.FamilyHistory.Location = new System.Drawing.Point(181, 100); this.FamilyHistory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.FamilyHistory.Name = "FamilyHistory"; this.FamilyHistory.Size = new System.Drawing.Size(916, 23); @@ -1064,35 +961,35 @@ // label15 // this.label15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label15.Location = new System.Drawing.Point(22, 72); + this.label15.Location = new System.Drawing.Point(23, 100); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(105, 24); + this.label15.Size = new System.Drawing.Size(152, 23); this.label15.TabIndex = 29; - this.label15.Text = "三、家族史："; - this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.label15.Text = "三、家族遗传病史："; + this.label15.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // PreHisIllness // - this.PreHisIllness.Location = new System.Drawing.Point(134, 45); + this.PreHisIllness.Location = new System.Drawing.Point(181, 60); this.PreHisIllness.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.PreHisIllness.Name = "PreHisIllness"; - this.PreHisIllness.Size = new System.Drawing.Size(916, 23); + this.PreHisIllness.Size = new System.Drawing.Size(142, 23); this.PreHisIllness.TabIndex = 27; - this.PreHisIllness.Text = "自述无不适"; + this.PreHisIllness.Text = "无"; // // label14 // this.label14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label14.Location = new System.Drawing.Point(23, 45); + this.label14.Location = new System.Drawing.Point(23, 60); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(105, 24); + this.label14.Size = new System.Drawing.Size(152, 23); this.label14.TabIndex = 26; - this.label14.Text = "二、现病史："; - this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.label14.Text = "二、急慢性职业病史："; + this.label14.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // PastHistory // - this.PastHistory.Location = new System.Drawing.Point(134, 16); + this.PastHistory.Location = new System.Drawing.Point(181, 20); this.PastHistory.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.PastHistory.Name = "PastHistory"; this.PastHistory.Size = new System.Drawing.Size(916, 23); @@ -1102,12 +999,12 @@ // label13 // this.label13.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label13.Location = new System.Drawing.Point(22, 16); + this.label13.Location = new System.Drawing.Point(23, 20); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(105, 24); + this.label13.Size = new System.Drawing.Size(152, 23); this.label13.TabIndex = 1; - this.label13.Text = "一、既往史："; - this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + this.label13.Text = "一、既往病史："; + this.label13.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // // tabControl1 // @@ -1316,7 +1213,7 @@ this.panelButtom.Controls.Add(this.CancelBtn); this.panelButtom.Controls.Add(this.ConfirmBtn); this.panelButtom.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panelButtom.Location = new System.Drawing.Point(0, 706); + this.panelButtom.Location = new System.Drawing.Point(0, 678); this.panelButtom.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panelButtom.Name = "panelButtom"; this.panelButtom.Size = new System.Drawing.Size(1126, 43); @@ -1371,11 +1268,102 @@ this.superTabControl1.SelectedTabIndex = -1; this.superTabControl1.TabIndex = 0; // + // label1 + // + this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(329, 60); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(71, 23); + this.label1.TabIndex = 95; + this.label1.Text = "诊断日期："; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // PreHisIllnessDate + // + this.PreHisIllnessDate.Location = new System.Drawing.Point(403, 60); + this.PreHisIllnessDate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.PreHisIllnessDate.Name = "PreHisIllnessDate"; + this.PreHisIllnessDate.Size = new System.Drawing.Size(142, 23); + this.PreHisIllnessDate.TabIndex = 96; + // + // label17 + // + this.label17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label17.Location = new System.Drawing.Point(551, 60); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(107, 23); + this.label17.TabIndex = 97; + this.label17.Text = "诊断证明书编号："; + this.label17.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label18 + // + this.label18.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label18.Location = new System.Drawing.Point(776, 60); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(71, 23); + this.label18.TabIndex = 98; + this.label18.Text = "诊断单位："; + this.label18.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // label19 + // + this.label19.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label19.Location = new System.Drawing.Point(977, 60); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(71, 23); + this.label19.TabIndex = 99; + this.label19.Text = "是否痊愈："; + this.label19.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // PreHisIllnessNo + // + this.PreHisIllnessNo.Location = new System.Drawing.Point(650, 60); + this.PreHisIllnessNo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.PreHisIllnessNo.Name = "PreHisIllnessNo"; + this.PreHisIllnessNo.Size = new System.Drawing.Size(120, 23); + this.PreHisIllnessNo.TabIndex = 100; + // + // PreHisIllnessOrg + // + this.PreHisIllnessOrg.Location = new System.Drawing.Point(836, 60); + this.PreHisIllnessOrg.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.PreHisIllnessOrg.Name = "PreHisIllnessOrg"; + this.PreHisIllnessOrg.Size = new System.Drawing.Size(135, 23); + this.PreHisIllnessOrg.TabIndex = 101; + // + // PreHisIllnessIsHeal + // + this.PreHisIllnessIsHeal.Location = new System.Drawing.Point(1054, 60); + this.PreHisIllnessIsHeal.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.PreHisIllnessIsHeal.Name = "PreHisIllnessIsHeal"; + this.PreHisIllnessIsHeal.Size = new System.Drawing.Size(43, 23); + this.PreHisIllnessIsHeal.TabIndex = 102; + // + // label20 + // + this.label20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label20.Location = new System.Drawing.Point(666, 140); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(107, 23); + this.label20.TabIndex = 103; + this.label20.Text = "药物禁忌或其他："; + this.label20.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; + // + // DrugTaboo + // + this.DrugTaboo.Location = new System.Drawing.Point(779, 140); + this.DrugTaboo.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); + this.DrugTaboo.Name = "DrugTaboo"; + this.DrugTaboo.Size = new System.Drawing.Size(318, 23); + this.DrugTaboo.TabIndex = 104; + this.DrugTaboo.Text = "无"; + // // CareerHisInqForm // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1126, 749); + this.ClientSize = new System.Drawing.Size(1126, 721); this.Controls.Add(this.panelMain); this.Controls.Add(this.panelButtom); this.Controls.Add(this.advPropertyGrid1); @@ -1443,14 +1431,7 @@ private System.Windows.Forms.GroupBox groupBox1; private System.Windows.Forms.Label label22; private System.Windows.Forms.Label label21; - private System.Windows.Forms.TextBox SpouseOctionhealth; - private System.Windows.Forms.Label label20; - private System.Windows.Forms.TextBox SpouseRadiationHis; - private System.Windows.Forms.Label label19; - private System.Windows.Forms.TextBox MarriageDate; - private System.Windows.Forms.Label label18; - private System.Windows.Forms.Label label17; - private System.Windows.Forms.TextBox SurgicalHistory; + private System.Windows.Forms.TextBox DrugHistory; private System.Windows.Forms.Label label16; private System.Windows.Forms.TextBox FamilyHistory; private System.Windows.Forms.Label label15; @@ -1483,10 +1464,6 @@ private System.Windows.Forms.Label label35; private System.Windows.Forms.TextBox Symptom; private System.Windows.Forms.Label label44; - private System.Windows.Forms.TextBox Other; - private System.Windows.Forms.Label label43; - private System.Windows.Forms.TextBox SleepCondition; - private System.Windows.Forms.Label label42; private System.Windows.Forms.Label label41; private System.Windows.Forms.TextBox DrinkYears; private System.Windows.Forms.Label label40; @@ -1520,5 +1497,15 @@ private System.Windows.Forms.ToolStripMenuItem toolStMenuItem_Del; private DevExpress.XtraGrid.Columns.GridColumn gridColumn7; private System.Windows.Forms.Button btnSymptom; + private System.Windows.Forms.TextBox DrugTaboo; + private System.Windows.Forms.Label label20; + private System.Windows.Forms.TextBox PreHisIllnessIsHeal; + private System.Windows.Forms.TextBox PreHisIllnessOrg; + private System.Windows.Forms.TextBox PreHisIllnessNo; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.TextBox PreHisIllnessDate; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/PEIS/View/Exam/CareerHisInqForm.resx b/PEIS/View/Exam/CareerHisInqForm.resx index 7b51b30..aefac89 100644 --- a/PEIS/View/Exam/CareerHisInqForm.resx +++ b/PEIS/View/Exam/CareerHisInqForm.resx @@ -126,20 +126,23 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt - lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k - iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo - 4OWtCNeHAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHhJREFUSEvt + lEEOgCAMBPmkv9iX+T+8ampigtjUrlLCgTm2u9OEAylNhmMDlgys9fwN6Ui3nj+QYAZ25gjdYQpM9oan + 6MmYWAJrR6GJtNkvSmFz+UUhbi8XQg+EPpEm1GafsETWzoVH4MmoMEUme0IX2E74dz3pzgHsaODlqTYF + xgAAAABJRU5ErkJggg== - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPJJREFUSEtj - GAWjgCRgP/9/KJRJfWA/73+kw7z//4GWmEKFqAeAhsaCDAfiy3az/2tChakDgC5PhBp+3m7+f1WoMHUA - 0OWpUMPP2Mz7rwQVpg4AujwTavgJl4X/5aDChIHD3P8NUCZOAHR5Ltjwuf+POE3/Lw0VJgyAmtKhGnFa - AnR5IdTlB5xn/xeHChMPgBpX4bIE6PJSqNwe54X/haHCpAO4JfP/10OFQC6vBIvN+78DKC4AFSYfwC0B - +gTo8looe4vDqv88UCWUA7glELzBsu8/J1SKegBsyfz/a4xn/meFCtEANPxngrJGwShABwwMAJBYlx6C - WXdWAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPhJREFUSEvt + jyFLg1EUhodgEBYEg0EwDBbMsiCMnYvbX1hYMBhEDAsGg2Fsv2BVZOwcVseCYcFgWDAYBIM/6BHn3Yce + +FB3F78HLlzOc+/73lsqFRT8BzHafrYxROkEBTFq3iUjxtlneFDeGyOOvE9ClPMY/tYwqt4nIcZFDH+t + KxXvkxDlKoa/tCYcep9LGDPwM48Y3WX4mOfTOw68zyUol/Fiboko1/Hli+aIfe9/JSjTvBIxbqJ7ak7Y + 8/7PZCVGfzUT5Ta+/DEYuz9vrMH3n4jRi/t5mFL2Z9cmK/laDydDdvyZZJYlxuz4nm3vNseALT8qKMj4 + AJBYlx7zXbLXAAAAAElFTkSuQmCC + + 17, 17 + \ No newline at end of file diff --git a/PEIS/View/Exam/CareerHisInqStmForm.Designer.cs b/PEIS/View/Exam/CareerHisInqStmForm.Designer.cs index e867863..590303f 100644 --- a/PEIS/View/Exam/CareerHisInqStmForm.Designer.cs +++ b/PEIS/View/Exam/CareerHisInqStmForm.Designer.cs @@ -63,7 +63,7 @@ namespace PEIS.View.Exam this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemCheckEdit1, this.repositoryItemCheckedComboBoxEdit1}); - this.gridControl1.Size = new System.Drawing.Size(558, 390); + this.gridControl1.Size = new System.Drawing.Size(558, 368); this.gridControl1.TabIndex = 0; this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.gridView1}); @@ -134,19 +134,20 @@ namespace PEIS.View.Exam // panel2 // this.panel2.BackColor = System.Drawing.Color.White; + this.panel2.Controls.Add(this.label2); this.panel2.Controls.Add(this.CancelBtn); this.panel2.Controls.Add(this.ConfirmBtn); this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.panel2.Location = new System.Drawing.Point(0, 425); + this.panel2.Location = new System.Drawing.Point(0, 403); this.panel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(558, 38); + this.panel2.Size = new System.Drawing.Size(558, 60); this.panel2.TabIndex = 11; // // CancelBtn // this.CancelBtn.Image = ((System.Drawing.Image)(resources.GetObject("CancelBtn.Image"))); - this.CancelBtn.Location = new System.Drawing.Point(332, 0); + this.CancelBtn.Location = new System.Drawing.Point(329, 24); this.CancelBtn.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6); this.CancelBtn.Name = "CancelBtn"; this.CancelBtn.Size = new System.Drawing.Size(106, 36); @@ -159,7 +160,7 @@ namespace PEIS.View.Exam // ConfirmBtn // this.ConfirmBtn.Image = ((System.Drawing.Image)(resources.GetObject("ConfirmBtn.Image"))); - this.ConfirmBtn.Location = new System.Drawing.Point(123, 0); + this.ConfirmBtn.Location = new System.Drawing.Point(123, 24); this.ConfirmBtn.Margin = new System.Windows.Forms.Padding(2, 6, 2, 6); this.ConfirmBtn.Name = "ConfirmBtn"; this.ConfirmBtn.Size = new System.Drawing.Size(105, 36); @@ -197,8 +198,8 @@ namespace PEIS.View.Exam // // label2 // - this.label2.Dock = System.Windows.Forms.DockStyle.Bottom; - this.label2.Location = new System.Drawing.Point(0, 403); + this.label2.Dock = System.Windows.Forms.DockStyle.Top; + this.label2.Location = new System.Drawing.Point(0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(558, 22); this.label2.TabIndex = 14; @@ -211,7 +212,6 @@ namespace PEIS.View.Exam this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.White; this.ClientSize = new System.Drawing.Size(558, 463); - this.Controls.Add(this.label2); this.Controls.Add(this.gridControl1); this.Controls.Add(this.panel1); this.Controls.Add(this.panel2); diff --git a/PEIS/View/Exam/CareerHisInqStmForm.resx b/PEIS/View/Exam/CareerHisInqStmForm.resx index 2fa380b..4ba2108 100644 --- a/PEIS/View/Exam/CareerHisInqStmForm.resx +++ b/PEIS/View/Exam/CareerHisInqStmForm.resx @@ -120,20 +120,20 @@ - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAH1JREFUSEvt - lEEKgDAMBPNJf5GX+T+9aiM5REhDVlPx0AGhbXan4KE0+R8787Ixr7pNIx3p6raPBNt3IJfAHaSAZG9k - iplMSCSIZhCeyDt7hRXatY5rMOJ6uTD0AiOv/0We0Dt7RCSKZikygkzGBSki2Qu40IA6w5/ryccQnexo - 4OWtCNeHAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAHhJREFUSEvt + lEEOgCAMBPmkv9iX+T+8ampigtjUrlLCgTm2u9OEAylNhmMDlgys9fwN6Ui3nj+QYAZ25gjdYQpM9oan + 6MmYWAJrR6GJtNkvSmFz+UUhbi8XQg+EPpEm1GafsETWzoVH4MmoMEUme0IX2E74dz3pzgHsaODlqTYF + xgAAAABJRU5ErkJggg== - iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPJJREFUSEtj - GAWjgCRgP/9/KJRJfWA/73+kw7z//4GWmEKFqAeAhsaCDAfiy3az/2tChakDgC5PhBp+3m7+f1WoMHUA - 0OWpUMPP2Mz7rwQVpg4AujwTavgJl4X/5aDChIHD3P8NUCZOAHR5Ltjwuf+POE3/Lw0VJgyAmtKhGnFa - AnR5IdTlB5xn/xeHChMPgBpX4bIE6PJSqNwe54X/haHCpAO4JfP/10OFQC6vBIvN+78DKC4AFSYfwC0B - +gTo8looe4vDqv88UCWUA7glELzBsu8/J1SKegBsyfz/a4xn/meFCtEANPxngrJGwShABwwMAJBYlx6C - WXdWAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABGdBTUEAALGPC/xhBQAAAPhJREFUSEvt + jyFLg1EUhodgEBYEg0EwDBbMsiCMnYvbX1hYMBhEDAsGg2Fsv2BVZOwcVseCYcFgWDAYBIM/6BHn3Yce + +FB3F78HLlzOc+/73lsqFRT8BzHafrYxROkEBTFq3iUjxtlneFDeGyOOvE9ClPMY/tYwqt4nIcZFDH+t + KxXvkxDlKoa/tCYcep9LGDPwM48Y3WX4mOfTOw68zyUol/Fiboko1/Hli+aIfe9/JSjTvBIxbqJ7ak7Y + 8/7PZCVGfzUT5Ta+/DEYuz9vrMH3n4jRi/t5mFL2Z9cmK/laDydDdvyZZJYlxuz4nm3vNseALT8qKMj4 + AJBYlx7zXbLXAAAAAElFTkSuQmCC \ No newline at end of file diff --git a/PEIS/View/Exam/ITotalView.cs b/PEIS/View/Exam/ITotalView.cs index 4e63055..5a5d7fa 100644 --- a/PEIS/View/Exam/ITotalView.cs +++ b/PEIS/View/Exam/ITotalView.cs @@ -12,7 +12,7 @@ namespace PEIS.View.Exam /// 1.获取当前科室签到时间范围内的体检者列表 /// event EventHandler> GetPatientList; - + event EventHandler> GetPatient; @@ -32,7 +32,7 @@ namespace PEIS.View.Exam /// event EventHandler> GetSummary; - void ShowSummary(List items); + void ShowSummary(List items); /// /// 4. 获取结论词 @@ -60,11 +60,22 @@ namespace PEIS.View.Exam /// /// 修改是否允许微信查看报告 /// - event EventHandler> WeChatViewRpt; - + event EventHandler> WeChatViewRpt; + event EventHandler> GetReportExtList; void ShowReportExtList(List items); + + + + /// + /// 8.职业体检结论 + /// + event EventHandler> GetExamCareerConclusion; + + event EventHandler> SaveExamCareerConclusion; + + void ShowExamCareerConclusion(List items); } } \ No newline at end of file diff --git a/PEIS/View/Exam/TotalForm.Designer.cs b/PEIS/View/Exam/TotalForm.Designer.cs index fb75f8c..d72bc21 100644 --- a/PEIS/View/Exam/TotalForm.Designer.cs +++ b/PEIS/View/Exam/TotalForm.Designer.cs @@ -106,6 +106,12 @@ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn(); this.repositoryItemRichTextEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemRichTextEdit(); this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView(); + this.panelOccupational = new System.Windows.Forms.Panel(); + this.OccupationalConclusion_5 = new System.Windows.Forms.RadioButton(); + this.OccupationalConclusion_4 = new System.Windows.Forms.RadioButton(); + 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.panelAllConclusion = new System.Windows.Forms.Panel(); this.DgcAllConclusion = new DevExpress.XtraGrid.GridControl(); this.DgvAllConclusion = new DevExpress.XtraGrid.Views.Grid.GridView(); @@ -277,6 +283,7 @@ ((System.ComponentModel.ISupportInitialize)(this.DgvSearchConclusion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemRichTextEdit2)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit(); + this.panelOccupational.SuspendLayout(); this.panelAllConclusion.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.DgcAllConclusion)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvAllConclusion)).BeginInit(); @@ -352,7 +359,7 @@ // splitContainerBase.Panel2 // this.splitContainerBase.Panel2.Controls.Add(this.panelRightBase); - this.splitContainerBase.Size = new System.Drawing.Size(1099, 687); + this.splitContainerBase.Size = new System.Drawing.Size(1772, 687); this.splitContainerBase.SplitterDistance = 235; this.splitContainerBase.TabIndex = 0; // @@ -846,7 +853,7 @@ this.panelRightBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelRightBase.Location = new System.Drawing.Point(0, 0); this.panelRightBase.Name = "panelRightBase"; - this.panelRightBase.Size = new System.Drawing.Size(860, 687); + this.panelRightBase.Size = new System.Drawing.Size(1533, 687); this.panelRightBase.TabIndex = 2; // // panelExamInfoBase @@ -856,7 +863,7 @@ this.panelExamInfoBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExamInfoBase.Location = new System.Drawing.Point(0, 181); this.panelExamInfoBase.Name = "panelExamInfoBase"; - this.panelExamInfoBase.Size = new System.Drawing.Size(860, 506); + this.panelExamInfoBase.Size = new System.Drawing.Size(1533, 506); this.panelExamInfoBase.TabIndex = 60; // // splitContainerExamInfo @@ -875,7 +882,7 @@ // splitContainerExamInfo.Panel2 // this.splitContainerExamInfo.Panel2.Controls.Add(this.panelExamInfoL); - this.splitContainerExamInfo.Size = new System.Drawing.Size(860, 506); + this.splitContainerExamInfo.Size = new System.Drawing.Size(1533, 506); this.splitContainerExamInfo.SplitterDistance = 740; this.splitContainerExamInfo.TabIndex = 0; // @@ -1100,7 +1107,7 @@ this.panelExamInfoL.Dock = System.Windows.Forms.DockStyle.Fill; this.panelExamInfoL.Location = new System.Drawing.Point(0, 0); this.panelExamInfoL.Name = "panelExamInfoL"; - this.panelExamInfoL.Size = new System.Drawing.Size(116, 506); + this.panelExamInfoL.Size = new System.Drawing.Size(789, 506); this.panelExamInfoL.TabIndex = 2; // // TabPart @@ -1128,7 +1135,7 @@ this.TabPart.Name = "TabPart"; this.TabPart.SelectedTabPage = this.tabPageConslusion; this.TabPart.ShowTabHeader = DevExpress.Utils.DefaultBoolean.True; - this.TabPart.Size = new System.Drawing.Size(116, 506); + this.TabPart.Size = new System.Drawing.Size(789, 506); this.TabPart.TabIndex = 0; this.TabPart.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabPageConslusion, @@ -1148,17 +1155,18 @@ this.tabPageConslusion.Image = global::PEIS.Properties.Resources.menu; this.tabPageConslusion.Margin = new System.Windows.Forms.Padding(2); this.tabPageConslusion.Name = "tabPageConslusion"; - this.tabPageConslusion.Size = new System.Drawing.Size(110, 467); + this.tabPageConslusion.Size = new System.Drawing.Size(783, 467); this.tabPageConslusion.Text = "结论词"; // // panelConclussion // this.panelConclussion.BackColor = System.Drawing.Color.White; this.panelConclussion.Controls.Add(this.DgcExamConclusion); + this.panelConclussion.Controls.Add(this.panelOccupational); this.panelConclussion.Dock = System.Windows.Forms.DockStyle.Fill; this.panelConclussion.Location = new System.Drawing.Point(0, 40); this.panelConclussion.Name = "panelConclussion"; - this.panelConclussion.Size = new System.Drawing.Size(0, 427); + this.panelConclussion.Size = new System.Drawing.Size(442, 427); this.panelConclussion.TabIndex = 3; // // DgcExamConclusion @@ -1173,7 +1181,7 @@ this.repositoryItemMemoEdit2, this.CmbSearchConclusion, this.repositoryItemCheckEdit1}); - this.DgcExamConclusion.Size = new System.Drawing.Size(0, 427); + this.DgcExamConclusion.Size = new System.Drawing.Size(442, 391); this.DgcExamConclusion.TabIndex = 5; this.DgcExamConclusion.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamConclusion, @@ -1336,13 +1344,93 @@ this.gridView2.GridControl = this.DgcExamConclusion; this.gridView2.Name = "gridView2"; // + // panelOccupational + // + this.panelOccupational.Controls.Add(this.OccupationalConclusion_5); + this.panelOccupational.Controls.Add(this.OccupationalConclusion_4); + this.panelOccupational.Controls.Add(this.OccupationalConclusion_3); + this.panelOccupational.Controls.Add(this.OccupationalConclusion_2); + this.panelOccupational.Controls.Add(this.OccupationalConclusion_1); + this.panelOccupational.Dock = System.Windows.Forms.DockStyle.Bottom; + this.panelOccupational.Location = new System.Drawing.Point(0, 391); + this.panelOccupational.Name = "panelOccupational"; + this.panelOccupational.Size = new System.Drawing.Size(442, 36); + this.panelOccupational.TabIndex = 6; + this.panelOccupational.Visible = false; + // + // OccupationalConclusion_5 + // + this.OccupationalConclusion_5.AutoSize = true; + this.OccupationalConclusion_5.Dock = System.Windows.Forms.DockStyle.Left; + this.OccupationalConclusion_5.Location = new System.Drawing.Point(356, 0); + this.OccupationalConclusion_5.Name = "OccupationalConclusion_5"; + this.OccupationalConclusion_5.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.OccupationalConclusion_5.Size = new System.Drawing.Size(119, 36); + this.OccupationalConclusion_5.TabIndex = 4; + this.OccupationalConclusion_5.TabStop = true; + this.OccupationalConclusion_5.Text = "其他疾病或异常"; + this.OccupationalConclusion_5.UseVisualStyleBackColor = true; + // + // OccupationalConclusion_4 + // + this.OccupationalConclusion_4.AutoSize = true; + this.OccupationalConclusion_4.Dock = System.Windows.Forms.DockStyle.Left; + this.OccupationalConclusion_4.Location = new System.Drawing.Point(261, 0); + this.OccupationalConclusion_4.Name = "OccupationalConclusion_4"; + this.OccupationalConclusion_4.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.OccupationalConclusion_4.Size = new System.Drawing.Size(95, 36); + this.OccupationalConclusion_4.TabIndex = 3; + this.OccupationalConclusion_4.TabStop = true; + this.OccupationalConclusion_4.Text = "职业禁忌症"; + this.OccupationalConclusion_4.UseVisualStyleBackColor = true; + // + // OccupationalConclusion_3 + // + this.OccupationalConclusion_3.AutoSize = true; + this.OccupationalConclusion_3.Dock = System.Windows.Forms.DockStyle.Left; + this.OccupationalConclusion_3.Location = new System.Drawing.Point(166, 0); + this.OccupationalConclusion_3.Name = "OccupationalConclusion_3"; + this.OccupationalConclusion_3.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.OccupationalConclusion_3.Size = new System.Drawing.Size(95, 36); + this.OccupationalConclusion_3.TabIndex = 2; + this.OccupationalConclusion_3.TabStop = true; + this.OccupationalConclusion_3.Text = "疑似职业病"; + this.OccupationalConclusion_3.UseVisualStyleBackColor = true; + // + // OccupationalConclusion_2 + // + this.OccupationalConclusion_2.AutoSize = true; + this.OccupationalConclusion_2.Dock = System.Windows.Forms.DockStyle.Left; + this.OccupationalConclusion_2.Location = new System.Drawing.Point(107, 0); + this.OccupationalConclusion_2.Name = "OccupationalConclusion_2"; + this.OccupationalConclusion_2.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.OccupationalConclusion_2.Size = new System.Drawing.Size(59, 36); + this.OccupationalConclusion_2.TabIndex = 1; + this.OccupationalConclusion_2.TabStop = true; + this.OccupationalConclusion_2.Text = "复查"; + this.OccupationalConclusion_2.UseVisualStyleBackColor = true; + // + // OccupationalConclusion_1 + // + this.OccupationalConclusion_1.AutoSize = true; + this.OccupationalConclusion_1.Checked = true; + this.OccupationalConclusion_1.Dock = System.Windows.Forms.DockStyle.Left; + this.OccupationalConclusion_1.Location = new System.Drawing.Point(0, 0); + this.OccupationalConclusion_1.Name = "OccupationalConclusion_1"; + this.OccupationalConclusion_1.Padding = new System.Windows.Forms.Padding(10, 0, 0, 0); + this.OccupationalConclusion_1.Size = new System.Drawing.Size(107, 36); + this.OccupationalConclusion_1.TabIndex = 0; + this.OccupationalConclusion_1.TabStop = true; + this.OccupationalConclusion_1.Text = "目前未见异常"; + this.OccupationalConclusion_1.UseVisualStyleBackColor = true; + // // panelAllConclusion // this.panelAllConclusion.AutoScroll = true; this.panelAllConclusion.Controls.Add(this.DgcAllConclusion); this.panelAllConclusion.Controls.Add(this.panel2); this.panelAllConclusion.Dock = System.Windows.Forms.DockStyle.Right; - this.panelAllConclusion.Location = new System.Drawing.Point(-231, 40); + this.panelAllConclusion.Location = new System.Drawing.Point(442, 40); this.panelAllConclusion.Name = "panelAllConclusion"; this.panelAllConclusion.Size = new System.Drawing.Size(341, 427); this.panelAllConclusion.TabIndex = 2; @@ -1464,7 +1552,7 @@ this.panelConclussionMenu.Dock = System.Windows.Forms.DockStyle.Top; this.panelConclussionMenu.Location = new System.Drawing.Point(0, 0); this.panelConclussionMenu.Name = "panelConclussionMenu"; - this.panelConclussionMenu.Size = new System.Drawing.Size(110, 40); + this.panelConclussionMenu.Size = new System.Drawing.Size(783, 40); this.panelConclussionMenu.TabIndex = 0; // // OpsConclusion @@ -1473,7 +1561,7 @@ this.OpsConclusion.Location = new System.Drawing.Point(0, 0); this.OpsConclusion.Margin = new System.Windows.Forms.Padding(3, 7, 3, 7); this.OpsConclusion.Name = "OpsConclusion"; - this.OpsConclusion.Size = new System.Drawing.Size(110, 40); + this.OpsConclusion.Size = new System.Drawing.Size(783, 40); this.OpsConclusion.TabIndex = 5; // // tabPageExam @@ -1496,7 +1584,7 @@ this.tabPageExam.Image = global::PEIS.Properties.Resources.menu; this.tabPageExam.Margin = new System.Windows.Forms.Padding(2); this.tabPageExam.Name = "tabPageExam"; - this.tabPageExam.Size = new System.Drawing.Size(110, 467); + this.tabPageExam.Size = new System.Drawing.Size(783, 467); this.tabPageExam.Text = "一般项目"; // // DgcExamResult @@ -1507,7 +1595,7 @@ this.DgcExamResult.Name = "DgcExamResult"; this.DgcExamResult.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { this.repositoryItemMemoEdit3}); - this.DgcExamResult.Size = new System.Drawing.Size(110, 467); + this.DgcExamResult.Size = new System.Drawing.Size(783, 467); this.DgcExamResult.TabIndex = 140; this.DgcExamResult.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvExamResult}); @@ -1695,7 +1783,7 @@ this.tabPageSummary.Image = global::PEIS.Properties.Resources.menu; this.tabPageSummary.Margin = new System.Windows.Forms.Padding(2); this.tabPageSummary.Name = "tabPageSummary"; - this.tabPageSummary.Size = new System.Drawing.Size(110, 467); + this.tabPageSummary.Size = new System.Drawing.Size(783, 467); this.tabPageSummary.Text = "科室小结"; // // panelDeptSummary @@ -1705,7 +1793,7 @@ this.panelDeptSummary.Dock = System.Windows.Forms.DockStyle.Fill; this.panelDeptSummary.Location = new System.Drawing.Point(0, 0); this.panelDeptSummary.Name = "panelDeptSummary"; - this.panelDeptSummary.Size = new System.Drawing.Size(110, 467); + this.panelDeptSummary.Size = new System.Drawing.Size(783, 467); this.panelDeptSummary.TabIndex = 61; // // DgcSummary @@ -1718,7 +1806,7 @@ this.repositoryItemRichTextEdit1, this.repositoryItemTextEdit1, this.repositoryItemMemoEdit1}); - this.DgcSummary.Size = new System.Drawing.Size(110, 467); + this.DgcSummary.Size = new System.Drawing.Size(783, 467); this.DgcSummary.TabIndex = 0; this.DgcSummary.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvSummary}); @@ -1782,7 +1870,7 @@ this.tabPageLis.Image = global::PEIS.Properties.Resources.menu; this.tabPageLis.Margin = new System.Windows.Forms.Padding(2); this.tabPageLis.Name = "tabPageLis"; - this.tabPageLis.Size = new System.Drawing.Size(110, 467); + this.tabPageLis.Size = new System.Drawing.Size(783, 467); this.tabPageLis.Text = "检验报告"; // // DgcLisReport @@ -1791,7 +1879,7 @@ this.DgcLisReport.Location = new System.Drawing.Point(0, 0); this.DgcLisReport.MainView = this.DgvLisReport; this.DgcLisReport.Name = "DgcLisReport"; - this.DgcLisReport.Size = new System.Drawing.Size(110, 467); + this.DgcLisReport.Size = new System.Drawing.Size(783, 467); this.DgcLisReport.TabIndex = 1; this.DgcLisReport.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { this.DgvLisReport}); @@ -1902,7 +1990,7 @@ this.tabPagePacs.Image = global::PEIS.Properties.Resources.menu; this.tabPagePacs.Margin = new System.Windows.Forms.Padding(2); this.tabPagePacs.Name = "tabPagePacs"; - this.tabPagePacs.Size = new System.Drawing.Size(110, 467); + this.tabPagePacs.Size = new System.Drawing.Size(783, 467); this.tabPagePacs.Text = "检查报告"; // // panelPacsBase @@ -1912,7 +2000,7 @@ this.panelPacsBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsBase.Location = new System.Drawing.Point(0, 0); this.panelPacsBase.Name = "panelPacsBase"; - this.panelPacsBase.Size = new System.Drawing.Size(110, 467); + this.panelPacsBase.Size = new System.Drawing.Size(783, 467); this.panelPacsBase.TabIndex = 1; // // xtraTabControl1 @@ -1923,7 +2011,7 @@ this.xtraTabControl1.Location = new System.Drawing.Point(260, 0); this.xtraTabControl1.Name = "xtraTabControl1"; this.xtraTabControl1.SelectedTabPage = this.tabPacsRpt; - this.xtraTabControl1.Size = new System.Drawing.Size(0, 467); + this.xtraTabControl1.Size = new System.Drawing.Size(523, 467); this.xtraTabControl1.TabIndex = 1; this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { this.tabPacsRpt, @@ -1933,7 +2021,7 @@ // this.tabPacsRpt.Controls.Add(this.panelPacsRpt); this.tabPacsRpt.Name = "tabPacsRpt"; - this.tabPacsRpt.Size = new System.Drawing.Size(0, 461); + this.tabPacsRpt.Size = new System.Drawing.Size(479, 461); this.tabPacsRpt.Text = "报告"; // // panelPacsRpt @@ -1944,7 +2032,7 @@ this.panelPacsRpt.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsRpt.Location = new System.Drawing.Point(0, 0); this.panelPacsRpt.Name = "panelPacsRpt"; - this.panelPacsRpt.Size = new System.Drawing.Size(0, 461); + this.panelPacsRpt.Size = new System.Drawing.Size(479, 461); this.panelPacsRpt.TabIndex = 3; // // pictureBoxPacsRpt @@ -1962,7 +2050,7 @@ // this.tabPacsImg.Controls.Add(this.panel12); this.tabPacsImg.Name = "tabPacsImg"; - this.tabPacsImg.Size = new System.Drawing.Size(0, 461); + this.tabPacsImg.Size = new System.Drawing.Size(479, 461); this.tabPacsImg.Text = "图片"; // // panel12 @@ -1971,7 +2059,7 @@ this.panel12.Dock = System.Windows.Forms.DockStyle.Fill; this.panel12.Location = new System.Drawing.Point(0, 0); this.panel12.Name = "panel12"; - this.panel12.Size = new System.Drawing.Size(0, 461); + this.panel12.Size = new System.Drawing.Size(479, 461); this.panel12.TabIndex = 3; // // panel13 @@ -1981,7 +2069,7 @@ this.panel13.Dock = System.Windows.Forms.DockStyle.Fill; this.panel13.Location = new System.Drawing.Point(0, 0); this.panel13.Name = "panel13"; - this.panel13.Size = new System.Drawing.Size(0, 461); + this.panel13.Size = new System.Drawing.Size(479, 461); this.panel13.TabIndex = 6; // // panel15 @@ -1990,7 +2078,7 @@ this.panel15.Dock = System.Windows.Forms.DockStyle.Fill; this.panel15.Location = new System.Drawing.Point(0, 0); this.panel15.Name = "panel15"; - this.panel15.Size = new System.Drawing.Size(0, 461); + this.panel15.Size = new System.Drawing.Size(479, 461); this.panel15.TabIndex = 4; // // panelPacsImg @@ -2000,7 +2088,7 @@ this.panelPacsImg.Dock = System.Windows.Forms.DockStyle.Fill; this.panelPacsImg.Location = new System.Drawing.Point(0, 0); this.panelPacsImg.Name = "panelPacsImg"; - this.panelPacsImg.Size = new System.Drawing.Size(0, 461); + this.panelPacsImg.Size = new System.Drawing.Size(479, 461); this.panelPacsImg.TabIndex = 5; // // flowLayoutPanelPacsImg @@ -2010,7 +2098,7 @@ this.flowLayoutPanelPacsImg.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanelPacsImg.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanelPacsImg.Name = "flowLayoutPanelPacsImg"; - this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(0, 461); + this.flowLayoutPanelPacsImg.Size = new System.Drawing.Size(479, 461); this.flowLayoutPanelPacsImg.TabIndex = 0; // // panelPacsRptList @@ -2095,7 +2183,7 @@ this.tabPageReport.Image = global::PEIS.Properties.Resources.menu; this.tabPageReport.Margin = new System.Windows.Forms.Padding(2); this.tabPageReport.Name = "tabPageReport"; - this.tabPageReport.Size = new System.Drawing.Size(110, 467); + this.tabPageReport.Size = new System.Drawing.Size(783, 467); this.tabPageReport.Text = "其他报告"; // // panelReportBase @@ -2105,7 +2193,7 @@ this.panelReportBase.Dock = System.Windows.Forms.DockStyle.Fill; this.panelReportBase.Location = new System.Drawing.Point(0, 0); this.panelReportBase.Name = "panelReportBase"; - this.panelReportBase.Size = new System.Drawing.Size(110, 467); + this.panelReportBase.Size = new System.Drawing.Size(783, 467); this.panelReportBase.TabIndex = 0; // // panelReport @@ -2116,7 +2204,7 @@ this.panelReport.Dock = System.Windows.Forms.DockStyle.Fill; this.panelReport.Location = new System.Drawing.Point(260, 0); this.panelReport.Name = "panelReport"; - this.panelReport.Size = new System.Drawing.Size(0, 467); + this.panelReport.Size = new System.Drawing.Size(523, 467); this.panelReport.TabIndex = 2; // // PictureBoxReportExt @@ -2191,7 +2279,7 @@ // this.tabPageHistory.Margin = new System.Windows.Forms.Padding(2); this.tabPageHistory.Name = "tabPageHistory"; - this.tabPageHistory.Size = new System.Drawing.Size(110, 467); + this.tabPageHistory.Size = new System.Drawing.Size(783, 467); this.tabPageHistory.Text = "历史结果"; // // tabPageResult @@ -2199,7 +2287,7 @@ this.tabPageResult.Controls.Add(this.panel6); this.tabPageResult.Name = "tabPageResult"; this.tabPageResult.PageVisible = false; - this.tabPageResult.Size = new System.Drawing.Size(110, 467); + this.tabPageResult.Size = new System.Drawing.Size(783, 467); this.tabPageResult.Text = "本次体检结果"; // // panel6 @@ -2207,7 +2295,7 @@ this.panel6.Dock = System.Windows.Forms.DockStyle.Fill; this.panel6.Location = new System.Drawing.Point(0, 0); this.panel6.Name = "panel6"; - this.panel6.Size = new System.Drawing.Size(110, 467); + this.panel6.Size = new System.Drawing.Size(783, 467); this.panel6.TabIndex = 0; // // panelPatientInfo @@ -2219,7 +2307,7 @@ this.panelPatientInfo.Margin = new System.Windows.Forms.Padding(0); this.panelPatientInfo.Name = "panelPatientInfo"; this.panelPatientInfo.Padding = new System.Windows.Forms.Padding(1); - this.panelPatientInfo.Size = new System.Drawing.Size(860, 136); + this.panelPatientInfo.Size = new System.Drawing.Size(1533, 136); this.panelPatientInfo.TabIndex = 59; // // panel3 @@ -2230,7 +2318,7 @@ this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(1, 1); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(858, 134); + this.panel3.Size = new System.Drawing.Size(1531, 134); this.panel3.TabIndex = 1; // // tableLayoutPanel1 @@ -2290,7 +2378,7 @@ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(733, 134); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1406, 134); this.tableLayoutPanel1.TabIndex = 69; // // label3 @@ -2738,7 +2826,7 @@ this.lblCardNo.Dock = System.Windows.Forms.DockStyle.Fill; this.lblCardNo.Location = new System.Drawing.Point(940, 5); this.lblCardNo.Name = "lblCardNo"; - this.lblCardNo.Size = new System.Drawing.Size(1, 31); + this.lblCardNo.Size = new System.Drawing.Size(458, 31); this.lblCardNo.TabIndex = 67; this.lblCardNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // @@ -2786,7 +2874,7 @@ this.panelMenu.Dock = System.Windows.Forms.DockStyle.Top; this.panelMenu.Location = new System.Drawing.Point(0, 0); this.panelMenu.Name = "panelMenu"; - this.panelMenu.Size = new System.Drawing.Size(860, 45); + this.panelMenu.Size = new System.Drawing.Size(1533, 45); this.panelMenu.TabIndex = 58; // // menuStrip @@ -2809,7 +2897,7 @@ this.menuStrip.Name = "menuStrip"; this.menuStrip.Padding = new System.Windows.Forms.Padding(2, 0, 5, 0); this.menuStrip.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.menuStrip.Size = new System.Drawing.Size(860, 45); + this.menuStrip.Size = new System.Drawing.Size(1533, 45); this.menuStrip.TabIndex = 58; this.menuStrip.Text = "menuStrip2"; // @@ -2904,7 +2992,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1099, 687); + this.ClientSize = new System.Drawing.Size(1772, 687); this.Controls.Add(this.splitContainerBase); this.Margin = new System.Windows.Forms.Padding(2, 3, 2, 3); this.Name = "TotalForm"; @@ -2952,6 +3040,8 @@ ((System.ComponentModel.ISupportInitialize)(this.DgvSearchConclusion)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.repositoryItemRichTextEdit2)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit(); + this.panelOccupational.ResumeLayout(false); + this.panelOccupational.PerformLayout(); this.panelAllConclusion.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.DgcAllConclusion)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.DgvAllConclusion)).EndInit(); @@ -3228,5 +3318,11 @@ private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1; private DevExpress.XtraTab.XtraTabPage tabPageResult; private System.Windows.Forms.Panel panel6; + private System.Windows.Forms.Panel panelOccupational; + private System.Windows.Forms.RadioButton OccupationalConclusion_1; + private System.Windows.Forms.RadioButton OccupationalConclusion_5; + private System.Windows.Forms.RadioButton OccupationalConclusion_4; + private System.Windows.Forms.RadioButton OccupationalConclusion_3; + private System.Windows.Forms.RadioButton OccupationalConclusion_2; } } \ No newline at end of file diff --git a/PEIS/View/Exam/TotalForm.cs b/PEIS/View/Exam/TotalForm.cs index 4a4a57a..ec46e5e 100644 --- a/PEIS/View/Exam/TotalForm.cs +++ b/PEIS/View/Exam/TotalForm.cs @@ -89,7 +89,7 @@ namespace PEIS.View.Exam RbStatus2.Click += RadioButton_Click; // 输入体检号回车 //txtId.KeyDown += TxtId_KeyDown; - OpsConclusion.TsmiAdd.Text = "下移"; + OpsConclusion.TsmiAdd.Text = "下移"; OpsConclusion.TsmiAdd.Image = Properties.Resources.xia; OpsConclusion.TsmiAllDelete.Visible = true; OpsConclusion.TsmiUp.Visible = true; @@ -290,7 +290,7 @@ namespace PEIS.View.Exam Invoke(new Action(() => DgcExamConclusion.DataSource = null)); Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion)); Invoke(new Action(() => DgcExamConclusion.DataSource = _examConclusion)); - Invoke(new Action(() => DgvExamConclusion.FocusedRowHandle = current+i)); + Invoke(new Action(() => DgvExamConclusion.FocusedRowHandle = current + i)); Invoke(new Action(() => DgvExamConclusion.SelectRow(current + i))); } @@ -598,6 +598,10 @@ namespace PEIS.View.Exam public event EventHandler> SaveExamConclusion; + public event EventHandler> GetExamCareerConclusion; + + public event EventHandler> SaveExamCareerConclusion; + public void ShowExamConclusion(List items) { items = items.OrderBy(o => o.Seq).ToList(); @@ -614,6 +618,22 @@ namespace PEIS.View.Exam //DgvExamConclusion.BestFitColumns(); // 调整列宽以适应内容 } + public void ShowExamCareerConclusion(List items) + { + if (items != null && items.Any()) + { + var item = items.First(); + foreach (var item2 in panelOccupational.Controls) + { + var radioButton = item2 as RadioButton; + if (radioButton.Name.EndsWith(item.OccupationalConclusion.ToString())) + Invoke(new Action(() => radioButton.Checked = true)); + else + Invoke(new Action(() => radioButton.Checked = false)); + } + } + } + /// /// 11.获取科室分检结果列表 /// @@ -699,7 +719,17 @@ namespace PEIS.View.Exam Invoke(new Action(() => GetExamResultData(_patient.ID))); GetExamConclusion?.Invoke(this, new Args(_patient.ID)); - TsmiOccupational.Visible = selected.Type != null && selected.Type.Contains("职业"); + if (selected.Type != null && selected.Type.Contains("职业")) + { + TsmiOccupational.Visible = panelOccupational.Visible = true; + GetExamCareerConclusion?.Invoke(this, new Args(_patient.ID)); + } + else + { + TsmiOccupational.Visible = panelOccupational.Visible = false; + } + + //调用 SelectedPatientEvent?.Invoke(selected?.ID); @@ -836,9 +866,9 @@ namespace PEIS.View.Exam if (DgvExamConclusion.GetSelectedRows().Length == 0) return; var item = DgvExamConclusion.GetRow(DgvExamConclusion.FocusedRowHandle) as ExamConclusion; - if (item==null)return; + if (item == null) return; if (!Global.MsgDelete()) return; - + _examConclusion.Remove(item); ShowExamConclusion(_examConclusion); @@ -880,6 +910,23 @@ namespace PEIS.View.Exam return; } + if (_patient.Type.Contains("职业")) + { + foreach (RadioButton rb in panelOccupational.Controls) + { + if (rb.Checked) + { + string radioButValue = rb.Name.Split('_')[1]; + SaveExamCareerConclusion?.Invoke(this, new Args() + { + ID = _patient.ID, + OccupationalConclusion = int.Parse(rb.Name.Split('_')[1]), + }); + break; + } + } + } + SaveExamConclusion?.Invoke(this, new Args() { ID = _patient.ID, diff --git a/PEIS/View/Exam/TotalForm.resx b/PEIS/View/Exam/TotalForm.resx index 132dff9..aec5c01 100644 --- a/PEIS/View/Exam/TotalForm.resx +++ b/PEIS/View/Exam/TotalForm.resx @@ -175,6 +175,6 @@ 1379, 17 - 46 + 73 \ No newline at end of file diff --git a/PEIS/View/UControl/OpMenuSimple.Designer.cs b/PEIS/View/UControl/OpMenuSimple.Designer.cs index 5625b98..dcfb81d 100644 --- a/PEIS/View/UControl/OpMenuSimple.Designer.cs +++ b/PEIS/View/UControl/OpMenuSimple.Designer.cs @@ -50,9 +50,9 @@ this.TsmiSave, this.TsmiAllDelete, this.TsmiDelete, + this.TsmiRefresh, this.TsmiAdd, - this.TsmiUp, - this.TsmiRefresh}); + this.TsmiUp}); this.menuStrip1.LayoutStyle = System.Windows.Forms.ToolStripLayoutStyle.HorizontalStackWithOverflow; this.menuStrip1.Location = new System.Drawing.Point(0, 0); this.menuStrip1.Name = "menuStrip1"; diff --git a/PEIS/View/UControl/OpMenuSimple.resx b/PEIS/View/UControl/OpMenuSimple.resx index 1571092..26a6ec5 100644 --- a/PEIS/View/UControl/OpMenuSimple.resx +++ b/PEIS/View/UControl/OpMenuSimple.resx @@ -123,33 +123,33 @@ - iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAMhJREFUSEtj - GLrANvb1fiD+TyL+ZhX7WQxqBHYAVLTfJua1A5T9HyyIBQDl3kOZDDaxr6qB/CtQLnZAvMGv7kOZYAA0 - fKFN7OtNUC4mIN7g1+egTDiwjX1zDCjeD+WiAhIM3g9lwoFDwnsBoOFvbONe5UKFEADdYHwYrAENgPQC - 5TAsRTGYHDCwBtvEvGzAh8Ea0ACRBr+uR8VUMpgcMLAGo3sdHYM1oAEiDR4NY1oZDCwSb1OGsRkc/VYL - ZCslGGQG1DhaAQYGAE7jWkN6dKlVAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABYAAAAWCAYAAADEtGw7AAAABGdBTUEAALGPC/xhBQAAAMVJREFUSEtj + YBiywDb29X7b2Nf/ScTfrGI/i6GbhQJABtvEvHaAsv+jy8OAbezr9zC2TeyratvY11dQVaAB4g1+dR+Z + bxP7aqFN7OtNyGIogHiDX5/DFHtzzDb2dT+6OBiQYPB+dDGHhPcCtrFv3tjGvcpFl8MwGB9G1wsCIL3Y + LEUxmBwwsAbbxLxswIfR9YIAkQa/rkfFVDKYHDCwBqN7HR2j6wUBIg0eDWNaGWwb++o2ZRibwdFvtUC2 + UoJBZqCbS3UAAE7jWkPX/ApTAAAAAElFTkSuQmCC - + - iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAKhJREFUSEtj - GAVUBzYxrx3IwVDthIFNzMsG29jX/4F4P0k45vV+u9g3+4Dsz0AL66HG4QZAhf+hTLKAfdxLS4JmgLwO - ch2USzYAWYQ3GImxyDb6rRYIQ7lYAVUsAsUhCEO5WMGoRVgBzSwCaSICY+gZvD5CB6MWYQXEWEQMGIEW - gQBQ0Seb+NfGUC7JAOpYwlUNKKJBCinBhBILCgC5jBwM1T4KqAUYGAAKo0Y1K0jxtgAAAABJRU5ErkJg - gg== + iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAcdJREFUSEvt + lb9KA0EQxoOFhQrWFoKghWipNnqzOVAsJJYBNTt70WAqH8EihSg2gopgYxtEBEGwsbG1sfANbPyTnU3Q + J4hscrlcxsuZYKX4g4G7+WZ3dve+5RKJf/4EkClPOLJUEEjXoOgZkKqAdGdzjiSX13eNm9YDgObCn7ht + CNTbfGxXCNS55oTm0pGUd+XHWH2H5AKaq0BXVARJQ3yOjrHH4yJN83wDQNoP7e7RLoLXtCWJtMxzcbjZ + 15HmMZpDrkcCymwB0sNU/qWPa3E4ilJ+s4pYLw9zvQU3a8YBta4P0Ltc/w6B5tZvtsK1FkBSMewmR5kF + XhMHKHNcGydLBa4FOEpv2Lvhh21Ue04Uqj28lmMd2AjfoReNd14b4Eg6ra3Ko1WuxSFQ74RPA9A8zXql + UV4X4JvBfqMjrsWRTld7Aek+1GyT17SQzJgZv5Ge9d7brygCgZUlv8k51yIB1Dd2gJD6hGvfAUgHc155 + kucjAdTZxhEIRWtcj2MhXRnkuVisRYNmaM6iHASembdazTyKUlzvGAf1XquTAvs/NC92Pbp16RcgY2To + brHQ2n7HqN3+iPoltD9AnbPuXMS3fl7zz+/lEzCwRJD9hwrAAAAAAElFTkSuQmCC - + - iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAcdJREFUSEvt - lb9KA0EQxoOFhQrWFoKghWipNvH2cmCwEC0Dam7vosFUPoJFClFsBBXBxjZIEATBxiatTQrfwMY/2d0E - fYI4m3xnAneJm3RKfjBw983MfnvZWRIb8D9g6eqc5VbyNpf3zJOvjMs6RUlrlisdlPWPkxJjjKsiFu4Y - NhcHaOkPWiDbWlDd0u5zjvs10/xC6ZB295P3ZIG5cgKtvaN/HofLRbyGIJOT1mbks94EUr+T4HIDj0Y4 - mfepwMzm6gxyd5in9qmhvJB7G4FkhOXJdZjV7J3qJORonIyaZVyIZoM4gmwMfc0jzDYhRUOHWUBhIyxP - JZEygn6Ni0YfnSukMJYndqmohNBGjedYvj6Eko7oCQyi2auKwTtKwlDyShdbvtyCZARdhUNsEKFe4n5l - GukwGAYqFOeQjEil6sPU99RmtodUNIm0WoKRiPufnXcUgc1razC5gdQdMnnQDbYrLiEZQ32ny351Hq/d - IaMMdla3PbkN2YhkqjaORzP0iP6YcXUdNUHMVys6p2v0hYXcOxYXx4EZIhj/sj7DNr3nKQ3B0srF4u2G - CCH0OXa9L/3QvIT6D1Bk9XSu8o9RpAb8eWKxbzCwRJClie/lAAAAAElFTkSuQmCC + iVBORw0KGgoAAAANSUhEUgAAABoAAAAaCAYAAACpSkzOAAAABGdBTUEAALGPC/xhBQAAAK9JREFUSEvt + lUsOwjAMRHsetqyQYuAeJHAUOBk9T+WygQOARuqiTEMT97MiT5qNpfo5TaJUVWFpnNfjlHCfnzjf3CTo + W4LWpnit96G9S9CX83rlvgMg4ZqFw7nZJXtg6ZiO61YgGv2NOSI5PTYI1/ssIsIeIlzvU0RRVhN1dyqV + wTdmEbPaipgiipIjyuEPRUCCPt1Ft1zPpRt2/JkA2OjIhTQldVi+wGRTwn0Ks/kACqNGNQNhWkUAAAAA + SUVORK5CYII= \ No newline at end of file