77 门诊挂号-》预约签到

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/ScheduleSlot.java

@@ -9,6 +9,8 @@ import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalTime;
+import java.util.Date;
+
 /**
  * 号源池明细Entity
  *
@@ -29,7 +31,7 @@ public class ScheduleSlot extends HisBaseEntity {
     /** 序号 */
     private Integer seqNo;
 
-    /** 序号状态: 0-可用,1-已预约,2-已取消,3-已过期等 */
+    /** 序号状态: 0-可用,1-已预约,2-已取消/已停诊,3-已锁定,4-已签到,5-已退号 */
     private Integer status;
 
     /** 预约订单ID */
@@ -37,4 +39,7 @@ public class ScheduleSlot extends HisBaseEntity {
 
     /** 预计叫号时间 */
     private LocalTime expectTime;
+
+    /** 签到时间 */
+    private Date checkInTime;
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java

@@ -22,6 +22,13 @@ public class TicketSlotDTO {
     private Long patientId;
     private String phone;
     private Integer orderStatus;
+    private Long orderId;
+    private String orderNo;
+    private String patientGender;
+    private Integer genderEnum;
+    private String idCard;
+    private String encounterId;
+    private String appointmentTime;
 
     // 底层逻辑判断专属字段
     private Integer slotStatus;

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/SchedulePoolMapper.java

@@ -37,4 +37,21 @@ public interface SchedulePoolMapper extends BaseMapper<SchedulePool> {
               AND p.delete_flag = '0'
             """)
     int refreshPoolStats(@Param("poolId") Long poolId);
+
+    /**
+     * 签到时更新号源池统计：锁定数-1，已预约数+1
+     *
+     * @param poolId 号源池ID
+     * @return 结果
+     */
+    @Update("""
+            UPDATE adm_schedule_pool
+            SET locked_num = locked_num - 1,
+                booked_num = booked_num + 1,
+                update_time = NOW()
+            WHERE id = #{poolId}
+              AND locked_num > 0
+              AND delete_flag = '0'
+            """)
+    int updatePoolStatsOnCheckIn(@Param("poolId") Integer poolId);
 }

openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/mapper/ScheduleSlotMapper.java

@@ -6,6 +6,7 @@ import com.openhis.appointmentmanage.domain.ScheduleSlot;
 import com.openhis.appointmentmanage.domain.TicketSlotDTO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.openhis.appointmentmanage.dto.TicketQueryDTO;
+import java.util.Date;
 import java.util.List;
 import org.springframework.stereotype.Repository;
 import org.apache.ibatis.annotations.Param;
@@ -30,6 +31,16 @@ public interface ScheduleSlotMapper extends BaseMapper<ScheduleSlot> {
      */
     int updateSlotStatus(@Param("slotId") Long slotId, @Param("status") Integer status);
 
+    /**
+     * 更新槽位状态并记录签到时间
+     *
+     * @param slotId      槽位ID
+     * @param status      状态
+     * @param checkInTime 签到时间
+     * @return 结果
+     */
+    int updateSlotStatusAndCheckInTime(@Param("slotId") Long slotId, @Param("status") Integer status, @Param("checkInTime") Date checkInTime);
+
     /**
      * 根据槽位ID查询所属号源池ID。
      */