Merge branch 'dev' of huangwenjie/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/common/util/WlyySerivceController.java

@@ -252,7 +252,7 @@ public class WlyySerivceController extends BaseController{
            //7天排班的医生列表
            String list = jwSmjkService.GetDoctorList(hospitalId,hosDeptId);
            return write(200, "获取转诊预约医生列表成功！", "data", list);
            return list;
        } catch (Exception ex) {
            ex.printStackTrace();
            return error(-1,"获取转诊预约医生列表列表失败");

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/BookingController.java

@@ -259,8 +259,11 @@ public class BookingController extends WeixinBaseController {
                                @RequestParam(value = "hosDeptId", required = true) String hosDeptId) {
        try {
//            GuahaoDoctor doctor = getService(city).GetDoctorInfo(doctorId, hospitalId, hosDeptId);
            String doctor = jwSmjkService.GetDoctorInfo(hospitalId,hosDeptId,doctorId);
            return doctor;
//            String doctor = jwSmjkService.GetDoctorInfo(hospitalId,hosDeptId,doctorId);
            //---2017.07.31----黄文杰---获取医生详细信息时从10天号源的医生
            JSONObject result  = jwSmjkService.GetDoctorInfoTen(hospitalId,hosDeptId,doctorId);
            return write(200, "获取医生详细信息成功！","data",result);
        } catch (Exception e) {
            return error(-1, e.getMessage());
        }