From 207291e6c4a30c5386717687b8d50379904205f4 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Wed, 11 May 2022 16:31:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=82=A3=E8=80=85=E7=97=85=E4=BE=8B=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=EF=BC=88=E5=A7=93?=
 =?UTF-8?q?=E5=90=8D/=E7=94=B5=E8=AF=9D/=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/talkonlineweb/controller/PatientController.java    |  6 ++++++
 .../java/com/lyms/talkonlineweb/domain/PatientInfo.java     | 13 +++++++++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
index 121961f..0f67df9 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
@@ -107,6 +107,12 @@ public class PatientController {
         if(StringUtils.isEmpty(patientInfo.getPname())){
             patientInfo.setPname(null);
         }
+        if(StringUtil.isNotEmpty(patientInfo.getSynthesisQuery())){
+            queryWrapper.and(wrapper  -> wrapper .like("pname", patientInfo.getSynthesisQuery())
+                    .or().eq("mobile", patientInfo.getSynthesisQuery())
+                    .or().eq("enrolmentPhone", patientInfo.getSynthesisQuery())
+                    .or().eq("idno", patientInfo.getSynthesisQuery()));
+        }
         Page<PatientInfo> patientPagePage = patientInfoService.page(page, queryWrapper);
         List<PatientInfo> pLst = patientInfoService.list(queryWrapper);
         int daiCnt = pLst.parallelStream().mapToInt(PatientInfo::getCcnt).sum();//待使用数量
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/PatientInfo.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/PatientInfo.java
index 2bad298..ef1b899 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/PatientInfo.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/PatientInfo.java
@@ -74,10 +74,15 @@ public class PatientInfo implements Serializable {
     private Integer cid;
 
     /**
-     * 手机号
+     * 病例手机号
      */
     @TableField(value = "mobile")
     private String mobile;
+    /**
+     * 注册手机号
+     */
+    @TableField(value = "enrolmentPhone")
+    private String enrolmentPhone;
 
     /**
      * 填写医院id
@@ -142,7 +147,11 @@ public class PatientInfo implements Serializable {
      */
     @TableField(value = "gzopenid")
     private String gzopenid;
-
+    /**
+     * 综合查询（姓名/电话/身份证）
+     */
+    @TableField(exist = false)
+    private String synthesisQuery;
 
 
     @TableField(exist = false)
-- 
1.8.3.1