职业体检更新

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)
             {