Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -2289,7 +2289,7 @@ public class FamilyContractService extends BaseService {
                " wlyy_sign_family sf " +
                " WHERE " +
                " sf.type = 2 " +
                " AND sf.STATUS >= 0 " +
                " AND sf.STATUS > 0 " +
                " AND ( sf.doctor = ? or sf.doctor_health=? )" +
                " AND sf.admin_team_code =?";
        Object[] parms = new Object[]{doctorCode, doctorCode, teamCode};

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/guahao/GuahaoXMService.java

@@ -497,7 +497,7 @@ public class GuahaoXMService implements IGuahaoService {
                }
                if(StringUtils.isNotBlank(dcode)){
                    reservation.setDoctor(dcode);//代理签约维护待签约人编码
                    SendP2PUtil.sendP2Pmsg(dcode,patient,"1","我已成功为您预约："+startTime+"，"+hospitalName+hosDeptName+doctorName+"医生的号源。您可直接前往医院就诊</br><a name='guahao' href='javascript:void(0)' data-id='"+code+"'>点击查看详情</a>");
                    SendP2PUtil.sendP2Pmsg(dcode,patient,"-1","我已成功为您预约："+startTime+"，"+hospitalName+hosDeptName+doctorName+"医生的号源。您可直接前往医院就诊</br>");
                }
                // 保存预约记录
                patientReservationDao.save(reservation);

patient-co-wlyy/src/main/java/com/yihu/wlyy/util/SendP2PUtil.java

@@ -13,6 +13,9 @@ public class SendP2PUtil {
		String url = SystemConf.getInstance().getSystemProperties().getProperty("im_list_get")
				+ "api/v1/chats/pm";
		List<NameValuePair> params = new ArrayList<>();
		if(!"4".equals(contentType)){
			contentType = "-1";
		}
		params.add(new BasicNameValuePair("from", from));
		params.add(new BasicNameValuePair("to", to));
		params.add(new BasicNameValuePair("content",  content));