wangyizhe/his
3
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

76 门诊预约挂号

Browse Source
This commit is contained in:
huabuweixin
2026-01-22 15:09:52 +08:00
parent 4450e3cc50
commit 0d57e984a6
13 changed files with 548 additions and 3820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/DoctorScheduleMapper.java
View File

@@ -10,4 +10,8 @@ public interface DoctorScheduleMapper extends BaseMapper<DoctorSchedule> {
* 自定义插入方法，排除id字段（数据库GENERATED ALWAYS）
*/
int insertWithoutId(DoctorSchedule doctorSchedule);
/**
* 自定义更新方法
*/
int updateDoctorSchedule(DoctorSchedule doctorSchedule);
}

2
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/mapper/OrderMapper.java
View File

@@ -27,7 +27,7 @@ public interface OrderMapper extends BaseMapper<Order> {
int countOrders(Map<String, Object> params);
Order selectOrderBySlotId(Long slotId);
List<Order> selectOrderBySlotId(Long slotId);
int updateOrderStatusById(Long id, Integer status);

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/IOrderService.java
View File

@@ -25,8 +25,7 @@ public interface IOrderService extends IService<Order> {
int countOrders(Map<String, Object> params);
Order selectOrderBySlotId(Long slotId);
List<Order> selectOrderBySlotId(Long slotId);
int updateOrderStatusById(Long id, Integer status);
int updateOrderCancelInfoById(Long id, java.util.Date cancelTime, String cancelReason);

3
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/OrderServiceImpl.java
View File

@@ -3,7 +3,6 @@ package com.openhis.clinical.service.impl;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.core.common.utils.AssignSeqUtil;
import com.core.common.utils.SecurityUtils;
import com.openhis.clinical.domain.Order;
import com.openhis.clinical.domain.Ticket;
import com.openhis.clinical.mapper.OrderMapper;
@@ -71,7 +70,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
}
@Override
public Order selectOrderBySlotId(Long slotId) {
public List<Order> selectOrderBySlotId(Long slotId) {
return orderMapper.selectOrderBySlotId(slotId);
}

8
openhis-server-new/openhis-domain/src/main/java/com/openhis/clinical/service/impl/TicketServiceImpl.java
View File

@@ -197,8 +197,8 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
throw new RuntimeException("号源不可取消预约");
}
Order order = orderService.selectOrderBySlotId(ticketId);
if (order != null) {
List<Order> orders = orderService.selectOrderBySlotId(ticketId);
for(Order order:orders){
orderService.cancelAppointmentOrder(order.getId(), "患者取消预约");
}
@@ -249,8 +249,8 @@ public class TicketServiceImpl extends ServiceImpl<TicketMapper, Ticket> impleme
}
// 检查是否存在相关订单，如果存在则取消
Order order = orderService.selectOrderBySlotId(ticketId);
if (order != null) {
List<Order> orders = orderService.selectOrderBySlotId(ticketId);
for(Order order:orders){
orderService.cancelAppointmentOrder(order.getId(), "医生停诊");
}

2
openhis-server-new/openhis-domain/src/main/resources/mapper/clinical/OrderMapper.xml
View File

@@ -119,6 +119,8 @@
<select id="selectOrderById" resultMap="OrderResult">
select * from order_main where id = #{id}
and status = 1
order by create_time desc
</select>
<select id="selectOrderBySlotId" resultMap="OrderResult">