Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2020-07-12 9140edf9b115a6b38c599878093d595ef84228f1

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/mapper/SysUserMapper.java

@@ -52,4 +52,13 @@
     * @return
     */
    List<HospitalDoctorListVo> hospitalDoctorList(@Param("hospitalId") Long hospitalId, @Param("departmentId") Long departmentId,@Param("roleId1") Long roleId1,@Param("roleId2") Long roleId2);
/**
     * 获取医院科室下的所有有效的医生  and 已经删除的
     * @param hospitalId
     * @param departmentId
     * @param roleId1 管理员医生角色id
     * @param roleId2 普通医生角色id
     * @return
     */
    List<HospitalDoctorListVo> hospitalDoctorListAndDel(@Param("hospitalId") Long hospitalId, @Param("departmentId") Long departmentId,@Param("roleId1") Long roleId1,@Param("roleId2") Long roleId2);
}