|
|
@@ -5617,8 +5617,8 @@
|
|
|
<![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
|
|
|
</if>
|
|
|
</if>
|
|
|
- <if test="name != null and name != ''">
|
|
|
- AND a.doctor_name like CONCAT('%', #{name}, '%')
|
|
|
+ <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 = #{deptName}
|
|
|
@@ -5699,8 +5699,8 @@
|
|
|
<![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
|
|
|
</if>
|
|
|
</if>
|
|
|
- <if test="name != null and name != ''">
|
|
|
- AND a.doctor_name like CONCAT('%', #{name}, '%')
|
|
|
+ <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 = #{deptName}
|
|
|
@@ -5777,8 +5777,8 @@
|
|
|
<![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
|
|
|
</if>
|
|
|
</if>
|
|
|
- <if test="name != null and name != ''">
|
|
|
- AND a.doctor_name like CONCAT('%', #{name}, '%')
|
|
|
+ <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 = #{deptName}
|
|
|
@@ -5855,8 +5855,8 @@
|
|
|
<![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
|
|
|
</if>
|
|
|
</if>
|
|
|
- <if test="name != null and name != ''">
|
|
|
- AND a.doctor_name like CONCAT('%', #{name}, '%')
|
|
|
+ <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 = #{deptName}
|
|
|
@@ -5933,8 +5933,8 @@
|
|
|
<![CDATA[ AND a.leave_hospital_date <= #{endDate}]]>
|
|
|
</if>
|
|
|
</if>
|
|
|
- <if test="name != null and name != ''">
|
|
|
- AND a.doctor_name like CONCAT('%', #{name}, '%')
|
|
|
+ <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 = #{deptName}
|
|
|
@@ -9999,7 +9999,6 @@
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
AND a.beh_dept_id = f.dept_id
|
|
|
- AND a.beh_dept_id = e.dept_id
|
|
|
AND c.cases_entry_id = d.id
|
|
|
and a.doctor_id=e.doctor_id
|
|
|
and e.group_id is not NULL
|
|
|
@@ -10086,7 +10085,6 @@
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
AND a.beh_dept_id = f.dept_id
|
|
|
- AND a.beh_dept_id = e.dept_id
|
|
|
AND c.cases_entry_id = d.id
|
|
|
and a.doctor_id=e.doctor_id
|
|
|
and e.group_id is not NULL
|
|
|
@@ -10381,7 +10379,6 @@
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
AND a.beh_dept_id = f.dept_id
|
|
|
- AND a.beh_dept_id = e.dept_id
|
|
|
AND c.cases_entry_id = d.id
|
|
|
and a.doctor_id=e.doctor_id
|
|
|
and e.group_id is not NULL
|
|
|
@@ -10468,7 +10465,6 @@
|
|
|
AND a.behospital_code = b.behospital_code
|
|
|
AND a.behospital_code = c.behospital_code
|
|
|
AND a.beh_dept_id = f.dept_id
|
|
|
- AND a.beh_dept_id = e.dept_id
|
|
|
AND c.cases_entry_id = d.id
|
|
|
and a.doctor_id=e.doctor_id
|
|
|
and e.group_id is not NULL
|
chengyao