From 3f3ec086fc73102dd2473fd2e197c3c9a16d4231 Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期四, 14 十一月 2024 10:12:55 +0800
Subject: [PATCH] refactor

---
 jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java |   39 ++++++++++++++++++++++++++++-----------
 1 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
index 7592e6b..3bcf171 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/queue/QueueMapper.java
@@ -67,27 +67,44 @@
 
     @Select("<script>" +
             "SELECT * FROM lihu.queue " +
-            "where pat_id = #{patId} and book_check_type in (" +
-            " <foreach collection='arrCheckType' separator=',' item='checkType'>" +
-            "   #{checkType} " +
-            " </foreach> )" +
-            " and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+            "where pat_id = #{patId} " +
+            "  and book_check_type in (" +
+            "    <foreach collection='arrCheckType' separator=',' item='checkType'>" +
+            "      #{checkType} " +
+            "    </foreach> )" +
+            "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
             "</script>")
     List<QueueDO> getCurPatGivenCheckTypes(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType);
 
     @Select("<script>" +
             "SELECT * FROM lihu.queue " +
-            "where pat_id = #{patId} and book_check_type in (" +
-            " <foreach collection='arrCheckType' separator=',' item='checkType'>" +
-            "   #{checkType} " +
-            " </foreach> ) " +
-            " and status = #{status} " +
-            " and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+            "where pat_id = #{patId} " +
+            "  and book_check_type in (" +
+            "    <foreach collection='arrCheckType' separator=',' item='_checkType'>" +
+            "      #{_checkType} " +
+            "    </foreach> ) " +
+            "  and status = #{status} " +
+            "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
             "</script>")
     List<QueueDO> getCurPatGivenCheckTypesAndStatus(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("status")Integer status);
 
     @Select("<script>" +
             "SELECT * FROM lihu.queue " +
+            "where pat_id = #{patId} " +
+            "  and book_check_type in (" +
+            "    <foreach collection='arrCheckType' separator=',' item='_checkType'>" +
+            "      #{_checkType} " +
+            "    </foreach> ) " +
+            "  and status in (" +
+            "    <foreach collection='statusList' separator=',' item='_status'>" +
+            "      #{_status} " +
+            "    </foreach> ) " +
+            "  and TO_DAYS(book_date) = TO_DAYS(NOW()) " +
+            "</script>")
+    List<QueueDO> getCurPatGivenCheckTypesAndStatusList(@Param("patId")String patId, @Param("arrCheckType")Integer[] arrCheckType, @Param("statusList")List<Integer> statusList);
+
+    @Select("<script>" +
+            "SELECT * FROM lihu.queue " +
             "where id >= #{from} and status in (" +
             " <foreach collection='statusList' separator=',' item='status'>" +
             "  #{status} " +

--
Gitblit v1.9.3