From 77088e55cec8b6f83f8396d6609ff4f57b4807b5 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 30 十二月 2025 10:05:32 +0800
Subject: [PATCH] 人物搜索 新加了两个模块
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 92 +++++++++++++++++++++++++++++----------------
1 files changed, 59 insertions(+), 33 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 beb70cf..1d27f36 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
@@ -11,6 +11,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.*;
+import com.ruoyi.domain.dto.zfEventdto;
import com.ruoyi.mapper.ZfDoctorMapper;
import com.ruoyi.service.*;
import com.ruoyi.service.ZfDoctorService;
@@ -160,13 +161,13 @@
public List<ZfDoctor> markOwnData(Long familyId,Long fatherFamilyId, Long motherFamilyId, List<ZfDoctor> beanRecords) {
return beanRecords.stream().peek(
- bean -> {
- if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
- bean.setOwnData(1);
- } else {
- bean.setOwnData(0);
- }
+ bean -> {
+ if (Objects.equals(bean.getFamilyId(), familyId) ||(fatherFamilyId!=0L && fatherFamilyId.equals(familyId))||(motherFamilyId!=0L && motherFamilyId.equals(familyId))) {
+ bean.setOwnData(1);
+ } else {
+ bean.setOwnData(0);
}
+ }
).sorted((a, b) -> b.getOwnData() - a.getOwnData()).collect(Collectors.toList());
}
@@ -194,13 +195,13 @@
for (ZfDoctor zfDoctor : dataList) {
// if (zfDoctor.getSuitable().length() != 0 || zfDoctor.getType().length() != 0 || zfDoctor.getEffect().length() != 0 ) {
- if(zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null){
- throw new RuntimeException("鐥囩姸涓虹┖锛屽鍏ユ暟鎹け璐�");
- }
- else {
- zfDoctorService.addData(zfDoctor);
- }
+ if(zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null){
+ throw new RuntimeException("鐥囩姸涓虹┖锛屽鍏ユ暟鎹け璐�");
}
+ else {
+ zfDoctorService.addData(zfDoctor);
+ }
+ }
// }
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
@@ -353,13 +354,13 @@
UpdateRequest updateRequest = new UpdateRequest("allsearchdata", esResult.getId());
updateRequest.doc(
- "by1", newModel.getBy1(),
- "by2", newModel.getBy2(),
- "by3", newModel.getBy3(),
- "by4", newModel.getBy4(),
- "by6", newModel.getBy6(),
- "by7", newModel.getBy7(),
- "remark", newModel.getRemark()
+ "by1", newModel.getBy1(),
+ "by2", newModel.getBy2(),
+ "by3", newModel.getBy3(),
+ "by4", newModel.getBy4(),
+ "by6", newModel.getBy6(),
+ "by7", newModel.getBy7(),
+ "remark", newModel.getRemark()
);
try {
@@ -456,17 +457,19 @@
private LambdaQueryWrapper<ZfDoctor> buildCondition(ZfDoctor zfDoctor, List<Long> familyIdList) {
LambdaQueryWrapper<ZfDoctor> lqw = new LambdaQueryWrapper<>();
- lqw.in(ZfDoctor::getFamilyId, familyIdList);
+ lqw.in(familyIdList != null,ZfDoctor::getFamilyId, familyIdList);
lqw.orderByDesc(ZfDoctor::getCreateTime);
lqw.like(StringUtils.isNotEmpty(zfDoctor.getType()), ZfDoctor::getType, zfDoctor.getType())
- .like(StringUtils.isNotEmpty(zfDoctor.getSymptom()), ZfDoctor::getSymptom, zfDoctor.getSymptom())
- .like(StringUtils.isNotEmpty(zfDoctor.getDuration()), ZfDoctor::getDuration, zfDoctor.getDuration())
- .like(StringUtils.isNotEmpty(zfDoctor.getEffect()), ZfDoctor::getEffect, zfDoctor.getEffect())
- .like(StringUtils.isNotEmpty(zfDoctor.getSuitable()), ZfDoctor::getSuitable, zfDoctor.getSuitable())
- .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());
+ .like(StringUtils.isNotEmpty(zfDoctor.getSymptom()), ZfDoctor::getSymptom, zfDoctor.getSymptom())
+ .like(StringUtils.isNotEmpty(zfDoctor.getDuration()), ZfDoctor::getDuration, zfDoctor.getDuration())
+ .like(StringUtils.isNotEmpty(zfDoctor.getEffect()), ZfDoctor::getEffect, zfDoctor.getEffect())
+ .like(StringUtils.isNotEmpty(zfDoctor.getSuitable()), ZfDoctor::getSuitable, zfDoctor.getSuitable())
+ .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 (zfDoctor.getHasAttachment() != null && zfDoctor.getHasAttachment().equals("鏄�")) {
+ lqw.apply("url IS NOT NULL AND url != ''");
+ }// lqw.like(StringUtils.isNotEmpty(zfDoctor.getCompanion()),ZfDoctor::getCompanion,zfDoctor.getCompanion());
if (CollectionUtils.isNotEmpty(zfDoctor.getCompanionList())) {
List<String> companionList = zfDoctor.getCompanionList();
@@ -492,8 +495,8 @@
if (StringUtils.isNotEmpty(zfDoctor.getPrescription())) {
lqw.and(wrapper -> {
wrapper.like(StringUtils.isNotEmpty(zfDoctor.getPrescription()), ZfDoctor::getWmedical, zfDoctor.getPrescription())
- .or()
- .like(StringUtils.isNotEmpty(zfDoctor.getPrescription()), ZfDoctor::getCmedical, zfDoctor.getPrescription());
+ .or()
+ .like(StringUtils.isNotEmpty(zfDoctor.getPrescription()), ZfDoctor::getCmedical, zfDoctor.getPrescription());
});
}
return lqw;
@@ -501,11 +504,11 @@
@Override
public String getModuleCode() {
- return "2043";
+ return "鑽柟";
}
@Override
- public List<?> search(String companion, Date happenStartTime, Date happenEndTime) {
+ public List<?> search(String companion, Date happenStartTime, Date happenEndTime, String hasAttachment) {
ZfDoctor zfDoctor = new ZfDoctor();
String[] split = companion.split(",");
@@ -513,7 +516,30 @@
zfDoctor.setCompanionList(list); zfDoctor.setHappenStartTime(happenStartTime);
zfDoctor.setHappenEndTime(happenEndTime);
- return selectByCondition(zfDoctor);
+ zfDoctor.setHasAttachment(hasAttachment);
+ return doctorList(zfDoctor);
+ }
+
+ public List<zfEventdto> doctorList(ZfDoctor zfDoctor) {
+
+ LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor, null);
+ List<ZfDoctor> beanRecords = list(lqw);
+ return encapData(beanRecords);
+ }
+
+ public List<zfEventdto> encapData(List<ZfDoctor> lis)
+ {
+ List<zfEventdto> daoRes = new ArrayList<>() ;
+ for(ZfDoctor obj : lis)
+ {
+ zfEventdto atd = new zfEventdto();
+ atd.setId(Math.toIntExact(obj.getId()));
+ atd.setModule("鑽柟");
+ atd.setName(obj.getCompanion());
+ atd.setCreateTime(obj.getCreateTime());
+ daoRes.add(atd);
+ }
+ return daoRes;
}
// public LambdaQueryWrapper<ZfDoctor> buildCondition2(List<Long> ids) {
--
Gitblit v1.9.1