From f84d029d497949af28c6780a52bec9020c642311 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 16 十二月 2025 11:19:20 +0800
Subject: [PATCH] 全局搜索人物时 不按照顺序查询 可少不可多
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 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 35b8cff..beb70cf 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -39,7 +40,7 @@
*/
@Service
@Slf4j
-public class ZfDoctorServiceImpl extends ServiceImpl<ZfDoctorMapper, ZfDoctor> implements ZfDoctorService {
+public class ZfDoctorServiceImpl extends ServiceImpl<ZfDoctorMapper, ZfDoctor> implements ZfDoctorService,ModuleSearchable {
@Resource
ZInfoUserService zInfoUserService;
@@ -101,7 +102,11 @@
//鍔犱笂鐖舵瘝瀹舵棌id
idList.add(fatherFaId);
idList.add(motherFaId);
-
+ List<Long> fms = zInfoUserService.findByUaidToFaid(myself.getUaid()).stream().map(ZInfoUser::getFamilyId).collect(Collectors.toList());
+ if(!fms.isEmpty())
+ {
+ idList.addAll(fms);
+ }
// String familyIds = listFamilyIds();
// String secondFamilyAuthority = listSecondFamilyIds()
LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor, idList);
@@ -461,6 +466,29 @@
.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());
+// lqw.like(StringUtils.isNotEmpty(zfDoctor.getCompanion()),ZfDoctor::getCompanion,zfDoctor.getCompanion());
+
+ if (CollectionUtils.isNotEmpty(zfDoctor.getCompanionList())) {
+ List<String> companionList = zfDoctor.getCompanionList();
+
+ // 娓呯悊鍜屽幓閲�
+ companionList = companionList.stream()
+ .map(String::trim)
+ .filter(s -> !s.isEmpty())
+ .distinct()
+ .collect(Collectors.toList());
+
+ if (!companionList.isEmpty()) {
+ // 纭繚鎵�鏈夊弬涓庝汉閮藉湪companion瀛楁涓�
+ for (String companion : companionList) {
+ lqw.apply("FIND_IN_SET({0}, REPLACE(REPLACE(companion, ' ', ''), '锛�', ',')) > 0",
+ companion);
+ }
+ }
+ }
+
+ lqw.between(zfDoctor.getHappenStartTime() != null && zfDoctor.getHappenEndTime() != null, ZfDoctor::getCreateTime, zfDoctor.getHappenStartTime(), zfDoctor.getHappenEndTime());
+
if (StringUtils.isNotEmpty(zfDoctor.getPrescription())) {
lqw.and(wrapper -> {
wrapper.like(StringUtils.isNotEmpty(zfDoctor.getPrescription()), ZfDoctor::getWmedical, zfDoctor.getPrescription())
@@ -469,6 +497,23 @@
});
}
return lqw;
+ }
+
+ @Override
+ public String getModuleCode() {
+ return "2043";
+ }
+
+ @Override
+ public List<?> search(String companion, Date happenStartTime, Date happenEndTime) {
+
+ ZfDoctor zfDoctor = new ZfDoctor();
+ String[] split = companion.split(",");
+ List<String> list = Arrays.asList(split);
+
+ zfDoctor.setCompanionList(list); zfDoctor.setHappenStartTime(happenStartTime);
+ zfDoctor.setHappenEndTime(happenEndTime);
+ return selectByCondition(zfDoctor);
}
// public LambdaQueryWrapper<ZfDoctor> buildCondition2(List<Long> ids) {
@@ -512,4 +557,4 @@
// }
-}
\ No newline at end of file
+}
--
Gitblit v1.9.1