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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/admin/AdminManageService.java

@@ -111,16 +111,16 @@ public class AdminManageService {
        if("2".equals(type)){
            String sql = "SELECT distinct t.name orgName,t.org_code orgCode" +
                    " from base_team t,base_team_member tm" +
                    "  WHERE  t.id =tm.team_code and t.del=1 and tm.del = '1' ";
                    "  WHERE  t.id =tm.team_code and t.del=1 and tm.del = '1' and t.org_code='zdjsylfwyxgszhfgs'";
            return jdbcTemplate.queryForList(sql);
        }else {
            String filter = "";
            String sqltmp = "SELECT GROUP_CONCAT(dict_code) orgCodes from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_older' ";
            String sqltmp = "SELECT GROUP_CONCAT(dict_code) orgCodes from wlyy_hospital_sys_dict WHERE dict_name = 'jkzl_org' ";
            List<Map<String,Object>> listtmp =  jdbcTemplate.queryForList(sqltmp);
            if(listtmp.size()>0){
                String orgCodes = String.valueOf(listtmp.get(0).get("orgCodes"));
                orgCodes = orgCodes.replaceAll(",","','");
                filter = " and a.id not in ('"+orgCodes+"')";
                filter = " and a.code not in ('"+orgCodes+"')";
            }
            //2社工, 3教师,4助老员
            String sql = "select code orgCode,name orgName from base_org a where a.del=1 and a.type="+type +filter;