diff --git a/GIT_TEST_CHENLIN.md b/GIT_TEST_CHENLIN.md new file mode 100644 index 00000000..3ee442a4 --- /dev/null +++ b/GIT_TEST_CHENLIN.md @@ -0,0 +1 @@ +陈琳Git提交测试 - 2026-04-14 16:57:08 diff --git a/TEST.md b/TEST.md new file mode 100644 index 00000000..ee473aa2 --- /dev/null +++ b/TEST.md @@ -0,0 +1 @@ +# 张飞测试记录 diff --git a/ZHAOYUN_TEST.md b/ZHAOYUN_TEST.md new file mode 100644 index 00000000..e648f9ee --- /dev/null +++ b/ZHAOYUN_TEST.md @@ -0,0 +1 @@ +# 赵云测试提交 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 720b1466..72c652fb 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 @@ -153,7 +153,9 @@ public class TicketAppServiceImpl implements ITicketAppService { dto.setIdCard(raw.getIdCard()); dto.setDoctorId(raw.getDoctorId()); dto.setDepartmentId(raw.getDepartmentId()); - dto.setRealPatientId(raw.getPatientId()); + dto.setRealPatientId(raw.getPatientId()); + dto.setOrderId(raw.getOrderId()); + dto.setOrderNo(raw.getOrderNo()); // 性别处理:直接使用患者表中的 genderEnum Integer genderEnum = raw.getGenderEnum(); 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 afc073a4..6d3bba6c 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 @@ -115,4 +115,15 @@ public class TicketDto { * 身份证号 */ private String idCard; + + /** + * 预约订单ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orderId; + + /** + * 预约订单号 + */ + private String orderNo; } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java index 2fcba3d2..62236dd8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/CurrentDayEncounterDto.java @@ -146,4 +146,11 @@ public class CurrentDayEncounterDto { */ private Integer displayOrder; + /** + * 是否来自预约签到 + * true: 预约签到 + * false: 正常挂号 + */ + private Boolean isFromAppointment; + } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java index c75000fd..4910a375 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/chargemanage/dto/EncounterFormData.java @@ -72,6 +72,12 @@ public class EncounterFormData { @JsonSerialize(using = ToStringSerializer.class) private Long organizationId; + /** + * 预约订单ID(用于预约签到时关联预约订单) + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long orderId; + /** * 设置默认值 */ diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml index 2f5fa0e8..311345e3 100644 --- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml +++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientRegistrationAppMapper.xml @@ -67,7 +67,8 @@ T9.payment_id AS paymentId, T9.picture_url AS pictureUrl, T9.birth_date AS birthDate, - COALESCE(T9.identifier_no, T9.patient_bus_no, '') AS identifierNo + COALESCE(T9.identifier_no, T9.patient_bus_no, '') AS identifierNo, + COALESCE(T9.order_id IS NOT NULL, false) AS isFromAppointment from ( SELECT T1.tenant_id AS tenant_id, T1.id AS encounter_id, @@ -93,7 +94,8 @@ ai.picture_url AS picture_url, T8.birth_date AS birth_date, T8.bus_no AS patient_bus_no, - T18.identifier_no AS identifier_no + T18.identifier_no AS identifier_no, + T1.order_id AS order_id FROM adm_encounter AS T1 LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0' LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0' diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java index 43cfb365..4e374b7d 100644 --- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java +++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/administration/domain/Encounter.java @@ -151,4 +151,9 @@ public class Encounter extends HisBaseEntity { */ @TableField("missed_time") private Date missedTime; + + /** + * 预约订单ID + */ + private Long orderId; } diff --git a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue index 2de232eb..46362db0 100644 --- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue +++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue @@ -445,7 +445,13 @@ prop="healthcareName" :show-overflow-tooltip="true" width="200" - /> + > + +