From 549809912b9fdb559e38cdbd099fee797a8df0ef Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期五, 18 七月 2025 13:55:45 +0800
Subject: [PATCH] zjh20250718
---
ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdvice.java | 3 +++
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java | 42 +++++++++++++++++++++++++++++-------------
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 2 ++
3 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index bb465d7..eae8abd 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -3213,6 +3213,8 @@
if(tjProject.getProDelivery()==1){
if(StringUtil.isNotBlank(tjOrderDetail.getConclusion())){
tjPdfVO.setProResult(tjOrderDetail.getProResult()+" "+tjOrderDetail.getConclusion());
+ }else {
+ tjPdfVO.setProResult(tjOrderDetail.getProResult());
}
}else {
tjPdfVO.setProResult(tjOrderDetail.getProResult());
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
index e52c8c6..7d79132 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjAdviceController.java
@@ -12,6 +12,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.common.annotation.Excel;
import com.ltkj.common.core.domain.entity.SysDept;
+import com.ltkj.common.core.domain.entity.SysUser;
+import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.common.utils.StringUtils;
import com.ltkj.common.utils.poi.ExcelUtil;
import com.ltkj.framework.config.UserHoder;
@@ -136,21 +138,35 @@
@ApiOperation(value = "鏍规嵁褰撳墠鐧诲綍浜篿d鑾峰彇甯哥敤寤鸿")
public AjaxResult getCyTjAdviceKjbqBySex(@RequestParam @ApiParam(value = "鐢ㄦ埛id 浼犲綋鍓嶇櫥褰曚汉") Long userId,
@ApiParam(value = "椤电爜鏁�(榛樿1)") @RequestParam(defaultValue = "1") Integer page,
- @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize) {
- LambdaQueryWrapper<TjAdvice> wq = new LambdaQueryWrapper<>();
- Page<TjAdvice> page1 = new Page<>(page, pageSize);
-// wq.eq(TjAdvice::getAdSex,sex).or().eq(TjAdvice::getAdSex,"2");
- if (null != userId) {
- LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
+ @ApiParam(value = "鏄剧ず鏉℃暟(榛樿10)") @RequestParam(defaultValue = "10") Integer pageSize,
+ @RequestParam(required = false) String nr) {
+ LambdaQueryWrapper<TjUserAdvice> wq0 = new LambdaQueryWrapper<>();
+ if(!SecurityUtils.isAdmin(userId))
wq0.eq(TjUserAdvice::getUserId, userId);
- List<TjUserAdvice> list = userAdviceService.list(wq0);
- if (null != list && !list.isEmpty()) {
- List<Long> longs = list.stream().map(TjUserAdvice::getAdviceId).collect(Collectors.toList());
- wq.in(TjAdvice::getId,longs);
-// wq.last("and (ad_sex=1 OR ad_sex=2)");
- Page<TjAdvice> kjbqPage = tjAdviceService.page(page1,wq);
- return AjaxResult.success(kjbqPage);
+ List<TjUserAdvice> list = userAdviceService.list(wq0);
+ List<TjAdvice> kjbqPage = new ArrayList<>();
+ Map<String,Object> map = new HashMap<>();
+ if (null != list && !list.isEmpty()) {
+ for (TjUserAdvice advice : list) {
+ TjAdvice advice1 = tjAdviceService.getById(advice.getAdviceId());
+ if(null != advice1){
+ SysUser user = userService.getById(advice.getUserId());
+ if(null != user){
+ advice1.setUserName(user.getNickName());
+ kjbqPage.add(advice1);
+ }
+ }
}
+ List<TjAdvice> adviceList =null;
+ if(StringUtil.isNotBlank( nr)){
+ adviceList = kjbqPage.stream().filter(kjbq -> StringUtil.isNotBlank(kjbq.getTitle()) && kjbq.getTitle().contains(nr))
+ .skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ }else {
+ adviceList = kjbqPage.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
+ }
+ map.put("total", kjbqPage.size());
+ map.put("records", adviceList);
+ return AjaxResult.success(map);
}
return AjaxResult.success("璇ョ敤鎴锋殏鏃舵病鏈夊父鐢ㄥ缓璁�!");
}
diff --git a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdvice.java b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdvice.java
index 5af3765..5cd3989 100644
--- a/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdvice.java
+++ b/ltkj-hosp/src/main/java/com/ltkj/hosp/domain/TjAdvice.java
@@ -87,6 +87,9 @@
@TableField(exist = false)
private String deptName;
+ @TableField(exist = false)
+ private String userName;
+
@Override
public String toString() {
return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
--
Gitblit v1.8.0