diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java index 2a9b318d..ad3380ec 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/textmessage/impl/TextMessageServiceImpl.java @@ -96,7 +96,7 @@ public class TextMessageServiceImpl implements ITextMessageService { public int insertTextMessage(TextMessageTaskDTO textMessageTaskDTO) { // 检查短信模板名称是否已存在 if (textMessageMapper.countByTextMessageTaskDTO(textMessageTaskDTO) > 0) { - throw new ServiceException("短信模板名称已存在"); + throw new ServiceException("短信模板编号已存在"); } // 设置创建者和创建时间 @@ -104,7 +104,6 @@ public class TextMessageServiceImpl implements ITextMessageService { LocalDateTime currentTime = LocalDateTime.now(); textMessageTaskDTO.setCreateBy(currentUsername); textMessageTaskDTO.setCreateTime(currentTime); - textMessageTaskDTO.setTextMessageId(IdUtils.fastUUID()); // 将textMessageTaskDTO对象的属性复制到textMessage对象 TextMessage textMessage = new TextMessage(); diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/TextMessage.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/TextMessage.java index 389f9b5c..cfcdaa81 100644 --- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/TextMessage.java +++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/signpatientmanageroutenode/TextMessage.java @@ -8,7 +8,7 @@ import java.time.LocalDate; /** * @Description 查询短信发送实体类 * @Author zh - * @Date 2024-05-24 + * @Date 2024-07-22 */ @Data public class TextMessage { @@ -61,6 +61,9 @@ public class TextMessage { @ApiModelProperty(value = "短信推送标识,0:未开启,1:已开启") private Integer messagePushSign; + @ApiModelProperty(value = "短信ID") + private String textMessageId; + @ApiModelProperty(value = "节点id") private Long signPatientManageRouteNodeId; } diff --git a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml index f2993ff9..7b29eac6 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/signpatientmanageroutenode/SignPatientManageRouteNodeMapper.xml @@ -840,10 +840,12 @@ pi.admission_time, pi.discharge_time, pi.visit_date, - pi.visit_method + pi.visit_method, + tm.text_message_id from sign_patient_manage_route_node spmrn LEFT JOIN sign_patient_manage_route spmr ON spmr.id = spmrn.manage_route_id LEFT JOIN patient_info pi ON pi.id = spmr.patient_id + LEFT JOIN text_message tm ON tm.id = spmrn.message_template_id where spmrn.message_push_sign = 1 and spmrn.del_flag = 0 and spmrn.node_execute_status = 'UNEXECUTED' diff --git a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml index cc5a659d..05a0e748 100644 --- a/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml +++ b/postdischarge-manage/src/main/resources/mapper/manage/textmessage/TextMessageMapper.xml @@ -153,8 +153,7 @@ parameterType="com.xinelu.manage.dto.textmessage.TextMessageTaskDTO"> select count(*) from text_message - where department_id = #{departmentId} - and text_message_name = #{textMessageName} + where text_message_id = #{textMessageId}