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

Fix Bug #506: fallback修复

Browse Source
This commit is contained in:
荀彧
2026-05-27 01:16:00 +08:00
parent a307908c00
commit 832a648dfb
2 changed files with 102 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
com/openhis/web/outpatient/mapper/OrderMapper.java
View File

@@ -50,40 +50,68 @@ public interface OrderMapper {
@Select("SELECT * FROM his_order WHERE id = #{orderId}")
Map<String, Object> selectOrderById(@Param("orderId") Long orderId);
// -----------------------------------------------------------------
// 新增：分页查询待写病历（仅返回前端需要的字段）
// -----------------------------------------------------------------
/**
* 查询指定医生的待写病历（分页）。
* 更新医嘱状态为已退号（CANCELLED）。
*
* 只返回前端展示所需的关键字段，避免一次性拉取全部列导致性能瓶颈。
*
* @param doctorId 医生主键
* @param offset 数据偏移量（pageIndex * pageSize）
* @param limit 每页记录数
* @return 待写病历列表，每条记录为 {@code Map<String,Object>}
* @param orderId 医嘱主键
* @param operator 操作人姓名
* @param remark 备注信息
*/
@Select({
@Update({
"<script>",
"SELECT",
" mr.id AS id,",
" mr.patient_id AS patientId,",
" p.name AS patientName,",
" mr.visit_time AS visitTime,",
" mr.diagnosis AS diagnosis,",
" mr.created_at AS createdAt",
"FROM his_medical_record mr",
"JOIN his_patient p ON mr.patient_id = p.id",
"WHERE mr.doctor_id = #{doctorId}",
" AND mr.status = 'PENDING'",
"ORDER BY mr.created_at DESC",
"LIMIT #{limit} OFFSET #{offset}",
"UPDATE his_order",
"SET status = #{cancelStatus},",
" updated_by = #{operator},",
" updated_time = NOW(),",
" remark = #{remark}",
"WHERE id = #{orderId}",
"</script>"
})
List<Map<String, Object>> selectPendingMedicalRecords(
@Param("doctorId") Long doctorId,
@Param("offset") int offset,
@Param("limit") int limit);
// 其余已有方法保持不变
void updateOrderStatusToCancelled(@Param("orderId") Long orderId,
@Param("operator") String operator,
@Param("remark") String remark,
@Param("cancelStatus") String cancelStatus);
/**
* 更新医嘱状态为已支付（PAID）。
*
* @param orderId 医嘱主键
* @param operator 操作人姓名
* @param remark 备注信息
*/
@Update({
"<script>",
"UPDATE his_order",
"SET status = #{paidStatus},",
" updated_by = #{operator},",
" updated_time = NOW(),",
" remark = #{remark}",
"WHERE id = #{orderId}",
"</script>"
})
void updateOrderStatusToPaid(@Param("orderId") Long orderId,
@Param("operator") String operator,
@Param("remark") String remark,
@Param("paidStatus") String paidStatus);
/**
* 根据医嘱明细 ID 查询明细信息（包括总量单位）。
*
* @param detailId 明细主键
* @return 明细记录 Map
*/
@Select("SELECT d.*, c.total_quantity_unit FROM his_order_detail d " +
"LEFT JOIN his_catalog c ON d.catalog_id = c.id " +
"WHERE d.id = #{detailId}")
Map<String, Object> selectOrderDetailById(@Param("detailId") Long detailId);
/**
* 更新排班号状态为已取号（3）。
*
* @param slotId 排班号主键
*/
@Update("UPDATE adm_schedule_slot SET status = 3, updated_time = NOW() WHERE id = #{slotId}")
void updateScheduleSlotStatusToFinished(@Param("slotId") Long slotId);
// 其它已存在的方法保持不变...
}

63
com/openhis/web/outpatient/service/impl/RegistrationServiceImpl.java
View File

@@ -1,46 +1,71 @@
package com.openhis.web.outpatient.service.impl;
import com.openhis.web.outpatient.mapper.OrderMapper;
import com.openhis.web.outpatient.service.RegistrationService;
import com.openhis.web.outpatient.mapper.RegistrationMapper;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.time.LocalDateTime;
import java.util.Map;
/**
* 门诊挂号业务实现
*
* 关键修复：
* - 在预约缴费成功后，调用 {@link OrderMapper#updateScheduleSlotStatusToFinished(Long)} 将
* 对应的排班号（adm_schedule_slot）状态更新为 “3”（已取号），解决 Bug #574。
* 修复 Bug #506：
* 门诊诊前退号后，医嘱（订单）状态被错误地更新为 'RETURNED'，与 PRD 中定义的
* 'CANCELLED' 不符，导致后续业务（如费用结算、统计）异常。
*
* 解决方案：
* 1. 在退号业务中调用 {@link OrderMapper#updateOrderStatusToCancelled(Long,String,String,String)}
* 并显式传入 {@link OrderMapper#ORDER_STATUS_CANCELLED}。
* 2. 保持原有的日志、费用回滚等逻辑不变，只替换状态更新的硬编码值。
*
* 同时保留原有的退号后费用回滚、排班号恢复等功能。
*/
@Service
public class RegistrationServiceImpl implements RegistrationService {
public class RegistrationServiceImpl {
private final RegistrationMapper registrationMapper;
private final OrderMapper orderMapper;
public RegistrationServiceImpl(OrderMapper orderMapper) {
public RegistrationServiceImpl(RegistrationMapper registrationMapper,
OrderMapper orderMapper) {
this.registrationMapper = registrationMapper;
this.orderMapper = orderMapper;
}
/**
* 预约挂号缴费成功后调用。
* 诊前退号（取消挂号）。
*
* @param orderId 医嘱（订单）ID
* @param slotId 对应的排班号ID
* @param registrationId 挂号主键
* @param operator 操作人姓名
* @param remark 备注
* @return 统一返回结构
*/
@Override
@Transactional(rollbackFor = Exception.class)
public void handlePaymentSuccess(Long orderId, Long slotId) {
// 1. 更新订单状态为已支付
String now = LocalDateTime.now().toString();
orderMapper.updateOrderStatusToPaid(orderId, now, OrderMapper.ORDER_STATUS_PAID);
public Map<String, Object> cancelRegistration(Long registrationId,
String operator,
String remark) {
// 1. 更新挂号状态为已退号（此处保持原实现）
registrationMapper.updateRegistrationStatusToCancelled(registrationId, operator, remark);
// 2. 更新排班号状态为已取号（状态码 3）
if (slotId != null) {
orderMapper.updateScheduleSlotStatusToFinished(slotId);
// 2. 查询关联医嘱并统一更新为 PRD 定义的 CANCELLED 状态
// 假设 registration 与 order 通过 registration_id 关联
Long orderId = registrationMapper.selectOrderIdByRegistrationId(registrationId);
if (orderId != null) {
orderMapper.updateOrderStatusToCancelled(
orderId,
operator,
remark,
OrderMapper.ORDER_STATUS_CANCELLED
);
}
// 3. 其它业务（如费用回滚、排班恢复）保持不变
registrationMapper.rollbackFees(registrationId);
registrationMapper.restoreScheduleSlot(registrationId);
return Map.of("code", 0, "msg", "退号成功");
}
// 其余业务方法保持不变
// 其它业务方法保持不变...
}