1、细节调整

PEIS/Model/Enrollment/EnrollmentPatientModel.cs

@@ -71,14 +71,19 @@ namespace PEIS.Model.Enrollment
                                                             a.ID,
                                                             a.SEX,
                                                             CONVERT(VARCHAR,a.Age) + a.AgeClass AgeClass,
+                                                            b.BirthDay,
+                                                            a.CardNo,
+                                                            a.CardType,
+                                                            b.Marriage,
                                                             c.DeptName AS GroupName,
                                                             a.SignTime,   
+                                                            a.Tel1,
                                                             a.SpellCode,
                                                             CASE WHEN a.SignTime IS NULL 
                                                             THEN NULL
 	                                                            ELSE '已发送'
                                                             END AS Signer
-                                                            from Enrollment_Patient a LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = a.PID Where a.OEID = {oeID} order by c.DeptName,a.SignTime");
+                                                            from Enrollment_Patient a LEFT JOIN Base_Patient b ON a.PID = b.ID LEFT JOIN Base_OrgPatient c ON c.OID = a.OID AND c.PID = b.ID Where a.OEID = {oeID} order by c.DeptName,a.SignTime");
         }
 
 

PEIS/Model/Exam/PartModel.cs

@@ -463,7 +463,7 @@ namespace PEIS.Model
 	                FROM
 		                Exam_Part A
 		                LEFT JOIN Exam_Result B ON A.ID = B.PID
-                        LEFT JOIN Enrollment_FeeItem C ON B.FID=C.ID
+                        LEFT JOIN Enrollment_FeeItem C ON B.FID=C.FID
 	                WHERE
 		                A.VerifyTime IS NOT NULL AND A.GiveUpTime IS NULL AND C.GiveUpTime IS NULL
 		                AND A.EID = {eid} AND A.DeptCode = {deptCode}