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

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

@@ -1564,7 +1564,11 @@ public class FamilyContractService extends BaseService {
            json.put("doctorName", StringUtils.isEmpty(sf.getDoctor()) ? sf.getDoctorHealthName() : sf.getDoctorName());
            json.put("date", DateUtil.dateToStrShort(new Date()));
            json.put("content", sf.getName() + "，您好！您与 " + (StringUtils.isEmpty(sf.getDoctor()) ? sf.getDoctorHealthName() : sf.getDoctorName()) + " 医生建立家庭医生签约关系失败，请查看！");
            json.put("remark", "您好，签约家庭医生失败通知");
            if (StringUtils.isNotEmpty(refuseReason)){
                json.put("remark", refuseReason);
            }else {
                json.put("remark", "您好，签约家庭医生失败通知");
            }
            if (StringUtils.isNotBlank(sf.getOpenid())) {
                // 添加到发送队列