diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
index ec6527221..9647fb3fc 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationEmrAppServiceImpl.java
@@ -220,18 +220,12 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
      */
     @Override
     public R<?> getPendingEmrList(Long doctorId, Integer pageNo, Integer pageSize, String patientName) {
-        List<Map<String, Object>> allRows = doctorStationEmrAppMapper.getPendingEmrList(doctorId, patientName);
-        int total = allRows.size();
+        // 先查询总数
+        Long total = doctorStationEmrAppMapper.getPendingEmrCount(doctorId, patientName);
 
-        // 分页截取
-        int fromIndex = (pageNo - 1) * pageSize;
-        int toIndex = Math.min(fromIndex + pageSize, total);
-        List<Map<String, Object>> pageRows;
-        if (fromIndex >= total) {
-            pageRows = new ArrayList<>();
-        } else {
-            pageRows = allRows.subList(fromIndex, toIndex);
-        }
+        // 计算分页偏移量，再查询分页数据
+        int offset = (pageNo - 1) * pageSize;
+        List<Map<String, Object>> pageRows = doctorStationEmrAppMapper.getPendingEmrList(doctorId, patientName, pageSize, offset);
 
         // 计算年龄列
         for (Map<String, Object> row : pageRows) {
@@ -246,7 +240,7 @@ public class DoctorStationEmrAppServiceImpl implements IDoctorStationEmrAppServi
 
         Map<String, Object> result = new java.util.HashMap<>();
         result.put("rows", pageRows);
-        result.put("total", total);
+        result.put("total", total != null ? total : 0L);
         return R.ok(result);
     }
 
diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
index 689a62b0b..7c375ffb0 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationEmrAppMapper.java
@@ -13,7 +13,9 @@ import java.util.Map;
 public interface DoctorStationEmrAppMapper {
 
     List<Map<String, Object>> getPendingEmrList(@Param("doctorId") Long doctorId,
-                                                 @Param("patientName") String patientName);
+                                                 @Param("patientName") String patientName,
+                                                 @Param("pageSize") Integer pageSize,
+                                                 @Param("offset") Integer offset);
 
     Long getPendingEmrCount(@Param("doctorId") Long doctorId,
                             @Param("patientName") String patientName);
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
index d5bbe0619..b4a88763d 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationEmrAppMapper.xml
@@ -22,19 +22,19 @@
             AND p.name LIKE CONCAT('%', #{patientName}, '%')
         </if>
         ORDER BY e.create_time DESC
+        LIMIT #{pageSize} OFFSET #{offset}
     </select>
 
     <select id="getPendingEmrCount" resultType="java.lang.Long">
         SELECT COUNT(*)
         FROM adm_encounter e
         INNER JOIN adm_encounter_participant ep ON e.id = ep.encounter_id AND ep.practitioner_id = #{doctorId}
+        LEFT JOIN adm_patient p ON e.patient_id = p.id
         LEFT JOIN doc_emr emr ON e.id = emr.encounter_id
         WHERE e.status_enum = 2
           AND emr.id IS NULL
         <if test="patientName != null and patientName != ''">
-            AND e.patient_id IN (
-                SELECT id FROM adm_patient WHERE name LIKE CONCAT('%', #{patientName}, '%')
-            )
+            AND p.name LIKE CONCAT('%', #{patientName}, '%')
         </if>
     </select>