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

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

@@ -609,7 +609,7 @@ public class DoctorInfoService extends BaseService {
        return doctorDao.findAll(spec, pageRequest);
    }
    public Page<Doctor> findFamousDoctor(String key,Integer type, int page, int pageSize) {
    public Page<Doctor> findFamousDoctor(String key,Integer type, int page, int pageSize,Integer level) {
        if (pageSize <= 0) {
            pageSize = 10;
        }
@@ -627,8 +627,9 @@ public class DoctorInfoService extends BaseService {
        }
        filters.put("isFamous", new SearchFilter("isFamous", SearchFilter.Operator.EQ, type));
        filters.put("level", new SearchFilter("level", SearchFilter.Operator.EQ, 1));
        if(level!=null&&level>0&&level<4){
            filters.put("level", new SearchFilter("level", SearchFilter.Operator.EQ, level));
        }
        Specification<Doctor> spec = DynamicSpecifications.bySearchFilter(filters.values(), Doctor.class);
        return doctorDao.findAll(spec, pageRequest);

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

@@ -327,6 +327,7 @@ public class DoctorController extends BaseController {
     * 名医列表
     * @param key 医生名称
     * @param type 是否是名医 1是  0不是
     * @param level 医生的等级 1专科医生，2全科医生，3健康管理师 不传默认是全部
     * @param page 当前页
     * @param pagesize 每页显示条数
     * @return
@@ -335,12 +336,13 @@ public class DoctorController extends BaseController {
    @ResponseBody
    public String findFamousDoctor(
            @RequestParam(required = false) String key,
            @RequestParam(required = false)Integer level,
            Integer type,
            int page,
            int pagesize) {
        try {
            JSONArray array = new JSONArray();
            Page<Doctor> list = doctorInfoService.findFamousDoctor(key,type, page, pagesize);
            Page<Doctor> list = doctorInfoService.findFamousDoctor(key,type, page, pagesize,level);
            if (list != null) {
                for (Doctor doctor : list) {
                    JSONObject json = new JSONObject();

src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -376,20 +376,21 @@ public class DoctorConsultController extends WeixinBaseController {
	/**
	 * 根据医生code和和患者code判断是否有存在进行中的咨询
	 * @param patientCode
	 * @param patientCode 多个患者 逗号分隔
	 * @param doctor
	 * @return
	 * @return 只返回存在咨询的患者的code
     */
	@RequestMapping(value = "getConsultByPatientAndDoctor")
	@ResponseBody
	public String getConsultByPatientAndDoctor(String patientCode,String doctor) {
		try {
			JSONObject json = new JSONObject();
			ConsultTeam consultTeam= consultTeamService.getConsultByPatientAndDoctor(patientCode,doctor);
			if(consultTeam==null){
				json.put("hasConsult","0");
			}else{
				json.put("hasConsult","1");
			JSONArray json = new JSONArray();
			String []patients=patientCode.split(",");
			for(int i=0 ;i<patients.length;i++){
				ConsultTeam consultTeam= consultTeamService.getConsultByPatientAndDoctor(patients[i],doctor);
				if(consultTeam!=null){
					json.put(patients[i]);
				}
			}
			return json.toString();
		} catch (Exception e) {