diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java index f63290d2..2cff7c07 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/appservice/impl/TicketAppServiceImpl.java @@ -142,6 +142,7 @@ public class TicketAppServiceImpl implements ITicketAppService { // 基础字段映射 dto.setSlot_id(raw.getSlotId()); + dto.setSeqNo(raw.getSeqNo()); dto.setBusNo(String.valueOf(raw.getSlotId())); dto.setDoctor(raw.getDoctor()); dto.setDepartment(raw.getDepartmentName()); // 注意:以前这里传成了ID,导致前端出Bug,现在修复成了真正的科室名 @@ -319,6 +320,7 @@ public class TicketAppServiceImpl implements ITicketAppService { // --- 基础字段处理 --- // 注意:这里已经变成了极其舒服的 .getSlotId() 方法调用,告别魔鬼字符串! dto.setSlot_id(raw.getSlotId()); + dto.setSeqNo(raw.getSeqNo()); dto.setBusNo(String.valueOf(raw.getSlotId())); // 暂时借用真实槽位ID做唯一流水号 dto.setDoctor(raw.getDoctor()); dto.setDepartment(raw.getDepartmentName()); diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java index 74e94643..afc073a4 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/appointmentmanage/dto/TicketDto.java @@ -23,6 +23,11 @@ public class TicketDto { @JsonSerialize(using = ToStringSerializer.class) private Long slot_id; + /** + * 号源序号(对应 adm_schedule_slot.seq_no) + */ + private Integer seqNo; + /** * 号源编码 */ diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java index 351d1015..fa778a91 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/appointmentmanage/domain/TicketSlotDTO.java @@ -11,6 +11,7 @@ import java.time.LocalTime; public class TicketSlotDTO { // 基础信息 private Long slotId; + private Integer seqNo; private Long scheduleId; private String doctor; private Long doctorId; diff --git a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml index 7f50bfe3..f93a7e6c 100644 --- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml +++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/ScheduleSlotMapper.xml @@ -43,6 +43,7 @@ SELECT s.id AS slotId, + s.seq_no AS seqNo, p.schedule_id AS scheduleId, p.doctor_name AS doctor, p.doctor_id AS doctorId, @@ -205,6 +207,7 @@