diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index 5dd4e9f..368ca26 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -278,7 +278,7 @@ namespace PEIS.Utils rpt.SetParameterValue("DeptName", patient.DeptName); - rpt.SetParameterValue("EnrollmentType", "岗中"); + rpt.SetParameterValue("EnrollmentType", patient.JobStatus); rpt.SetParameterValue("IDCard", patient.CardNo); rpt.SetParameterValue("HospitalAddress", "无"); rpt.SetParameterValue("HospitalCertificate", "无"); diff --git a/PEIS/View/Exam/CareerHisInqForm.cs b/PEIS/View/Exam/CareerHisInqForm.cs index b5dfa57..b24c1ce 100644 --- a/PEIS/View/Exam/CareerHisInqForm.cs +++ b/PEIS/View/Exam/CareerHisInqForm.cs @@ -228,13 +228,13 @@ namespace PEIS.View.Exam Invoke(new Action(() => textBox3.Text = patient.Name)); Invoke(new Action(() => textBox4.Text = patient.Sex == "1" ? "男" : "女")); Invoke(new Action(() => textBox5.Text = patient.Age.ToString())); - //Invoke(new Action(() =>textBox9.Text = patient)). - //Invoke(new Action(() =>textBox7.Text = patient.HazardFactors)); - //Invoke(new Action(() =>textBox8.Text= patient)) - //Invoke(new Action(() =>textBox9.Text= patient.JobTypes)) - //Invoke(new Action(() =>textBox10.Text = )) - //Invoke(new Action(() =>textBox11.Text = patient.WorkYears)) - //Invoke(new Action(() =>textBox12.Text = )) + Invoke(new Action(() => textBox6.Text = patient.Type));//类别 + Invoke(new Action(() =>textBox7.Text = patient.HazardFactors));//接害因素 + Invoke(new Action(() => textBox8.Text = patient.Company));//工作单位 + Invoke(new Action(() => textBox9.Text = patient.JobTypes));//工种 + Invoke(new Action(() => textBox10.Text = patient.DeptName));//部门/车间 + Invoke(new Action(() => textBox11.Text = patient.WorkYears));//总工龄 + Invoke(new Action(() => textBox12.Text = patient.HazardYears));//接害年龄 if (patient.Sex == "1") Sexman();