From 2b0d8a963f655cd16df6a7e0bc413cc9890f761a Mon Sep 17 00:00:00 2001
From: liuhongrui <liuhr@ccbjb.com.cn>
Date: Fri, 28 Feb 2025 11:05:19 +0800
Subject: [PATCH] up

---
 .../patientmanage/PatientManageMapper.xml     | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
index e1218deb..74cd19fe 100644
--- a/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
+++ b/openhis-server/openhis-application/src/main/resources/mapper/patientmanage/PatientManageMapper.xml
@@ -47,12 +47,20 @@
 
             <!-- 如果传入name参数，且不为空 -->
             <if test="name != null and name != ''">
-                AND pt.name LIKE CONCAT( '%', #{name}, '%')
-            </if>
-
-            <!-- 如果传入name参数，且不为空 -->
-            <if test="name != null and name != ''">
-                AND pt.py_str LIKE CONCAT('%',#{name}, '%')
+                <choose>
+                    <!-- 如果name参数中包含汉字 -->
+                    <when test="name.matches('.*[\u4e00-\u9fa5].*')">
+                        AND pt.name LIKE CONCAT('%', #{name}, '%')
+                    </when>
+                    <!-- 如果name参数中只包含字母 -->
+                    <when test="name.matches('^[a-zA-Z]+$')">
+                        AND pt.py_str LIKE CONCAT('%', #{name}, '%')
+                    </when>
+                    <!-- 如果name参数中既包含汉字又包含字母 -->
+                    <otherwise>
+                        AND (pt.name LIKE CONCAT('%', #{name}, '%') OR pt.py_str LIKE CONCAT('%', #{name}, '%'))
+                    </otherwise>
+                </choose>
             </if>
         </where>
         ORDER BY pt.bus_no
@@ -72,11 +80,20 @@
 
             <!-- 如果传入name参数，且不为空 -->
             <if test="name != null and name != ''">
-                AND pt.name LIKE CONCAT('%',#{name}, '%')
-            </if>
-            <!-- 如果传入name参数，且不为空 -->
-            <if test="name != null and name != ''">
-                AND pt.py_str LIKE CONCAT('%',#{name}, '%')
+                <choose>
+                    <!-- 如果name参数中包含汉字 -->
+                    <when test="name.matches('.*[\u4e00-\u9fa5].*')">
+                        AND pt.name LIKE CONCAT('%', #{name}, '%')
+                    </when>
+                    <!-- 如果name参数中只包含字母 -->
+                    <when test="name.matches('^[a-zA-Z]+$')">
+                        AND pt.py_str LIKE CONCAT('%', #{name}, '%')
+                    </when>
+                    <!-- 如果name参数中既包含汉字又包含字母 -->
+                    <otherwise>
+                        AND (pt.name LIKE CONCAT('%', #{name}, '%') OR pt.py_str LIKE CONCAT('%', #{name}, '%'))
+                    </otherwise>
+                </choose>
             </if>
         </where>
     </select>