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