367

门诊医生站：检验开单“免疫”类别下的检验项目取值错误，与后台维护数据不一致
357
门诊挂号：通过“预约签到”产生的记录，列表“挂号类型”未体现预约标识

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();

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;
 }

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;
+
 }

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;
+
     /**
      * 设置默认值
      */

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'