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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/account/DoctorInfoService.java

@@ -316,7 +316,7 @@ public class DoctorInfoService extends BaseService {
    public Page<Doctor> getDoctorListByHospital(String query, String hospital,
                                                long id, int pageSize) {
        // 排序
        Sort sort = new Sort(Direction.DESC, "id");
        Sort sort = new Sort(Direction.DESC, "evaluateScore","id");
        // 分页信息
        PageRequest pageRequest = new PageRequest(0, pageSize, sort);
        // 查询全部

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/FamilyContractService.java

@@ -263,6 +263,7 @@ public class FamilyContractService extends BaseService {
        // 查询医生基本信息
        Doctor d = doctorDao.findByCode(doctor);
        json.put("doctor", d.getCode());
        json.put("evaluateScore", d.getEvaluateScore());
        json.put("name", d.getName());
        json.put("photo", d.getPhoto());
        json.put("sex", d.getSex());

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
 * Created by 卓 on 2017/5/10.
@@ -81,4 +82,23 @@ public class EvaluateController  extends BaseController {
        }
    }
    /**
     * 保存评价
     * @param doctor 保存评价内容的JSON
     * @return
     */
    @RequestMapping(value = "doctor/label")
    @ResponseBody
    public String doctorLabel(@RequestParam(required = true,value="doctor") String doctor){
        try{
            List<Map<String,Object>> result = evaluateLabelService.findDistinctLabelByLaDoctor(doctor);
            return  write(200,"查询成功！","list",result);
        }catch (Exception e){
            error(e);
            return write(-1,e.getMessage());
        }
    }
}

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/hosptail/HospitalController.java

@@ -180,6 +180,7 @@ public class HospitalController extends BaseController {
                    json.put("name", doctor.getName());
                    json.put("photo", doctor.getPhoto());
                    json.put("sex", doctor.getSex());
                    json.put("evaluateScore", doctor.getEvaluateScore());
                    String sexName = "";
                    switch (doctor.getSex()) {
                        case 1: