xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0418_小程序开发' of http://182.92.166.109:3000/zhuangyuanke/PostDischargePatientManage into 0418_小程序开发

Browse Source
This commit is contained in:
zhuangyuanke 2024-07-24 17:12:42 +08:00
commit 34438bbbd2
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java
View File

@ -96,7 +96,7 @@ public class TextMessageServiceImpl implements ITextMessageService {
public int insertTextMessage(TextMessageTaskDTO textMessageTaskDTO) { public int insertTextMessage(TextMessageTaskDTO textMessageTaskDTO) {
// 检查短信模板名称是否已存在 // 检查短信模板名称是否已存在
if (textMessageMapper.countByTextMessageTaskDTO(textMessageTaskDTO) > 0) { if (textMessageMapper.countByTextMessageTaskDTO(textMessageTaskDTO) > 0) {
throw new ServiceException("短信模板名称已存在"); throw new ServiceException("短信模板编号已存在");
} }
// 设置创建者和创建时间 // 设置创建者和创建时间
@ -104,7 +104,6 @@ public class TextMessageServiceImpl implements ITextMessageService {
LocalDateTime currentTime = LocalDateTime.now(); LocalDateTime currentTime = LocalDateTime.now();
textMessageTaskDTO.setCreateBy(currentUsername); textMessageTaskDTO.setCreateBy(currentUsername);
textMessageTaskDTO.setCreateTime(currentTime); textMessageTaskDTO.setCreateTime(currentTime);
textMessageTaskDTO.setTextMessageId(IdUtils.fastUUID());
// 将textMessageTaskDTO对象的属性复制到textMessage对象 // 将textMessageTaskDTO对象的属性复制到textMessage对象
TextMessage textMessage = new TextMessage(); TextMessage textMessage = new TextMessage();

3
postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml
View File

@ -153,8 +153,7 @@
parameterType="com.xinelu.manage.dto.textmessage.TextMessageTaskDTO"> parameterType="com.xinelu.manage.dto.textmessage.TextMessageTaskDTO">
select count(*) select count(*)
from text_message from text_message
where department_id = #{departmentId} where text_message_id = #{textMessageId}
and text_message_name = #{textMessageName}
</select> </select>
<select id="countByTextMessageNameExcludingId" resultType="java.lang.Integer"> <select id="countByTextMessageNameExcludingId" resultType="java.lang.Integer">

2
postdischarge-quartz/src/main/java/com/xinelu/quartz/service/SubscribeTaskService.java
View File

@ -9,7 +9,7 @@ public interface SubscribeTaskService {
/** /**
* 签约患者管理任务路径节点消息推送定时任务，每10分钟执行一次 * 签约患者管理任务路径节点消息推送定时任务
*/ */
void signPatientManageRouteNodeTask(); void signPatientManageRouteNodeTask();
} }

7
postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java
View File

@ -55,6 +55,10 @@ public class SendTextMessageServiceImpl implements SendTextMessageService {
if (StringUtils.isBlank(textMessage.getPatientType()) || Objects.isNull(textMessage.getRouteNodeDay())) { if (StringUtils.isBlank(textMessage.getPatientType()) || Objects.isNull(textMessage.getRouteNodeDay())) {
continue; continue;
} }
//模版暂时处理
if (StringUtils.isBlank(textMessage.getTextMessageId()) || !aliYunSmsTwoConfig.getTemplateCode().equals(textMessage.getTextMessageId())) {
continue;
}
//判断路径节点，组装数据 //判断路径节点，组装数据
if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_DISCHARGE.getInfo()) || textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) { if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_DISCHARGE.getInfo()) || textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) {
if (textMessage.getPatientType().equals(PatientTypeEnum.DISCHARGED_PATIENT.getInfo()) && Objects.nonNull(textMessage.getDischargeTime())) { if (textMessage.getPatientType().equals(PatientTypeEnum.DISCHARGED_PATIENT.getInfo()) && Objects.nonNull(textMessage.getDischargeTime())) {
@ -94,9 +98,8 @@ public class SendTextMessageServiceImpl implements SendTextMessageService {
SmsInfoDTO smsInfoDTO = new SmsInfoDTO(); SmsInfoDTO smsInfoDTO = new SmsInfoDTO();
smsInfoDTO.setPhoneNumbers(message.getPatientPhone()); smsInfoDTO.setPhoneNumbers(message.getPatientPhone());
smsInfoDTO.setSignName(aliYunSmsTwoConfig.getSignName()); smsInfoDTO.setSignName(aliYunSmsTwoConfig.getSignName());
smsInfoDTO.setTemplateCode(aliYunSmsTwoConfig.getTemplateCode());
// 根据模版id发送 // 根据模版id发送
//smsInfoDTO.setTemplateCode(message.getTextMessageId()); smsInfoDTO.setTemplateCode(message.getTextMessageId());
Boolean aBoolean = smsSendUtils.sendTextMessage(smsInfoDTO); Boolean aBoolean = smsSendUtils.sendTextMessage(smsInfoDTO);
if (aBoolean) { if (aBoolean) {
ids.add(message.getSignPatientManageRouteNodeId()); ids.add(message.getSignPatientManageRouteNodeId());

2
postdischarge-quartz/src/main/java/com/xinelu/quartz/task/SubscribeTask.java
View File

@ -19,7 +19,7 @@ public class SubscribeTask {
private SubscribeTaskService subscribeTaskService; private SubscribeTaskService subscribeTaskService;
/** /**
* 签约患者管理任务路径节点消息推送定时任务，每10分钟执行一次 * 签约患者管理任务路径节点消息推送定时任务
*/ */
public void automaticSendSignPatientManageRouteNodeTask() { public void automaticSendSignPatientManageRouteNodeTask() {
log.info("开始执行签约患者管理任务路径节点推送定时任务......"); log.info("开始执行签约患者管理任务路径节点推送定时任务......");