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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/account/PatientController.java

@@ -1059,4 +1059,17 @@ public class PatientController extends WeixinBaseController {
            return error( -1, "查询失败！");
        }
    }
    @RequestMapping(value = "/getDoctorActivityPath")
    @ResponseBody
    private String getDoctorActivityPath(String code){
        try {
            Doctor d = doctorService.findDoctorByCode(code);
            return write(-1, "获取成功!", "data", d.getActivityPath());
        }catch (Exception e){
            error(e);
            return error(-1, "获取地址失败");
        }
    }
}

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/wx/WechatCoreController.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -230,15 +231,4 @@ public class WechatCoreController extends WeixinBaseController {
        return s;
    }
    @RequestMapping(value = "/getDoctorActivityPath")
    @ResponseBody
    private String getDoctorActivityPath(String code){
        try {
            Doctor d = doctorService.findDoctorByCode(code);
            return write(-1, "获取成功!", "data", d.getActivityPath());
        }catch (Exception e){
            error(e);
            return error(-1, "获取地址失败");
        }
    }
}