提交merge1.3

openhis-server-new/openhis-application/src/main/resources/mapper/nenu/GfStudentListAppMapper.xml

@@ -64,5 +64,43 @@
               ORDER BY T1.id DESC) AS T
             ${ew.customSqlSegment}
     </select>
+<<<<<<< HEAD
+=======
+    <select id="getPatientBusNoList" resultType="com.openhis.web.nenu.dto.GfStudentPeisDto">
+        SELECT T1.bus_no as bus_no
+             , T.id_number as id_number
+             , T.student_id as student_id
+             , T.name as name
+             , T.physical_exam_result as status
+        FROM adm_patient_student AS T
+                 INNER JOIN adm_patient AS T1 ON T.patient_id = T1.id
+        WHERE T.delete_flag = '0'
+        ORDER BY T.id DESC
+            LIMIT #{pageSize} OFFSET #{pageNum}
+    </select>
+
+    <select id="getPatientBusNoList1" resultType="com.openhis.web.nenu.dto.GfStudentPeisDto">
+        SELECT * FROM
+        (SELECT T1.bus_no as bus_no
+             , T.id_number as id_number
+             , T.student_id as student_id
+             , T.name as name
+             , T.physical_exam_result as status
+        FROM adm_patient_student AS T
+                 INNER JOIN adm_patient AS T1 ON T.patient_id = T1.id
+        WHERE T.delete_flag = '0'
+        ORDER BY T.id DESC) abc
+    </select>
+
+    <select id="getPatientBusNoCount" resultType="java.lang.Long">
+        SELECT COUNT(T.id)
+        FROM adm_patient_student AS T
+                 INNER JOIN adm_patient AS T1 ON T.patient_id = T1.id
+        WHERE T.delete_flag = '0'
+        GROUP BY T.id
+        ORDER BY T.id DESC
+        LIMIT 1 OFFSET 0
+    </select>
+>>>>>>> v1.3
 
 </mapper>