Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorInfoService.java

@@ -388,11 +388,11 @@ public class BaseDoctorInfoService extends BaseJpaService<BaseDoctorDO, BaseDoct
    }
    public List<BaseDoctorRoleDO> selectByGuidance(){
        String sql = "SELECT * FROM base_doctor_role dr where dr.role_code='guidance' " +
    public List<Map<String,Object>> selectByGuidance(){
        String sql = "SELECT dr.id as \"id\",dr.doctor_code as \"doctor_code\",dr.role_code as \"role_code\" FROM base_doctor_role dr where dr.role_code='guidance' " +
                "and dr.doctor_code IN(SELECT d.id FROM base_doctor d " +
                "where d.consult_status=1 and d.locked=0 and d.enabled=1)  ";
        List<BaseDoctorRoleDO> list = jdbcTemplate.queryForList(sql,BaseDoctorRoleDO.class);
        List<Map<String,Object>> list = jdbcTemplate.queryForList(sql);
        return list;
    }
}