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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/SpecialistService.java

@@ -282,7 +282,7 @@ public class SpecialistService extends BaseService {
        param.put("size", size);
        HttpResponse response = HttpUtils.doGet(specialistUrl + "svr-specialist/getPatientByLabel", param);
        JSONObject rs = new JSONObject(response.getContent());
        if ("succes".equals(rs.getString("message"))) {
        if ("success".equals(rs.getString("message"))) {
            return rs.getJSONArray("obj");
        }
        return null;

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/specialist/rehabilitation/RehabilitationManageService.java

@@ -217,8 +217,10 @@ public class RehabilitationManageService extends BaseService {
            List<SignFamily> list = signFamilyDao.findByPatientAndExpensesStatusAndStatus(patient,"1",1);
            if(list.size()>0){
                result.getJSONObject("obj").put("familyDoctorCode",list.get(0).getDoctor());
                result.getJSONObject("obj").put("familyDoctorName",list.get(0).getDoctorName());
            }else{
                result.getJSONObject("obj").put("familyDoctorCode","");
                result.getJSONObject("obj").put("familyDoctorName","");
            }
            return result.getJSONObject("obj");
        }