职业体检更新

1.职业体检报告单位名称和地址取值调整
2.拍照窗口的危害因素取值调整

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,

PEIS/Utils/ObjectData.cs

@@ -92,9 +92,9 @@ namespace PEIS.Utils
             return false; 
         }
 
-        public virtual T Get<T>(T pobj)
+        public virtual void GetById()
         {
-            return (T)DAOHelp.GetById(this);
+            DAOHelp.GetById(this);
         }
     }
 

PEIS/Utils/ReportHelper.cs

@@ -258,14 +258,16 @@ namespace PEIS.Utils
             var examCareerConclusions = new TotalModel().GetExamCareerConclusion(eid);
 
             // 基础信息
-            rpt.SetParameterValue("TeamName", patient.OrgName);
+            if (patient.OEID != null)
-            if (patient.OID != 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);

PEIS/View/Enrollment/NewEnrollmentPersonForm.cs

@@ -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<DictHazardType>($@"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<DictHazardType>($@"SELECT Name FROM Dict_HazardType 
-                                                               WHERE ID IN (SELECT HID FROM Dict_HTypeFItem GROUP BY HID)
+                                                               WHERE ParentID IN (SELECT ID FROM Dict_HazardType WHERE ParentID in  (SELECT ID FROM Dict_HazardType WHERE Name = '{status}'))");
-                                                               AND 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;
+            BirthdayDateTimePicker.Value = item?.Birthday ?? DateTime.Now;
-            ExamDate.Value = item?.ExamDate?? DateTime.Now;
+            ExamDate.Value = item?.ExamDate ?? DateTime.Now;
             ExamTypeComboBox.SelectedValue = item?.ExamType ?? "健康体检";
             MaritalComboBox.SelectedValue = item?.Marriage ?? "未知";
             OccupationComboBox.SelectedValue = item?.Occupation ?? "其它劳动者";
@@ -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;
@@ -655,7 +657,7 @@ namespace PEIS.View.Enrollment
                 "月"
             };
         }
-         // 转换照片格式
+        // 转换照片格式
         public string ImageToBase64()
         {
             if (Photo.Image == null)
@@ -672,7 +674,7 @@ namespace PEIS.View.Enrollment
                     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 selectPatientForm = new SelectPatientForm(action, NameTextBox.Text.Trim());
-                    selectPatientForm.ShowDialog();
+                        selectPatientForm.ShowDialog();
-                    break;
+                        break;
-                }
+                    }
             }
         }
         protected virtual void OnGetBaseInfoByName()
         {
-            GetBaseInfoByName?.Invoke(this, new Args<string>{ Name = NameTextBox.Text });
+            GetBaseInfoByName?.Invoke(this, new Args<string> { Name = NameTextBox.Text });
         }
 
         // 通过证件类型、证件号查询PID