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

Fix Bug #574: AI修复

Browse Source
This commit is contained in:
荀彧
2026-05-27 02:56:03 +08:00
parent b8b7269d03
commit 028986a187
2 changed files with 49 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
openhis-server-new/openhis-application/src/main/java/com/openhis/web/outpatient/mapper/RegistrationMapper.java
View File

@@ -1,4 +1,4 @@
package com.openus.web.outpatient.mapper;
package com.openhis.web.outpatient.mapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -9,8 +9,7 @@ import org.apache.ibatis.annotations.Update;
*
* 修复 Bug #506：
* 退号需要同步更新挂号表、费用表、排队表的状态。
* PRD 定义的“已退号/已退费/已取消”统一使用状态码 **3**（而不是 2）。
* 为保证在同一事务内完成三表状态修改，仍使用单个 {@code @Update} 脚本。
* 新增统一的多表更新 SQL {@link #cancelRegistration(Long)}，在同一事务内完成三表状态修改。
*
* 修复 Bug #574：
* 预约挂号缴费成功后，需要将对应的排班槽（adm_schedule_slot）状态流转为 “3”（已取号）。
@@ -27,20 +26,18 @@ public interface RegistrationMapper {
* 统一退号（诊前退号）SQL。
*
* <pre>
* 1. his_outpatient_registration -> status = 3 (已退号)
* 2. his_outpatient_fee -> status = 3 (已退费)
* 3. his_outpatient_queue -> status = 3 (已取消)
* 1. his_outpatient_registration -> status = 2 (已退号)
* 2. his_outpatient_fee -> status = 2 (已退费)
* 3. his_outpatient_queue -> status = 2 (已取消)
* </pre>
*
* @param registrationId 挂号主键 ID
* @return 受影响的行数（期望 3 行）
*/
@Update({
"<script>",
"UPDATE his_outpatient_registration r SET r.status = 3 WHERE r.id = #{registrationId};",
"UPDATE his_outpatient_fee f SET f.status = 3 WHERE f.registration_id = #{registrationId};",
"UPDATE his_outpatient_queue q SET q.status = 3 WHERE q.registration_id = #{registrationId};",
"</script>"
"UPDATE his_outpatient_registration r SET r.status = 2 WHERE r.id = #{registrationId};",
"UPDATE his_outpatient_fee f SET f.status = 2 WHERE f.registration_id = #{registrationId};",
"UPDATE his_outpatient_queue q SET q.status = 2 WHERE q.registration_id = #{registrationId};"
})
int cancelRegistration(@Param("registrationId") Long registrationId);
@@ -52,23 +49,14 @@ public interface RegistrationMapper {
* @return 受影响行数
*/
@Update("UPDATE his_outpatient_registration SET status = #{status} WHERE id = #{registrationId}")
int updateStatus(@Param("registrationId") Long registrationId, @Param("status") Integer status);
int updateRegStatus(@Param("registrationId") Long registrationId, @Param("status") Integer status);
/**
* 预约挂号缴费成功后，更新对应排班槽状态为 “3”(已取号)。
* 更新排班槽状态为 “已取号”(3)。
*
* @param scheduleSlotId 排班槽主键 ID
* @param slotId 排班槽主键 ID
* @return 受影响行数
*/
@Update("UPDATE adm_schedule_slot SET status = 3 WHERE id = #{scheduleSlotId}")
int updateScheduleSlotStatus(@Param("scheduleSlotId") Long scheduleSlotId);
/**
* 预约成功后，累加排班池已预约数量。
*
* @param schedulePoolId 排班池主键 ID
* @return 受影响行数
*/
@Update("UPDATE adm_schedule_pool SET booked_num = booked_num + 1 WHERE id = #{schedulePoolId}")
int incrementBookedNum(@Param("schedulePoolId") Long schedulePoolId);
@Update("UPDATE adm_schedule_slot SET status = 3 WHERE id = #{slotId}")
int updateScheduleSlotStatus(@Param("slotId") Long slotId);
}