diff --git a/PEIS/Model/Exam/PartModel.cs b/PEIS/Model/Exam/PartModel.cs index dcfb550..d7824f9 100644 --- a/PEIS/Model/Exam/PartModel.cs +++ b/PEIS/Model/Exam/PartModel.cs @@ -190,7 +190,7 @@ namespace PEIS.Model SELECT DISTINCT A.FeeItemName, B.Title AS RptItemName, B.summary AS TextResult, Unit = '', UnusualFlag = '',0 as SeqReport FROM Enrollment_FeeItem A - LEFT JOIN Report B ON A.eid = B.eid AND (A.EID > 9999 AND A.ID = B.ReportNo OR A.EID <=9999 AND a.OldId = b.ReportNo) + LEFT JOIN Report B ON A.eid = B.eid AND (A.ID = B.ReportNo OR A.OldId = B.ReportNo) WHERE A.ItemClass = '检查' AND B.summary <> '' AND A.EID = {eid} AND A.DeptCode = '{deptCode}'").OrderBy(o=>o.SeqReport).ToList(); diff --git a/PEIS/ReportFiles/PReport.frx b/PEIS/ReportFiles/PReport.frx index b66634c..3ccd3a1 100644 --- a/PEIS/ReportFiles/PReport.frx +++ b/PEIS/ReportFiles/PReport.frx @@ -1,5 +1,5 @@  - + using System; using System.Collections; using System.Collections.Generic; @@ -185,12 +185,12 @@ namespace FastReport - + - + @@ -217,7 +217,7 @@ namespace FastReport - + @@ -292,7 +292,7 @@ namespace FastReport - + @@ -310,7 +310,7 @@ namespace FastReport - + @@ -326,7 +326,7 @@ namespace FastReport - + @@ -349,12 +349,12 @@ namespace FastReport - + - + @@ -385,10 +385,10 @@ namespace FastReport - + - - + + @@ -405,7 +405,7 @@ namespace FastReport - + @@ -414,16 +414,16 @@ namespace FastReport - + - + - + - + @@ -441,7 +441,7 @@ namespace FastReport - + @@ -450,7 +450,7 @@ namespace FastReport - + @@ -473,7 +473,7 @@ namespace FastReport - + @@ -488,7 +488,7 @@ namespace FastReport - + @@ -511,7 +511,7 @@ namespace FastReport - + @@ -523,7 +523,7 @@ namespace FastReport - +