From a2d81eff7490d9ef2e5fb45727ad86f7770c55cd Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期一, 05 一月 2026 15:08:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index 1d27f36..b03f125 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -467,6 +467,14 @@
             .like(StringUtils.isNotEmpty(zfDoctor.getWmedical()), ZfDoctor::getWmedical, zfDoctor.getWmedical())
             .like(StringUtils.isNotEmpty(zfDoctor.getCmedical()), ZfDoctor::getCmedical, zfDoctor.getCmedical())
             .like(StringUtils.isNotEmpty(zfDoctor.getRemark()), ZfDoctor::getRemark, zfDoctor.getRemark());
+
+        if (StringUtils.isNotEmpty(zfDoctor.getIsHide())) {
+            lqw.and(wrapper -> wrapper
+                .ne(ZfDoctor::getIsHide, "鏄�")
+                .or()
+                .isNull(ZfDoctor::getIsHide)
+            );
+        }
         if (zfDoctor.getHasAttachment() != null && zfDoctor.getHasAttachment().equals("鏄�")) {
             lqw.apply("url IS NOT NULL AND url != ''");
         }//        lqw.like(StringUtils.isNotEmpty(zfDoctor.getCompanion()),ZfDoctor::getCompanion,zfDoctor.getCompanion());
@@ -517,6 +525,7 @@
         zfDoctor.setCompanionList(list);        zfDoctor.setHappenStartTime(happenStartTime);
         zfDoctor.setHappenEndTime(happenEndTime);
         zfDoctor.setHasAttachment(hasAttachment);
+        zfDoctor.setIsHide("鍚�");
         return doctorList(zfDoctor);
     }
 

--
Gitblit v1.9.1