|
|
@ -442,7 +442,9 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
" o.adm_date AS \"admDate\", " +
|
|
|
" o.con_date AS \"conDate\", " +
|
|
|
" o.description AS \"description\", " +
|
|
|
" o.disease_img AS \"diseaseImg\", ";
|
|
|
" o.disease_img AS \"diseaseImg\"," +
|
|
|
" o.consumer as \"consumer\"," +
|
|
|
" o.consumer_name as \"consumerName\", ";
|
|
|
if ("xm_ykyy_wx".equals(wechatId)) {
|
|
|
if (flag){
|
|
|
sql = sql + "date_format(o.create_time ,'%Y-%m-%d %H:%i:%S' ) AS createTime,";
|
|
|
@ -3681,7 +3683,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
if (StringUtils.isNotEmpty(outpatientId)){
|
|
|
outpatientDO = outpatientDao.findById(outpatientId);
|
|
|
doctorDO = baseDoctorDao.findById(outpatientDO.getDoctor());
|
|
|
patientDO = basePatientDao.findById(outpatientDO.getPatient());
|
|
|
patientDO = basePatientDao.findById(outpatientDO.getConsumer());
|
|
|
}
|
|
|
|
|
|
logger.info("titelType:"+titelType+"&&remindMsg:"+remindMsg+"&&type"+type);
|
|
|
@ -3693,30 +3695,30 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
if ("doctorRefuseRemind".equalsIgnoreCase(titelType)) {
|
|
|
if ("9".equals(type)) {
|
|
|
contentMsg = "医生已取消您的复诊申请，取消原因:"+remindMsg;
|
|
|
first = outpatientDO.getPatientName() + "，您好！您的图文复诊已取消";
|
|
|
first = outpatientDO.getConsumerName() + "，您好！您的图文复诊已取消";
|
|
|
|
|
|
}
|
|
|
if ("16".equals(type)) {
|
|
|
contentMsg = "医生已取消您的复诊申请，取消原因:"+remindMsg;
|
|
|
first = outpatientDO.getPatientName() + "，您好！您的视频复诊已取消";
|
|
|
first = outpatientDO.getConsumerName() + "，您好！您的视频复诊已取消";
|
|
|
}
|
|
|
logger.info("doctorRefuseRemind医生拒诊入参:outpatientId="+outpatientId);
|
|
|
msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
|
|
|
} else if("outPatientTimeOutRemind".equalsIgnoreCase(titelType)) {
|
|
|
contentMsg = "您邀请的医师暂无应答，您可以选择继续等待或者取消邀请。";
|
|
|
first = outpatientDO.getPatientName() + "，您好！";
|
|
|
first = outpatientDO.getConsumerName() + "，您好！";
|
|
|
logger.info("outPatientTimeOutRemind:outpatientId="+outpatientId+"contentMsg"+contentMsg);
|
|
|
msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
|
|
|
} else if ("payRemind".equalsIgnoreCase(titelType)) {
|
|
|
|
|
|
if ("9".equals(type)) {
|
|
|
contentMsg = "请您先完成预交金充值发起在线问诊，点击详情进行预交金充值，如您已完成请忽略本条信息。";//您有一个图文复诊订单待支付，点击完成支付，如您已支付请忽略本条信息
|
|
|
first = outpatientDO.getPatientName() + "，您好！您有一笔未完成的在线问诊订单，请及时处理。";//您有一个图文复诊订单待支付，请及时支付。
|
|
|
first = outpatientDO.getConsumerName() + "，您好！您有一笔未完成的在线问诊订单，请及时处理。";//您有一个图文复诊订单待支付，请及时支付。
|
|
|
msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
|
|
|
logger.info("图文复诊订单待支付微信消息模板推送开始");
|
|
|
} else if ("16".equals(type)) {
|
|
|
contentMsg = "请您先完成预交金充值发起在线问诊，点击详情进行预交金充值，如您已完成请忽略本条信息。";//您有一个视频复诊订单待支付，点击完成支付，如您已支付请忽略本条信息
|
|
|
first = outpatientDO.getPatientName() + "，您好！您有一笔未完成的在线问诊订单，请及时处理。";//您有一个视频复诊订单待支付，请及时支付。
|
|
|
first = outpatientDO.getConsumerName() + "，您好！您有一笔未完成的在线问诊订单，请及时处理。";//您有一个视频复诊订单待支付，请及时支付。
|
|
|
msgUrl="/ims-wx/index.html#/returnVisit/record?outpatientId="+outpatientId;
|
|
|
logger.info("视频复诊订单待支付微信消息模板推送开始");
|
|
|
}
|
|
|
@ -3733,13 +3735,13 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
}
|
|
|
|
|
|
} else if ("prescriptionPayRemind".equalsIgnoreCase(titelType)) {
|
|
|
first = outpatientDO.getPatientName() + "，您好！ 医生已为您开具处方，请及时支付。";
|
|
|
first = outpatientDO.getConsumerName() + "，您好！ 医生已为您开具处方，请及时支付。";
|
|
|
contentMsg = "医生已为您开具处方，请及时支付。";
|
|
|
remark = "点击完成支付，如您已支付请忽略本条信息";
|
|
|
msgUrl="/ims-wx/index.html#/returnVisit/prescriptionDetail?outpatientId="+outpatientId+"&id="+remindMsg;
|
|
|
logger.info("处方支付微信消息模板推送开始");
|
|
|
} else if ("msgRemind".equalsIgnoreCase(titelType)) {
|
|
|
first = outpatientDO.getPatientName() + "，您好！";
|
|
|
first = outpatientDO.getConsumerName() + "，您好！";
|
|
|
contentMsg = "" + remindMsg;
|
|
|
remark = "请您尽快回复";
|
|
|
} else if ("outpatientMsgRemind".equalsIgnoreCase(titelType)) {
|
|
|
@ -3808,7 +3810,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
}
|
|
|
|
|
|
if (ps.isEmpty()) {
|
|
|
logger.info("该用户" + outpatientDO.getPatientName() + "没有openid,无法推送模版消息，用户ID：" + outpatientDO.getPatient() + "wechatId:" + wxId);
|
|
|
logger.info("该用户" + outpatientDO.getConsumerName() + "没有openid,无法推送模版消息，用户ID：" + outpatientDO.getPatient() + "wechatId:" + wxId);
|
|
|
return;
|
|
|
}
|
|
|
String scene = "";
|
|
|
@ -3817,7 +3819,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
scene = "ysqxjz";
|
|
|
WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_doctor_notice", scene, 1);
|
|
|
BeanUtils.copyProperties(config, newConfig);
|
|
|
newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getPatientName()));
|
|
|
newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getConsumerName()));
|
|
|
if ("9".equals(type)) {
|
|
|
newConfig.setFirst(newConfig.getFirst().replace("key2", "图文复诊"));
|
|
|
} else if ("16".equals(type)) {
|
|
|
@ -3842,7 +3844,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
if (StringUtils.isNotEmpty(outpatientId)){
|
|
|
WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_pay_notice_jz", scene, 1);
|
|
|
BeanUtils.copyProperties(config, newConfig);
|
|
|
newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getPatientName()));
|
|
|
newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getConsumerName()));
|
|
|
if ("9".equals(type)) {
|
|
|
newConfig.setFirst(newConfig.getFirst().replace("key2", "图文复诊"));
|
|
|
newConfig.setKeyword1( "图文复诊支付");
|
|
|
@ -3880,7 +3882,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_prescription_pay_notice", scene, 1);
|
|
|
|
|
|
BeanUtils.copyProperties(config, newConfig);
|
|
|
newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getPatientName()));
|
|
|
newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getConsumerName()));
|
|
|
newConfig.setKeyword1( "处方支付");
|
|
|
newConfig.setKeyword2(outpatientDO.getHospitalName());
|
|
|
newConfig.setKeyword3( outpatientDO.getDoctorName());
|
|
|
@ -3891,7 +3893,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
scene = "zxxxtx";
|
|
|
WxTemplateConfigDO config = wxTemplateConfigDao.findByWechatIdAndTemplateNameAndSceneAndStatus(wechatId, "template_msg_notice", scene, 1);
|
|
|
BeanUtils.copyProperties(config, newConfig);
|
|
|
newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getPatientName()));
|
|
|
newConfig.setFirst(config.getFirst().replace("key1", outpatientDO.getConsumerName()));
|
|
|
newConfig.setKeyword1( remindMsg);
|
|
|
newConfig.setKeyword2( DateUtil.getStringDate());
|
|
|
//发起微信消息模板推送
|
|
|
@ -3946,7 +3948,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
if ("16".equals(type)) {
|
|
|
newConfig.setFirst(config.getFirst().replaceFirst("key1", "视频复诊"));
|
|
|
}
|
|
|
newConfig.setKeyword1( outpatientDO.getPatientName());
|
|
|
newConfig.setKeyword1( outpatientDO.getConsumerName());
|
|
|
newConfig.setKeyword2( outpatientDO.getDeptName());
|
|
|
newConfig.setKeyword3( outpatientDO.getDoctorName());
|
|
|
newConfig.setKeyword4(DateUtil.dateToStrLong(outpatientDO.getRegisterDate()));
|
|
|
@ -4004,7 +4006,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
wxPushLogDO.setOpenid(one.getOpenid());
|
|
|
wxPushLogDO.setReceiver(outpatientDO.getPatient());
|
|
|
wxPushLogDO.setWechatId(wechatId);
|
|
|
wxPushLogDO.setReceiverName(outpatientDO.getPatientName());
|
|
|
wxPushLogDO.setReceiverName(outpatientDO.getConsumerName());
|
|
|
wxPushLogDO.setScene(scene);
|
|
|
wxPushLogDao.save(wxPushLogDO);
|
|
|
}
|
wangzhinan