From a8b8da97fd1f0719b48d13b7fc1468aea4547c6b Mon Sep 17 00:00:00 2001 From: LiJiaWen Date: Wed, 27 Aug 2025 14:45:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=81=8C=E4=B8=9A=E4=BD=93=E6=A3=80=E6=9B=B4?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.职业体检报告单位名称和地址取值调整 2.拍照窗口的危害因素取值调整 --- PEIS/Model/ReportModel.cs | 1 + PEIS/Utils/ObjectData.cs | 4 +- PEIS/Utils/ReportHelper.cs | 8 ++-- .../Enrollment/NewEnrollmentPersonForm.cs | 48 ++++++++++--------- 4 files changed, 33 insertions(+), 28 deletions(-) diff --git a/PEIS/Model/ReportModel.cs b/PEIS/Model/ReportModel.cs index 497c2aa..374e4ed 100644 --- a/PEIS/Model/ReportModel.cs +++ b/PEIS/Model/ReportModel.cs @@ -67,6 +67,7 @@ namespace PEIS.Model COALESCE ( a.Nation, b.Nation ) AS Nation, c.DeptName, a.OID, + a.OEID, a.PID, a.HazardFactors, a.WorkYears, diff --git a/PEIS/Utils/ObjectData.cs b/PEIS/Utils/ObjectData.cs index c1f5344..aff067f 100644 --- a/PEIS/Utils/ObjectData.cs +++ b/PEIS/Utils/ObjectData.cs @@ -92,9 +92,9 @@ namespace PEIS.Utils return false; } - public virtual T Get(T pobj) + public virtual void GetById() { - return (T)DAOHelp.GetById(this); + DAOHelp.GetById(this); } } diff --git a/PEIS/Utils/ReportHelper.cs b/PEIS/Utils/ReportHelper.cs index 28758cf..7fb5eac 100644 --- a/PEIS/Utils/ReportHelper.cs +++ b/PEIS/Utils/ReportHelper.cs @@ -258,14 +258,16 @@ namespace PEIS.Utils var examCareerConclusions = new TotalModel().GetExamCareerConclusion(eid); // 基础信息 - rpt.SetParameterValue("TeamName", patient.OrgName); - if (patient.OID != null) + if (patient.OEID != null) { - var org = new BaseOrgModel().GetOrgByID(patient.OID); + var org = new EnrollmentOrg() { ID = (long)patient.OEID }; + org.GetById(); + rpt.SetParameterValue("TeamName", org.InvoiceName); rpt.SetParameterValue("TeamAddress", org.Address); } else { + rpt.SetParameterValue("TeamName", ""); rpt.SetParameterValue("TeamAddress", ""); } rpt.SetParameterValue("PatientID", patient.PID); diff --git a/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs b/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs index 783707b..ad62cc1 100644 --- a/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs +++ b/PEIS/View/Enrollment/NewEnrollmentPersonForm.cs @@ -39,7 +39,7 @@ namespace PEIS.View.Enrollment NewBaseBtn.Enabled = !editStatus; //NameTextBox.Enabled = !editStatus; Text = editStatus ? "编辑登记信息" : "新增登记信息"; - + // 查询 NameTextBox.Leave += NameTextBox_Leave; @@ -89,9 +89,11 @@ namespace PEIS.View.Enrollment private void JobStatusComboBox_SelectedIndexChanged(object sender, EventArgs e) { var status = JobStatusComboBox.SelectedValue?.ToString(); + //var _lst = DAOHelp.GetDataBySQL($@"SELECT Name FROM Dict_HazardType + // WHERE ID IN (SELECT HID FROM Dict_HTypeFItem GROUP BY HID) + // AND ParentID IN (SELECT ID FROM Dict_HazardType WHERE ParentID in (SELECT ID FROM Dict_HazardType WHERE Name = '{status}'))"); var _lst = DAOHelp.GetDataBySQL($@"SELECT Name FROM Dict_HazardType - WHERE ID IN (SELECT HID FROM Dict_HTypeFItem GROUP BY HID) - AND ParentID IN (SELECT ID FROM Dict_HazardType WHERE ParentID in (SELECT ID FROM Dict_HazardType WHERE Name = '{status?? "岗前"}'))"); + WHERE ParentID IN (SELECT ID FROM Dict_HazardType WHERE ParentID in (SELECT ID FROM Dict_HazardType WHERE Name = '{status}'))"); foreach (var item in _lst) { @@ -167,11 +169,11 @@ namespace PEIS.View.Enrollment return; } - if(_editStatus && Global.currentUser.Code == Global._hospital.DoctCode) + if (_editStatus && Global.currentUser.Code == Global._hospital.DoctCode) { return; } - if(!_editStatus) + if (!_editStatus) { OnGetBaseInfoByName(); } @@ -219,8 +221,8 @@ namespace PEIS.View.Enrollment CardTypeComboBox.Text = item?.CardType; IDCard.Text = item?.CardNo; NationBoxTxt.Text = item?.Nation; - BirthdayDateTimePicker.Value = item?.Birthday ?? DateTime.Now; - ExamDate.Value = item?.ExamDate?? DateTime.Now; + BirthdayDateTimePicker.Value = item?.Birthday ?? DateTime.Now; + ExamDate.Value = item?.ExamDate ?? DateTime.Now; ExamTypeComboBox.SelectedValue = item?.ExamType ?? "健康体检"; MaritalComboBox.SelectedValue = item?.Marriage ?? "未知"; OccupationComboBox.SelectedValue = item?.Occupation ?? "其它劳动者"; @@ -253,7 +255,7 @@ namespace PEIS.View.Enrollment NewPersonForm personForm = new NewPersonForm(action); personForm.ShowDialog(); } - + private void ReadIDCard_Click(object sender, EventArgs e) { @@ -275,9 +277,9 @@ namespace PEIS.View.Enrollment Global.MsgErr(a.Message); return; } - + } - + private void TakePhotoBtn_Click(object sender, EventArgs e) { Bitmap img = CameraPlayer.GetCurrentVideoFrame(); @@ -325,7 +327,7 @@ namespace PEIS.View.Enrollment if (ExamType != null && ExamType.Contains("职业")) { - if(string.IsNullOrEmpty(JobTypes.Text.Trim())) + if (string.IsNullOrEmpty(JobTypes.Text.Trim())) { Global.Msg("err", "请输入工种！"); return; @@ -388,7 +390,7 @@ namespace PEIS.View.Enrollment Description = Description.Text.Trim(), SpellCode = PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin.Count == 0 ? null : PingYinHelper.GetTotalPingYin(NameTextBox.Text.Trim()).FirstPingYin[0] }; - + if (ExamType != null && ExamType.Contains("职业")) { item.JobTypes = JobTypes.Text.Trim(); @@ -548,7 +550,7 @@ namespace PEIS.View.Enrollment OccupationComboBox.DataSource = Global._lstConfig.Where(w => w.Key == "Occupation").OrderBy(p => p.Seq).ToList(); OccupationComboBox.DisplayMember = "Value"; OccupationComboBox.ValueMember = "Value"; - + ExamTypeComboBox.DataSource = Global._lstConfig.Where(w => w.Key == "ExamType").ToList(); ExamTypeComboBox.DisplayMember = "Value"; ExamTypeComboBox.ValueMember = "Value"; @@ -655,7 +657,7 @@ namespace PEIS.View.Enrollment "月" }; } - // 转换照片格式 + // 转换照片格式 public string ImageToBase64() { if (Photo.Image == null) @@ -666,13 +668,13 @@ namespace PEIS.View.Enrollment { using (MemoryStream ms = new MemoryStream()) { - + Photo.Image.Save(ms, ImageFormat.Png); byte[] imageBytes = ms.ToArray(); return Convert.ToBase64String(imageBytes); } } - catch(Exception ex) + catch (Exception ex) { Global.Msg("err", ex.Message); return null; @@ -695,7 +697,7 @@ namespace PEIS.View.Enrollment return image; } } - catch(Exception ex) + catch (Exception ex) { Global.Msg("err", ex.Message); return null; @@ -753,16 +755,16 @@ namespace PEIS.View.Enrollment SelectPerson(items[0]); break; default: - { - SelectPatientForm selectPatientForm = new SelectPatientForm(action, NameTextBox.Text.Trim()); - selectPatientForm.ShowDialog(); - break; - } + { + SelectPatientForm selectPatientForm = new SelectPatientForm(action, NameTextBox.Text.Trim()); + selectPatientForm.ShowDialog(); + break; + } } } protected virtual void OnGetBaseInfoByName() { - GetBaseInfoByName?.Invoke(this, new Args{ Name = NameTextBox.Text }); + GetBaseInfoByName?.Invoke(this, new Args { Name = NameTextBox.Text }); } // 通过证件类型、证件号查询PID