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

src/main/java/com/yihu/wlyy/service/app/scheduling/DoctorWorkTimeService.java

@@ -361,6 +361,13 @@ public class DoctorWorkTimeService extends BaseService {
        return json;
    }
    /**
     * 名医是否在工作查询
     *
     * @param doctor
     * @return
     * @throws Exception
     */
    public JSONObject isFamousDoctorWorking(String doctor) throws Exception{
        JSONObject json = new JSONObject();
        Calendar calendar = Calendar.getInstance();
@@ -399,6 +406,8 @@ public class DoctorWorkTimeService extends BaseService {
                        WlyyDoctorWorkWeek workWeek = (WlyyDoctorWorkWeek) result.get("workWeek");
                        int hour = calendar.get(Calendar.HOUR_OF_DAY);
                        int minute = calendar.get(Calendar.MINUTE);
                        String start = "";
                        String end ="";
                        String current = (hour < 10 ? ("0" + hour) : hour) + ":" + (hour < 10 ? ("0" + minute) : minute);
                        // 早上
@@ -411,10 +420,9 @@ public class DoctorWorkTimeService extends BaseService {
                            if (currentEnd.length() == 4) {
                                currentEnd = "0" + currentEnd;
                            }
                            if (current.compareTo(currentStart) >= 0 &&
                                    current.compareTo(currentEnd) < 0) {
                                flag = 1;
                            }
                            start = currentStart;
                            end = currentEnd;
                        }
                        // 下午
                        if (workWeek.getAfternoon().equals("1")) {
@@ -426,10 +434,10 @@ public class DoctorWorkTimeService extends BaseService {
                            if (currentEnd.length() == 4) {
                                currentEnd = "0" + currentEnd;
                            }
                            if (current.compareTo(currentStart) >= 0 &&
                                    current.compareTo(currentEnd) < 0) {
                                flag = 1;
                            if(StringUtils.isEmpty(start)) {
                                start = currentStart;
                            }
                            end = currentEnd;
                        }
                        //　晚上
                        if (workWeek.getNight().equals("1")) {
@@ -441,10 +449,14 @@ public class DoctorWorkTimeService extends BaseService {
                            if (currentEnd.length() == 4) {
                                currentEnd = "0" + currentEnd;
                            }
                            if (current.compareTo(currentStart) >= 0 &&
                                    current.compareTo(currentEnd) < 0) {
                                flag = 1;
                            if(StringUtils.isEmpty(start)) {
                                start = currentStart;
                            }
                            end = currentEnd;
                        }
                        if(current.compareTo(start) >= 0 && current.compareTo(end) < 0){
                            flag = 1;
                        }
                        if (flag == 1) {

src/main/java/com/yihu/wlyy/web/doctor/scheduling/DoctorWorkTimeController.java

@@ -191,6 +191,24 @@ public class DoctorWorkTimeController extends BaseController {
        }
    }
    /**
     * 名医是否在工作
     *
     * @param doctor
     * @return
     */
    @RequestMapping(value = "is_famous_doctor_working")
    @ResponseBody
    public String isFamousDoctorAtWorking(String doctor){
        try{
            JSONObject result = doctorWorkTimeService.isFamousDoctorWorking(doctor);
            return write(200,result.getString("msg"),"data",result.getString("status"));
        }catch (Exception e){
            e.printStackTrace();
            return error(-1,"查询失败");
        }
    }
    /**
     * 查询某个医生的工作时间
     *

src/main/java/com/yihu/wlyy/web/patient/consult/ConsultController.java

@@ -157,6 +157,23 @@ public class ConsultController extends WeixinBaseController {
		}
	}
	/**
	 * 名医是否在工作
	 *
	 * @param doctor
	 * @return
	 */
	@RequestMapping(value = "is_famous_doctor_working")
	@ResponseBody
	public String isFamousDoctorAtWorking(String doctor){
		try{
			JSONObject result = doctorWorkTimeService.isFamousDoctorWorking(doctor);
			return write(200,result.getString("msg"),"data",result.getString("status"));
		}catch (Exception e){
			e.printStackTrace();
			return error(-1,"查询失败");
		}
	}
	/**
	 * 名医咨询剩余次数查询
@@ -290,7 +307,7 @@ public class ConsultController extends WeixinBaseController {
					  @RequestParam(required = false) String voice) {
		try {
			//判断医生是否是在工作时间
			JSONObject jo=doctorWorkTimeService.isDoctorWorking(doctorCode);
			JSONObject jo=doctorWorkTimeService.isFamousDoctorWorking(doctorCode);
			if(!jo.get("status").equals("1")){
				return error(-1, jo.get("msg").toString());
			}