Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/course/CourseService.java

@@ -697,7 +697,7 @@ public class CourseService {
    public JSONObject getTecInfoById(String doctor,String orgCode,int page,int size){
        JSONObject object = new JSONObject();
        //老师的基本信息
        String sql = "SELECT d.id,d.name,d.job_title_code jobTitleCode,d.job_title_name jobTitleName,dh.org_code orgCode,dh.org_name orgName\n" +
        String sql = "SELECT d.id,d.introduce,d.name,d.job_title_code jobTitleCode,d.job_title_name jobTitleName,dh.org_code orgCode,dh.org_name orgName\n" +
                "FROM base_doctor d,base_doctor_hospital dh\n" +
                "WHERE d.id = '"+doctor+"' AND dh.org_code = '"+orgCode+"' AND d.enabled = 1 AND d.locked = 0 AND d.del = 1 AND dh.del = 1 AND dh.doctor_code = d.id";
        List<Map<String , Object>> mapList = jdbcTemplate.queryForList(sql);