一对一聊天接口、名医列表接口

src/main/java/com/yihu/wlyy/service/app/talk/TalkGroupService.java

@@ -333,9 +333,10 @@ public class TalkGroupService extends BaseService {
     * 获取以上一对一聊天
     *
     * @param doctor
     * @param doctorName
     * @return
     */
    public JSONArray getOneToOneIm(String doctor) throws UnsupportedEncodingException {
    public JSONArray getOneToOneIm(String doctor,String doctorName) throws UnsupportedEncodingException {
        JSONArray result = null;
        JSONArray resultArray = new JSONArray();
        String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
@@ -356,10 +357,17 @@ public class TalkGroupService extends BaseService {
                        continue;
                    }
                    if(!StringUtils.isEmpty(doctorName)){
                        if(!fromDoctor.getName().contains(doctorName)){
                            continue;
                        }
                    }
                    objRe.put("uid",obj.getString("uid"));
                    objRe.put("fromUid",obj.getString("peer_uid"));
                    objRe.put("fromName",fromDoctor.getName());
                    objRe.put("fromLevel",fromDoctor.getLevel());
                    objRe.put("photo",StringUtils.isEmpty(fromDoctor.getPhoto())?"":fromDoctor.getPhoto());
                    objRe.put("sex",fromDoctor.getSex());
                    objRe.put("lastContentType",obj.getInt("last_content_type"));
                    objRe.put("lastContent",new String(obj.getString("last_content").getBytes(),"utf-8"));

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

@@ -130,6 +130,14 @@ public class DoctorConsultController extends WeixinBaseController {
					if (doctor == null) {
						continue;
					}
					// 判断名医是否在工作
					JSONObject isWorking = doctorWorkTimeService.isFamousDoctorWorking(doctor.getCode());
					if(isWorking == null || !isWorking.getString("status").equals("1")){
						continue;
					}
					JSONObject json = new JSONObject();
					json.put("id", doctor.getId());
					// 医生标识

src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@@ -521,7 +521,7 @@ public class DoctorDiscussionGroupController extends BaseController {
					}
				}
			}else if(groups != null){
				jsonArray.put(new JSONArray(groups));
				jsonArray = new JSONArray(groups);
			}
			return write(200, "获取医生讨论组成功!","data",jsonArray);
@@ -665,17 +665,14 @@ public class DoctorDiscussionGroupController extends BaseController {
	/**
	 * 获取医生一对一聊天
	 *
	 * @param doctor
	 * @param doctorName
	 * @return
	 */
	@RequestMapping(value = "/one_to_one_im")
	@ResponseBody
	public String getOneToOneIm(String doctor){
	public String getOneToOneIm(@RequestParam(required = false) String doctorName){
		try{
			if(org.springframework.util.StringUtils.isEmpty(doctor)){
				doctor = getUID();
			}
			JSONArray result = talkGroupService.getOneToOneIm(doctor);
			JSONArray result = talkGroupService.getOneToOneIm(getUID(),doctorName);
			return write(200,"查询成功","data",result);
		}catch (Exception e){

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

@@ -376,6 +376,14 @@ public class ConsultController extends WeixinBaseController {
					if (doctor == null) {
						continue;
					}
					// 判断名医是否在工作
					JSONObject isWorking = doctorWorkTimeService.isFamousDoctorWorking(doctor.getCode());
					if(isWorking == null || !isWorking.getString("status").equals("1")){
						continue;
					}
					JSONObject json = new JSONObject();
					json.put("id", doctor.getId());
					// 医生标识