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

patient-co-manage/wlyy-manage/src/main/java/com/yihu/wlyy/service/manager/sign/SignFamilyService.java

@@ -343,7 +343,7 @@ public class SignFamilyService extends BaseJpaService<SignFamily,Long> {
            }
            //更新IM内医生信息
            String sessionId = signFamily.getPatient()+"_consult_"+signFamily.getType();
            String imAddr = imUrl+"sessions/"+sessionId+"/participant/update";
            String imAddr = imUrl+"/sessions/"+sessionId+"/participant/update";
            JSONObject healthyparams = new JSONObject();
            if(!StringUtils.isEmpty(doctorHealth)) {
                healthyparams.put("user_id", signFamily.getDoctorHealth());

patient-co-manage/wlyy-manage/src/main/webapp/WEB-INF/views/team/patient/sign_family_allocate_js.jsp

@@ -253,7 +253,8 @@
									parent.window.closeAllocateDialog(res.msg);
									//$.Notice.success(data.msg);
								} else {
									$.Notice.error(data.msg);
									$.Notice.error(res.msg);
//									$.Notice.error(data.msg);
								}
							},
							error: function (data) {