From 9ea63da6cc702cc707697539c5e051959a1e2f68 Mon Sep 17 00:00:00 2001
From: "Wang.Huan" <wanghuan@ccbjb.com.cn>
Date: Wed, 5 Mar 2025 13:50:57 +0800
Subject: [PATCH] tb

---
 .../service/IPatientService.java              | 10 +---------
 .../service/impl/PatientServiceImpl.java      | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
index 71ed94be..12dc5fa2 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IPatientService.java
@@ -30,13 +30,5 @@ public interface IPatientService extends IService<Patient> {
      */
     boolean isFuture(String date);
 
-    /**
-     * 通过关键字查询患者信息
-     *
-     * @param searchKey 关键字
-     * @param pageNo    当前页码
-     * @param pageSize  查询条数
-     * @return 患者信息
-     */
-    Page<Patient> getPatientBySearchKey(String searchKey, Integer pageNo, Integer pageSize);
+
 }
\ No newline at end of file
diff --git a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
index 83e0ea11..1fc18cd6 100644
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/PatientServiceImpl.java
@@ -1,16 +1,21 @@
 package com.openhis.administration.service.impl;
 
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.time.format.DateTimeFormatter;
-import java.util.Date;
-
-import org.springframework.stereotype.Service;
-
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.administration.domain.Patient;
 import com.openhis.administration.mapper.PatientMapper;
 import com.openhis.administration.service.IPatientService;
+import com.openhis.common.utils.HisPageUtils;
+import com.openhis.common.utils.HisQueryUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.HashSet;
 
 /**
  * 患者管理Service业务层处理
@@ -62,4 +67,5 @@ public class PatientServiceImpl extends ServiceImpl<PatientMapper, Patient> impl
         }
     }
 
+
 }
\ No newline at end of file