报表sql报错修改

src/main/resources/mapper/BehospitalInfoMapper.xml

@@ -3569,9 +3569,6 @@
                 <![CDATA[ AND a.leave_hospital_date <= #{qcResultShortPageVO.endDate}]]>
             </if>
         </if>
-        <if test="qcResultShortPageVO.diagnose != null and qcResultShortPageVO.diagnose != ''">
-            AND a.diagnose LIKE CONCAT( '%', #{qcResultShortPageVO.diagnose}, '%' )
-        </if>
         <if test="qcResultShortPageVO.deptName != null and qcResultShortPageVO.deptName != ''">
             AND a.beh_dept_name = #{qcResultShortPageVO.deptName}
         </if>
@@ -7798,11 +7795,12 @@
         f1.leaveHospitalDate,
         f1.score,
         f1.scoreBn,
-        f2.avgScore,
         <if test="qcResultShortPageVO.radioCheck !=null and qcResultShortPageVO.radioCheck == 1">
             f1.msg,
             f1.caseName,
         </if>
+        f2.avgScore
+
         FROM
         (SELECT
         t.doctorName,