diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/DiagnosisSaveDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/DiagnosisSaveDto.java
new file mode 100644
index 000000000..d3c0e3d0f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/DiagnosisSaveDto.java
@@ -0,0 +1,19 @@
+package com.openhis.application.domain.dto;
+
+import java.util.List;
+
+public class DiagnosisSaveDto {
+    private Long visitId;
+    private List<String> diagnosisCodes;
+    private String diagnosisType;
+    private String notes;
+
+    public Long getVisitId() { return visitId; }
+    public void setVisitId(Long visitId) { this.visitId = visitId; }
+    public List<String> getDiagnosisCodes() { return diagnosisCodes; }
+    public void setDiagnosisCodes(List<String> diagnosisCodes) { this.diagnosisCodes = diagnosisCodes; }
+    public String getDiagnosisType() { return diagnosisType; }
+    public void setDiagnosisType(String diagnosisType) { this.diagnosisType = diagnosisType; }
+    public String getNotes() { return notes; }
+    public void setNotes(String notes) { this.notes = notes; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/DiagnosisSaveResultDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/DiagnosisSaveResultDto.java
new file mode 100644
index 000000000..a73b5f91e
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/DiagnosisSaveResultDto.java
@@ -0,0 +1,14 @@
+package com.openhis.application.domain.dto;
+
+public class DiagnosisSaveResultDto {
+    private Long diagnosisId;
+    private boolean success;
+    private String message;
+
+    public Long getDiagnosisId() { return diagnosisId; }
+    public void setDiagnosisId(Long diagnosisId) { this.diagnosisId = diagnosisId; }
+    public boolean isSuccess() { return success; }
+    public void setSuccess(boolean success) { this.success = success; }
+    public String getMessage() { return message; }
+    public void setMessage(String message) { this.message = message; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/MedicalRecordDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/MedicalRecordDto.java
new file mode 100644
index 000000000..377b59612
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/MedicalRecordDto.java
@@ -0,0 +1,31 @@
+package com.openhis.application.domain.dto;
+
+import java.util.Date;
+
+public class MedicalRecordDto {
+    private Long id;
+    private Long visitId;
+    private Long patientId;
+    private String patientName;
+    private Long doctorId;
+    private String chiefComplaint;
+    private String status;
+    private Date createTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getVisitId() { return visitId; }
+    public void setVisitId(Long visitId) { this.visitId = visitId; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public String getPatientName() { return patientName; }
+    public void setPatientName(String patientName) { this.patientName = patientName; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getChiefComplaint() { return chiefComplaint; }
+    public void setChiefComplaint(String chiefComplaint) { this.chiefComplaint = chiefComplaint; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderVerifyDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderVerifyDto.java
index 45173ae00..ea70c21eb 100644
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderVerifyDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/OrderVerifyDto.java
@@ -1,30 +1,17 @@
 package com.openhis.application.domain.dto;
 
-import lombok.Data;
-import java.math.BigDecimal;
-import java.util.Date;
-
-/**
- * 医嘱校对列表 DTO
- * 修复 Bug #595：补充结构化字段，确保与医生站要素一致，支持三查七对
- */
-@Data
 public class OrderVerifyDto {
-    private Long id;
-    private String orderNo;
-    private String patientName;
-    private String bedNo;
-    private Date startTime;
-    private BigDecimal singleDose;
-    private BigDecimal totalAmount;
-    private BigDecimal totalPrice;
-    private String frequencyUsage;
-    private String orderingDoctor;
-    private Date stopTime;
-    private String stoppingDoctor;
-    private String drugName;
-    /** 皮试状态: 0-无需, 1-需皮试, 2-皮试通过, 3-皮试未通过 */
-    private Integer skinTestStatus;
-    private String diagnosis;
-    private String status;
+    private Long orderId;
+    private Long nurseId;
+    private String verifyStatus;
+    private String remark;
+
+    public Long getOrderId() { return orderId; }
+    public void setOrderId(Long orderId) { this.orderId = orderId; }
+    public Long getNurseId() { return nurseId; }
+    public void setNurseId(Long nurseId) { this.nurseId = nurseId; }
+    public String getVerifyStatus() { return verifyStatus; }
+    public void setVerifyStatus(String verifyStatus) { this.verifyStatus = verifyStatus; }
+    public String getRemark() { return remark; }
+    public void setRemark(String remark) { this.remark = remark; }
 }
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/QueuePatientDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/QueuePatientDto.java
new file mode 100644
index 000000000..6d7f3dfc1
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/QueuePatientDto.java
@@ -0,0 +1,20 @@
+package com.openhis.application.domain.dto;
+
+public class QueuePatientDto {
+    private Long id;
+    private Long patientId;
+    private String patientName;
+    private String queueNumber;
+    private String status;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public String getPatientName() { return patientName; }
+    public void setPatientName(String patientName) { this.patientName = patientName; }
+    public String getQueueNumber() { return queueNumber; }
+    public void setQueueNumber(String queueNumber) { this.queueNumber = queueNumber; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/SurgeryApplyDTO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/SurgeryApplyDTO.java
new file mode 100644
index 000000000..4b255d394
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/SurgeryApplyDTO.java
@@ -0,0 +1,25 @@
+package com.openhis.application.domain.dto;
+
+import java.util.Date;
+
+public class SurgeryApplyDTO {
+    private Long id;
+    private Long patientId;
+    private String surgeryName;
+    private Date scheduledDate;
+    private String status;
+    private String notes;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public String getSurgeryName() { return surgeryName; }
+    public void setSurgeryName(String surgeryName) { this.surgeryName = surgeryName; }
+    public Date getScheduledDate() { return scheduledDate; }
+    public void setScheduledDate(Date scheduledDate) { this.scheduledDate = scheduledDate; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public String getNotes() { return notes; }
+    public void setNotes(String notes) { this.notes = notes; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/TriageQueueQueryDTO.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/TriageQueueQueryDTO.java
new file mode 100644
index 000000000..48209b414
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/dto/TriageQueueQueryDTO.java
@@ -0,0 +1,17 @@
+package com.openhis.application.domain.dto;
+
+public class TriageQueueQueryDTO {
+    private Long doctorId;
+    private String status;
+    private Integer page;
+    private Integer size;
+
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public Integer getPage() { return page; }
+    public void setPage(Integer page) { this.page = page; }
+    public Integer getSize() { return size; }
+    public void setSize(Integer size) { this.size = size; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/Diagnosis.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/Diagnosis.java
new file mode 100644
index 000000000..f91ca3343
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/Diagnosis.java
@@ -0,0 +1,34 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class Diagnosis {
+    private Long id;
+    private Long visitId;
+    private String diagnosisCode;
+    private String diagnosisName;
+    private String diagnosisType;
+    private Long doctorId;
+    private Date diagnosisTime;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getVisitId() { return visitId; }
+    public void setVisitId(Long visitId) { this.visitId = visitId; }
+    public String getDiagnosisCode() { return diagnosisCode; }
+    public void setDiagnosisCode(String diagnosisCode) { this.diagnosisCode = diagnosisCode; }
+    public String getDiagnosisName() { return diagnosisName; }
+    public void setDiagnosisName(String diagnosisName) { this.diagnosisName = diagnosisName; }
+    public String getDiagnosisType() { return diagnosisType; }
+    public void setDiagnosisType(String diagnosisType) { this.diagnosisType = diagnosisType; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public Date getDiagnosisTime() { return diagnosisTime; }
+    public void setDiagnosisTime(Date diagnosisTime) { this.diagnosisTime = diagnosisTime; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DiseaseCatalog.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DiseaseCatalog.java
new file mode 100644
index 000000000..4ee06bd42
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DiseaseCatalog.java
@@ -0,0 +1,28 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class DiseaseCatalog {
+    private Long id;
+    private String diseaseCode;
+    private String diseaseName;
+    private String icdCode;
+    private String category;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public String getDiseaseCode() { return diseaseCode; }
+    public void setDiseaseCode(String diseaseCode) { this.diseaseCode = diseaseCode; }
+    public String getDiseaseName() { return diseaseName; }
+    public void setDiseaseName(String diseaseName) { this.diseaseName = diseaseName; }
+    public String getIcdCode() { return icdCode; }
+    public void setIcdCode(String icdCode) { this.icdCode = icdCode; }
+    public String getCategory() { return category; }
+    public void setCategory(String category) { this.category = category; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DispensingDetail.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DispensingDetail.java
new file mode 100644
index 000000000..2ceaac543
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DispensingDetail.java
@@ -0,0 +1,34 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class DispensingDetail {
+    private Long id;
+    private Long dispensingSummaryId;
+    private Long orderDetailId;
+    private String medicineCode;
+    private String medicineName;
+    private Integer quantity;
+    private String status;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getDispensingSummaryId() { return dispensingSummaryId; }
+    public void setDispensingSummaryId(Long dispensingSummaryId) { this.dispensingSummaryId = dispensingSummaryId; }
+    public Long getOrderDetailId() { return orderDetailId; }
+    public void setOrderDetailId(Long orderDetailId) { this.orderDetailId = orderDetailId; }
+    public String getMedicineCode() { return medicineCode; }
+    public void setMedicineCode(String medicineCode) { this.medicineCode = medicineCode; }
+    public String getMedicineName() { return medicineName; }
+    public void setMedicineName(String medicineName) { this.medicineName = medicineName; }
+    public Integer getQuantity() { return quantity; }
+    public void setQuantity(Integer quantity) { this.quantity = quantity; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DispensingSummary.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DispensingSummary.java
new file mode 100644
index 000000000..5426820c9
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/DispensingSummary.java
@@ -0,0 +1,31 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class DispensingSummary {
+    private Long id;
+    private Long orderId;
+    private Long patientId;
+    private String dispensingType;
+    private String status;
+    private Date dispensingTime;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getOrderId() { return orderId; }
+    public void setOrderId(Long orderId) { this.orderId = orderId; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public String getDispensingType() { return dispensingType; }
+    public void setDispensingType(String dispensingType) { this.dispensingType = dispensingType; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public Date getDispensingTime() { return dispensingTime; }
+    public void setDispensingTime(Date dispensingTime) { this.dispensingTime = dispensingTime; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabOrderDetail.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabOrderDetail.java
new file mode 100644
index 000000000..119f9b0cf
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabOrderDetail.java
@@ -0,0 +1,28 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class LabOrderDetail {
+    private Long id;
+    private Long labOrderMainId;
+    private String itemCode;
+    private String itemName;
+    private String status;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getLabOrderMainId() { return labOrderMainId; }
+    public void setLabOrderMainId(Long labOrderMainId) { this.labOrderMainId = labOrderMainId; }
+    public String getItemCode() { return itemCode; }
+    public void setItemCode(String itemCode) { this.itemCode = itemCode; }
+    public String getItemName() { return itemName; }
+    public void setItemName(String itemName) { this.itemName = itemName; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabOrderMain.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabOrderMain.java
new file mode 100644
index 000000000..d4525b529
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabOrderMain.java
@@ -0,0 +1,31 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class LabOrderMain {
+    private Long id;
+    private Long patientId;
+    private Long doctorId;
+    private String orderType;
+    private String status;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getOrderType() { return orderType; }
+    public void setOrderType(String orderType) { this.orderType = orderType; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public String getRemark() { return remark; }
+    public void setRemark(String remark) { this.remark = remark; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabRequest.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabRequest.java
new file mode 100644
index 000000000..290a47320
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/LabRequest.java
@@ -0,0 +1,34 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class LabRequest {
+    private Long id;
+    private Long visitId;
+    private Long patientId;
+    private Long doctorId;
+    private String requestType;
+    private String status;
+    private Date requestTime;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getVisitId() { return visitId; }
+    public void setVisitId(Long visitId) { this.visitId = visitId; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getRequestType() { return requestType; }
+    public void setRequestType(String requestType) { this.requestType = requestType; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public Date getRequestTime() { return requestTime; }
+    public void setRequestTime(Date requestTime) { this.requestTime = requestTime; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/MedicalRecord.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/MedicalRecord.java
new file mode 100644
index 000000000..9fcd284ed
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/MedicalRecord.java
@@ -0,0 +1,28 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class MedicalRecord {
+    private Long id;
+    private Long visitId;
+    private Long doctorId;
+    private String status;
+    private String chiefComplaint;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getVisitId() { return visitId; }
+    public void setVisitId(Long visitId) { this.visitId = visitId; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public String getChiefComplaint() { return chiefComplaint; }
+    public void setChiefComplaint(String chiefComplaint) { this.chiefComplaint = chiefComplaint; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/OrderMain.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/OrderMain.java
new file mode 100644
index 000000000..81614ad77
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/OrderMain.java
@@ -0,0 +1,31 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class OrderMain {
+    private Long id;
+    private Long patientId;
+    private Long doctorId;
+    private String orderType;
+    private String status;
+    private String remark;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getOrderType() { return orderType; }
+    public void setOrderType(String orderType) { this.orderType = orderType; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public String getRemark() { return remark; }
+    public void setRemark(String remark) { this.remark = remark; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/PatientVisit.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/PatientVisit.java
new file mode 100644
index 000000000..4fdc5508f
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/PatientVisit.java
@@ -0,0 +1,31 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class PatientVisit {
+    private Long id;
+    private Long patientId;
+    private Long doctorId;
+    private String visitType;
+    private Date visitDate;
+    private String status;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getVisitType() { return visitType; }
+    public void setVisitType(String visitType) { this.visitType = visitType; }
+    public Date getVisitDate() { return visitDate; }
+    public void setVisitDate(Date visitDate) { this.visitDate = visitDate; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/QueueInfo.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/QueueInfo.java
new file mode 100644
index 000000000..575803c55
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/QueueInfo.java
@@ -0,0 +1,28 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class QueueInfo {
+    private Long id;
+    private Long patientId;
+    private Long doctorId;
+    private String queueNumber;
+    private String status;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getQueueNumber() { return queueNumber; }
+    public void setQueueNumber(String queueNumber) { this.queueNumber = queueNumber; }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/TriageQueueRecord.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/TriageQueueRecord.java
new file mode 100644
index 000000000..dc954bb19
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/TriageQueueRecord.java
@@ -0,0 +1,28 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class TriageQueueRecord {
+    private Long id;
+    private Long patientId;
+    private Long doctorId;
+    private String queueStatus;
+    private Date triageTime;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public Long getDoctorId() { return doctorId; }
+    public void setDoctorId(Long doctorId) { this.doctorId = doctorId; }
+    public String getQueueStatus() { return queueStatus; }
+    public void setQueueStatus(String queueStatus) { this.queueStatus = queueStatus; }
+    public Date getTriageTime() { return triageTime; }
+    public void setTriageTime(Date triageTime) { this.triageTime = triageTime; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/VitalSignsRecord.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/VitalSignsRecord.java
new file mode 100644
index 000000000..1b99a62ee
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/domain/entity/VitalSignsRecord.java
@@ -0,0 +1,34 @@
+package com.openhis.application.domain.entity;
+
+import java.util.Date;
+
+public class VitalSignsRecord {
+    private Long id;
+    private Long patientId;
+    private String temperature;
+    private String pulse;
+    private String bloodPressure;
+    private String respiration;
+    private Date recordTime;
+    private Date createTime;
+    private Date updateTime;
+
+    public Long getId() { return id; }
+    public void setId(Long id) { this.id = id; }
+    public Long getPatientId() { return patientId; }
+    public void setPatientId(Long patientId) { this.patientId = patientId; }
+    public String getTemperature() { return temperature; }
+    public void setTemperature(String temperature) { this.temperature = temperature; }
+    public String getPulse() { return pulse; }
+    public void setPulse(String pulse) { this.pulse = pulse; }
+    public String getBloodPressure() { return bloodPressure; }
+    public void setBloodPressure(String bloodPressure) { this.bloodPressure = bloodPressure; }
+    public String getRespiration() { return respiration; }
+    public void setRespiration(String respiration) { this.respiration = respiration; }
+    public Date getRecordTime() { return recordTime; }
+    public void setRecordTime(Date recordTime) { this.recordTime = recordTime; }
+    public Date getCreateTime() { return createTime; }
+    public void setCreateTime(Date createTime) { this.createTime = createTime; }
+    public Date getUpdateTime() { return updateTime; }
+    public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; }
+}
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/application/exception/BusinessException.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/exception/BusinessException.java
new file mode 100644
index 000000000..ad8da2482
--- /dev/null
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/application/exception/BusinessException.java
@@ -0,0 +1,10 @@
+package com.openhis.application.exception;
+
+public class BusinessException extends RuntimeException {
+    public BusinessException(String message) {
+        super(message);
+    }
+    public BusinessException(String message, Throwable cause) {
+        super(message, cause);
+    }
+}