|
|
@@ -7384,6 +7384,9 @@
|
|
|
<if test="deptName != null and deptName != ''">
|
|
|
and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
|
|
|
</if>
|
|
|
+ <if test="doctorName != null and doctorName != ''">
|
|
|
+ and a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
|
|
|
+ </if>
|
|
|
GROUP BY
|
|
|
a.doctor_id,
|
|
|
a.doctor_name
|
|
|
@@ -7442,6 +7445,9 @@
|
|
|
<if test="deptName != null and deptName != ''">
|
|
|
and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
|
|
|
</if>
|
|
|
+ <if test="doctorName != null and doctorName != ''">
|
|
|
+ and a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
|
|
|
+ </if>
|
|
|
GROUP BY
|
|
|
a.doctor_id,
|
|
|
a.doctor_name
|
|
|
@@ -7499,6 +7505,9 @@
|
|
|
<if test="deptName != null and deptName != ''">
|
|
|
and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
|
|
|
</if>
|
|
|
+ <if test="doctorName != null and doctorName != ''">
|
|
|
+ and a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
|
|
|
+ </if>
|
|
|
GROUP BY
|
|
|
a.doctor_id,
|
|
|
a.doctor_name
|
|
|
@@ -7613,6 +7622,9 @@
|
|
|
<![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
|
|
|
</if>
|
|
|
</if>
|
|
|
+ <if test="doctorName != null and doctorName != ''">
|
|
|
+ and a.doctor_name LIKE CONCAT( '%', #{doctorName}, '%' )
|
|
|
+ </if>
|
|
|
<if test="deptName != null and deptName != ''">
|
|
|
and a.beh_dept_name LIKE CONCAT( '%', #{deptName}, '%' )
|
|
|
</if>
|
|
|
@@ -8315,7 +8327,7 @@
|
|
|
AND a.beh_dept_id = b.dept_id
|
|
|
AND a.qc_type_id != 0
|
|
|
<if test="qcResultShortPageVO.userId!=null">
|
|
|
- AND c.user_id = #{qcResultShortPageVO.userId}
|
|
|
+ AND b.user_id = #{qcResultShortPageVO.userId}
|
|
|
</if>
|
|
|
<if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
|
|
|
and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
|
|
|
@@ -8557,7 +8569,7 @@
|
|
|
AND a.beh_dept_id = b.dept_id
|
|
|
AND a.qc_type_id != 0
|
|
|
<if test="qcResultShortPageVO.userId!=null">
|
|
|
- AND c.user_id = #{qcResultShortPageVO.userId}
|
|
|
+ AND b.user_id = #{qcResultShortPageVO.userId}
|
|
|
</if>
|
|
|
<if test="qcResultShortPageVO.isPlacefile != null and qcResultShortPageVO.isPlacefile != ''">
|
|
|
and a.is_placefile = #{qcResultShortPageVO.isPlacefile}
|
|
|
@@ -8697,7 +8709,9 @@
|
|
|
</if>
|
|
|
GROUP BY
|
|
|
t.behDeptId,
|
|
|
- t.behDeptName
|
|
|
+ t.behDeptName,
|
|
|
+ t.doctorId,
|
|
|
+ t.doctorName
|
|
|
)f2
|
|
|
WHERE
|
|
|
f1.doctorId = f2.doctorId
|
chengyao