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

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

@@ -440,7 +440,7 @@ public class CourseService {
     * @return
     */
    public List<Map<String,Object>> findDoctorByOrg(String orgCode){
        String sql1 = "SELECT * FROM base_doctor WHERE doctor_level = 3 AND enabled = 1 AND locked = 0 AND del = 1 and  visit_hospital = '"+orgCode+"'" ;
        String sql1 = "SELECT d.* FROM base_doctor d,base_doctor_hospital sh WHERE  d.del = 1 and  d.id = sh.doctor_code AND sh.del = 1 AND sh.org_code = '"+orgCode+"'\n" ;
        List<Map<String , Object >> amapList = jdbcTemplate.queryForList(sql1);
        return amapList;
    }
@@ -706,7 +706,7 @@ public class CourseService {
            object.put("fee",mapList.get(0).get("fee"));//报名费用
            String sql1 = "SELECT COUNT(*) count\n" +
                    "FROM base_recruit_students_record rsr \n" +
                    "WHERE rsr.recruit_students_id = '"+mapList.get(0).get("rsId")+"' AND `org_code` = '"+mapList.get(0).get("code")+"' AND (`status` = 1 OR `status` = 2 OR `status` = 3 OR `status` = 4 OR `status` = 6);\n";
                    "WHERE rsr.recruit_students_id = '"+mapList.get(0).get("rsId")+"' AND `org_code` = '"+mapList.get(0).get("code")+"' AND (`status` = 1 OR `status` = 2 OR `status` = 3 OR `status` = 4 OR `status` = 6 OR `status` = 8);\n";
            Integer count = jdbcTemplate.queryForObject(sql1,Integer.class);
            String sql2 = "SELECT * FROM base_course WHERE del = 1 AND org_code = '"+mapList.get(0).get("code")+"'" ;