Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/service/app/hospital/HospitalService.java

@@ -119,11 +119,7 @@ public class HospitalService extends BaseService {
            args.add(hospitalId);
        }
        //修复分页数错误引起的BUG--huangwenjie--2017.09.06
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
        sql += " limit " + page + "," + pagesize;
        sql += " limit " + (page * pagesize) + "," + pagesize;
        List<Hospital> hosList = jdbcTemplate.query(sql, args.toArray(), new BeanPropertyRowMapper(Hospital.class));

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/service/common/account/DoctorService.java

@@ -127,11 +127,7 @@ public class DoctorService extends TokenService {
            args.add(level);
        }
        //修复分页数错误引起的BUG--huangwenjie--2017.09.06
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
        sql += " limit " + page + "," + pagesize;
        sql += " limit " + (page * pagesize) + "," + pagesize;
        List<Doctor> doctorList = jdbcTemplate.query(sql, args.toArray(), new BeanPropertyRowMapper(Doctor.class));

patient-co/patient-co-doctor-assistant/src/main/java/com/yihu/wlyy/web/third/gateway/controller/doctor/GcMessageController.java

@@ -133,7 +133,7 @@ public class GcMessageController {
            for (String openId : codeArr) {
                try {
                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy年MM月dd日 HH:mm");
                    JSONObject sendJson = weiXinTempMsgSendUtils.packageTemplate("居民咨询请求", "家庭医生电话咨询热线客服工作人员代发", content, dateFormat.format(new Date()));
                    JSONObject sendJson = weiXinTempMsgSendUtils.packageTemplate("居民咨询请求", "请进入手机APP查看", content, dateFormat.format(new Date()));
                    Boolean flag = weiXinTempMsgSendUtils.sendTemplateMessage(templateId, openId, url, sendJson);
                    logger.info("send wechat message param : " + openId+" =======> "+content);
                    logger.info("send wechat message retuen : " + openId+" =======> "+flag);

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/hospital/HospitalService.java

@@ -119,11 +119,7 @@ public class HospitalService extends BaseService {
            args.add(hospitalId);
        }
        //修复分页数错误引起的BUG--huangwenjie--2017.09.06
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
        sql += " limit " + page + "," + pagesize;
        sql += " limit " + (page * pagesize) + "," + pagesize;
        List<Hospital> hosList = jdbcTemplate.query(sql, args.toArray(), new BeanPropertyRowMapper(Hospital.class));

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/common/account/DoctorService.java

@@ -126,12 +126,7 @@ public class DoctorService extends TokenService {
            sql += " and level = ? ";
            args.add(level);
        }
        //修复分页数错误引起的BUG--huangwenjie--2017.09.06
        pagesize = page * pagesize;
        page = (page - 1) * pagesize;
        sql += " limit " + page + "," + pagesize;
        sql += " limit " + (page * pagesize) + "," + pagesize;
        List<Doctor> doctorList = jdbcTemplate.query(sql, args.toArray(), new BeanPropertyRowMapper(Doctor.class));