|
|
@ -873,6 +873,7 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
expressageDO = objectMapper.readValue(expressageJson, WlyyPrescriptionExpressageDO.class);
|
|
|
if (null!=previous.getId()&&previous.getOneselfPickupFlg()!=expressageDO.getOneselfPickupFlg()){
|
|
|
WlyyOutpatientDO wlyyOutpatientDO = new WlyyOutpatientDO();
|
|
|
wlyyOutpatientDO.setOutpatientType(outpatientDO.getOutpatientType());
|
|
|
wlyyOutpatientDO.setRemindCount(previous.getOneselfPickupFlg());
|
|
|
return wlyyOutpatientDO;
|
|
|
}
|
|
|
@ -4221,17 +4222,31 @@ public class PrescriptionService extends BaseJpaService<WlyyPrescriptionDO, Pres
|
|
|
} else if ("videoOrderRemind".equalsIgnoreCase(titelType)) {
|
|
|
|
|
|
if ("16".equals(type)) {
|
|
|
first = "您的视频复诊已预约成功。";
|
|
|
contentMsg = "预计" + outpatientDO.getDoctorName() + "医生将于" + DateUtil.dateToStrLong(outpatientDO.getRegisterDate()) + " 与您进行视频复诊。请留意微信公众号消息。";
|
|
|
msgUrl="/ims-wx/index.html#/returnVisit/preChat?type=16&outpatientId="+outpatientId;
|
|
|
if (StringUtils.isNoneBlank(outpatientDO.getDoctorName())){
|
|
|
first = "您的视频复诊已预约成功。";
|
|
|
contentMsg = "预计" + outpatientDO.getDoctorName() + "医生将于" + DateUtil.dateToStrLong(outpatientDO.getRegisterDate()) + " 与您进行视频复诊。请留意微信公众号消息。";
|
|
|
}else {
|
|
|
first = outpatientDO.getPatientName()+"您好！您已成功发起快速视频复诊。";
|
|
|
contentMsg = "您已预约" + DateUtil.dateToStrLong(consultTeam.getCzrq()) + "的视频复诊 与您进行视频复诊。请留意微信公众号消息。请耐心等待医生接单。如长时间无医生接单，建议选择医生发起视频复诊";
|
|
|
}
|
|
|
logger.info("视频复诊已预约成功微信消息模板推送开始");
|
|
|
} else if ("17".equals(type)) {
|
|
|
first = "您的视频咨询已预约成功。";
|
|
|
contentMsg = "预计" + consDoctorDO.getName() + "医生将于" + DateUtil.dateToStrLong(consultTeam.getCzrq()) + " 与您进行视频咨询。请留意微信公众号消息。";
|
|
|
if (StringUtils.isNotEmpty(outpatientId)){
|
|
|
msgUrl="/ims-wx/index.html#/returnVisit/preChat?type=17&outpatientId="+outpatientId;
|
|
|
if (StringUtils.isNoneBlank(outpatientDO.getDoctorName())){
|
|
|
first = "您的视频咨询已预约成功。";
|
|
|
contentMsg = "预计" + outpatientDO.getDoctorName() + "医生将于" + DateUtil.dateToStrLong(consultTeam.getCzrq()) + " 与您进行视频咨询。请留意微信公众号消息。";
|
|
|
|
|
|
}else{
|
|
|
first = outpatientDO.getPatientName()+"您好！您已成功发起快速视频咨询。";
|
|
|
contentMsg = "您已预约" + DateUtil.dateToStrLong(consultTeam.getCzrq()) + "的视频咨询 与您进行视频咨询。请留意微信公众号消息。请耐心等待医生接单。如长时间无医生接单，建议选择医生发起视频咨询";
|
|
|
}
|
|
|
|
|
|
}else{
|
|
|
msgUrl="/ims-wx/index.html#/zx/prechat?consultCode="+consultTeam.getConsult();
|
|
|
contentMsg = "预计" + consDoctorDO.getName() + "医生将于" + DateUtil.dateToStrLong(consultTeam.getCzrq()) + " 与您进行视频咨询。请留意微信公众号消息。";
|
|
|
|
|
|
}
|
|
|
logger.info("视频咨询已预约成功微信消息模板推送开始");
|
|
|
}
|
