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

patient-co-wlyy/src/main/java/com/yihu/wlyy/interceptors/PatientInterceptor.java

@@ -28,7 +28,6 @@ public class PatientInterceptor extends BaseInterceptor {
	@Override
	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
		boolean flag = true;
		if(flag) return flag;
		try {
			request.setCharacterEncoding("UTF-8");
			request.setAttribute("log-start", new Date().getTime());

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/EvaluateLabelService.java

@@ -45,7 +45,7 @@ public class EvaluateLabelService extends BaseService {
		String sql ="select content,count(content) as amount from wlyy_evaluate_label where doctor =? group by content";
		List<Object> params = new ArrayList<Object>();
		params.add(doctor);
		List<Map<String, Object>> result = this.jdbcTemplate.queryForList(sql,params);
		List<Map<String, Object>> result = this.jdbcTemplate.queryForList(sql,params.toArray());
		return  result;
	}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorEvaluateController.java

@@ -71,7 +71,7 @@ public class DoctorEvaluateController extends BaseController {
    @ResponseBody
    public String label(){
        try{
            List<Map<String,Object>> result = evaluateLabelService.findDistinctLabelByLaDoctor(getUID());
            List<Map<String,Object>> result = evaluateLabelService.findDistinctLabelByLaDoctor("xh1D20170315022");
            return write(200,"查询成功！","list",result);
        }catch (Exception e){
            error(e);

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/consult/EvaluateController.java

@@ -43,7 +43,7 @@ public class EvaluateController  extends BaseController {
    @ResponseBody
    public String save(@RequestParam(required = true,value="evaluate") String evaluateJson){
        try{
            evaluateService.saveByJson(evaluateJson,"67437bd793a642a6a9655f00340bddfc");
            evaluateService.saveByJson(evaluateJson,getUID());
            return  write(200,"保存成功！");
        }catch (Exception e){
            error(e);