From dbc4757d4b526767ab1b74a4b32060bdb5681160 Mon Sep 17 00:00:00 2001 From: lsm Date: Wed, 2 Oct 2024 21:55:02 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=BB=86=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PEIS/Model/Enrollment/EnrollmentPatientModel.cs | 7 ++++++- PEIS/Model/Exam/PartModel.cs | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs b/PEIS/Model/Enrollment/EnrollmentPatientModel.cs index 2f52610..e16172f 100644 --- a/PEIS/Model/Enrollment/EnrollmentPatientModel.cs +++ b/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"); } diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index 5a059e2..33c29b0 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/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}