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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/HttpClientUtil.java

@@ -197,7 +197,7 @@ public class HttpClientUtil {
        logger.info("params:"+params);
        RestTemplate restTemplate = new RestTemplate(requestFactory);
        HttpHeaders headers = new HttpHeaders();
        MediaType type = MediaType.parseMediaType("application/json");
        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
        headers.setContentType(type);
        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
        org.springframework.http.HttpEntity<String> formEntity = new org.springframework.http.HttpEntity<String>(params.toString(), headers);
@@ -211,7 +211,7 @@ public class HttpClientUtil {
        RestTemplate restTemplate = new RestTemplate(requestFactory);
        HttpHeaders headers = new HttpHeaders();
        MediaType type = MediaType.parseMediaType("application/json");
        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
        headers.setContentType(type);
        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
        org.springframework.http.HttpEntity<String> formEntity = new org.springframework.http.HttpEntity<String>(params.toString(), headers);
@@ -231,7 +231,7 @@ public class HttpClientUtil {
        logger.info("params:"+params);
        RestTemplate restTemplate = new RestTemplate(requestFactory);
        HttpHeaders headers = new HttpHeaders();
        MediaType type = MediaType.parseMediaType("application/json");
        MediaType type = MediaType.parseMediaType("application/json; charset=UTF-8");
        headers.setContentType(type);
        headers.add("Accept", MediaType.APPLICATION_JSON.toString());
        org.springframework.http.HttpEntity<String> formEntity = new org.springframework.http.HttpEntity<String>(params, headers);

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

@@ -700,16 +700,13 @@ public class DoctorController extends BaseController {
            if (temp != null) {
                JSONObject json = new JSONObject();
                //关注人数
                int concernCount = concernService.countPatientsByDoctorCode(getUID());
                json.put("concernCount", concernCount);
                json.put("concernCount", temp.getConcernNum());
                //医生的评分
                json.put("doctorScore", temp.getEvaluateScore());
                // 医生咨询量
                Integer doctoConsult = consultTeamService.countByDoctor(getUID());
                json.put("doctoConsult", doctoConsult);
                json.put("doctoConsult",  temp.getConsultNum());
                return write(200, "医生信息查询成功！", "data", json);
            } else {
                return error(-1, "医生信息查询失败！");

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

@@ -640,9 +640,9 @@ public class ConsultController extends WeixinBaseController {
    public String doctorList(
            @ApiParam(name = "hospitalCode", value = "医院code", defaultValue = "49229004X")
            @RequestParam(value = "hospitalCode", required = false) String hospitalCode,
            @ApiParam(name = "dept", value = "科室代码", defaultValue = "1")
            @ApiParam(name = "dept", value = "科室代码")
            @RequestParam(value = "dept", required = false) String dept,
            @ApiParam(name = "name", value = "医生姓名或科室名称", defaultValue = "1")
            @ApiParam(name = "name", value = "医生姓名或科室名称")
            @RequestParam(value = "name", required = false) String name,
            @ApiParam(name = "page", value = "第几页", defaultValue = "")
            @RequestParam(value = "page", required = false) Integer page,