Merge branch '3.11_院后第二增量' of http:///182.92.166.109:3000/jihan/PostDischargePatientManage into 3.11_院后第二增量

This commit is contained in:
youxilong 2024-04-12 17:17:06 +08:00
commit bef0d29707

View File

@ -266,13 +266,13 @@
from department dt left join question_info qi on dt.id = qi.department_id from department dt left join question_info qi on dt.id = qi.department_id
<where> <where>
<if test="departmentName != null and departmentName != ''"> <if test="departmentName != null and departmentName != ''">
dt.department_name like concat('%',#{departmentName},'%') and dt.department_name like concat('%',#{departmentName},'%')
</if> </if>
<if test="questionnaireStatus != null and questionnaireStatus != ''"> <if test="questionnaireStatus != null and questionnaireStatus != ''">
qi.questionnaire_status =#{questionnaireStatus} and qi.questionnaire_status =#{questionnaireStatus}
</if> </if>
<if test="questionType != null and questionType != ''"> <if test="questionType != null and questionType != ''">
qi.question_type =#{questionType} and qi.question_type = #{questionType}
</if> </if>
</where> </where>
GROUP BY dt.id GROUP BY dt.id