diff --git a/PEIS/App.config b/PEIS/App.config index e35a23d..1c4d84e 100644 --- a/PEIS/App.config +++ b/PEIS/App.config @@ -6,23 +6,12 @@ - - - - - - - - - - - - - - + + + diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index 9fcdb49..52d1347 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/PEIS/Model/Exam/PartModel.cs @@ -439,8 +439,8 @@ namespace PEIS.Model FROM Enrollment_FeeItem A - LEFT JOIN Report B ON A.EID = B.EID AND A.ID= B.ReportNo -LEFT JOIN Dict_FeeItem FeeItem ON A.FID= FeeItem.ID + LEFT JOIN Report B ON A.EID = B.EID AND ( A.ID= B.ReportNo OR A.OldId = B.ReportNo) + LEFT JOIN Dict_FeeItem FeeItem ON A.FID= FeeItem.ID WHERE A.ItemClass = '检查' AND FeeItem.IsHide=0 AND A.eid = {eid}").ToList(); return reportList;