科室模板修改2

tran-service/src/main/resources/mapper/DoctorInfoMapper.xml

@@ -40,11 +40,11 @@
         FROM tran_doctor_info a
         JOIN tran_hospital_info b ON a.hospital_code = b.code
         WHERE a.is_deleted = 'N' AND b.is_deleted = 'N'
-        <if test="hospitalId != null ">
-         and a.id = #{hospitalId}
-        </if>
         <if test="doctorId != null ">
-        AND b.id = #{doctorId}
+         and a.id = #{doctorId}
+        </if>
+        <if test="hospitalId != null ">
+        AND b.id = #{hospitalId}
         </if>
     </select>
 </mapper>