短信推送修改
This commit is contained in:
parent
5e8e4547fe
commit
85052ff89d
@ -2,7 +2,6 @@ package com.xinelu.quartz.service.impl;
|
|||||||
|
|
||||||
import com.aliyuncs.exceptions.ClientException;
|
import com.aliyuncs.exceptions.ClientException;
|
||||||
import com.xinelu.common.config.AliYunSmsTwoConfig;
|
import com.xinelu.common.config.AliYunSmsTwoConfig;
|
||||||
import com.xinelu.common.enums.PatientTypeEnum;
|
|
||||||
import com.xinelu.common.enums.RouteNodeNameEnum;
|
import com.xinelu.common.enums.RouteNodeNameEnum;
|
||||||
import com.xinelu.manage.dto.smssend.SmsInfoDTO;
|
import com.xinelu.manage.dto.smssend.SmsInfoDTO;
|
||||||
import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper;
|
import com.xinelu.manage.mapper.signpatientmanageroutenode.SignPatientManageRouteNodeMapper;
|
||||||
@ -59,38 +58,55 @@ public class SendTextMessageServiceImpl implements SendTextMessageService {
|
|||||||
if (StringUtils.isBlank(textMessage.getTextMessageId()) || !aliYunSmsTwoConfig.getTemplateCode().equals(textMessage.getTextMessageId())) {
|
if (StringUtils.isBlank(textMessage.getTextMessageId()) || !aliYunSmsTwoConfig.getTemplateCode().equals(textMessage.getTextMessageId())) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
//判断路径节点,组装数据
|
LocalDate localDate = null;
|
||||||
if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_DISCHARGE.getInfo()) || textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) {
|
if (Objects.nonNull(textMessage.getDischargeTime())) {
|
||||||
if (textMessage.getPatientType().equals(PatientTypeEnum.DISCHARGED_PATIENT.getInfo()) && Objects.nonNull(textMessage.getDischargeTime())) {
|
localDate = textMessage.getDischargeTime().plusDays(textMessage.getRouteNodeDay());
|
||||||
LocalDate localDate = textMessage.getDischargeTime().plusDays(textMessage.getRouteNodeDay());
|
}
|
||||||
|
if (Objects.isNull(textMessage.getDischargeTime()) && Objects.nonNull(textMessage.getVisitDate())) {
|
||||||
|
localDate = textMessage.getVisitDate().plusDays(textMessage.getRouteNodeDay());
|
||||||
|
}
|
||||||
|
if (Objects.isNull(localDate)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
|
boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
|
||||||
if (before) {
|
if (before) {
|
||||||
textMessage.setRouteNodeName(RouteNodeNameEnum.AFTER_DISCHARGE.getName());
|
textMessage.setRouteNodeName(RouteNodeNameEnum.AFTER_DISCHARGE.getName());
|
||||||
messages.add(textMessage);
|
messages.add(textMessage);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_ADMISSION.getInfo())) {
|
//判断路径节点,组装数据
|
||||||
if (textMessage.getPatientType().equals(PatientTypeEnum.IN_HOSPITAL_PATIENT.getInfo()) && Objects.nonNull(textMessage.getAdmissionTime())) {
|
// if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_DISCHARGE.getInfo()) || textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) {
|
||||||
LocalDate localDate = textMessage.getAdmissionTime().plusDays(textMessage.getRouteNodeDay());
|
// if (textMessage.getPatientType().equals(PatientTypeEnum.DISCHARGED_PATIENT.getInfo()) && Objects.nonNull(textMessage.getDischargeTime())) {
|
||||||
boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
|
// LocalDate localDate = textMessage.getDischargeTime().plusDays(textMessage.getRouteNodeDay());
|
||||||
if (before) {
|
// boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
|
||||||
textMessage.setRouteNodeName(RouteNodeNameEnum.AFTER_ADMISSION.getName());
|
// if (before) {
|
||||||
messages.add(textMessage);
|
// textMessage.setRouteNodeName(RouteNodeNameEnum.AFTER_DISCHARGE.getName());
|
||||||
}
|
// messages.add(textMessage);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_CONSULTATION.getInfo()) || textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) {
|
// }
|
||||||
if (textMessage.getPatientType().equals(PatientTypeEnum.OUTPATIENT.getInfo()) && textMessage.getAdmissionTime() == null && Objects.nonNull(textMessage.getVisitDate())) {
|
// if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_ADMISSION.getInfo())) {
|
||||||
LocalDate localDate = textMessage.getVisitDate().plusDays(textMessage.getRouteNodeDay());
|
// if (textMessage.getPatientType().equals(PatientTypeEnum.IN_HOSPITAL_PATIENT.getInfo()) && Objects.nonNull(textMessage.getAdmissionTime())) {
|
||||||
boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
|
// LocalDate localDate = textMessage.getAdmissionTime().plusDays(textMessage.getRouteNodeDay());
|
||||||
if (before) {
|
// boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
|
||||||
textMessage.setRouteNodeName(RouteNodeNameEnum.AFTER_CONSULTATION.getName());
|
// if (before) {
|
||||||
messages.add(textMessage);
|
// textMessage.setRouteNodeName(RouteNodeNameEnum.AFTER_ADMISSION.getName());
|
||||||
}
|
// messages.add(textMessage);
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
}
|
// }
|
||||||
|
// if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_CONSULTATION.getInfo()) || textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) {
|
||||||
|
// if (textMessage.getPatientType().equals(PatientTypeEnum.OUTPATIENT.getInfo()) && textMessage.getAdmissionTime() == null && Objects.nonNull(textMessage.getVisitDate())) {
|
||||||
|
// LocalDate localDate = textMessage.getVisitDate().plusDays(textMessage.getRouteNodeDay());
|
||||||
|
// boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
|
||||||
|
// if (before) {
|
||||||
|
// textMessage.setRouteNodeName(RouteNodeNameEnum.AFTER_CONSULTATION.getName());
|
||||||
|
// messages.add(textMessage);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
// }
|
||||||
//发送
|
//发送
|
||||||
if (CollectionUtils.isNotEmpty(messages)) {
|
if (CollectionUtils.isNotEmpty(messages)) {
|
||||||
List<Long> ids = new ArrayList<>();
|
List<Long> ids = new ArrayList<>();
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user