From b7adb9e5316030aabfb90a8ff1b43c848aa550ec Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 05 六月 2025 12:37:45 +0800
Subject: [PATCH] 小程序查报告接口增加返回检查综述以及医师建议
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
index 4271cb5..3316a68 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjRulesController.java
@@ -2,10 +2,12 @@
import java.math.BigDecimal;
import java.util.*;
+import java.util.stream.Collectors;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
@@ -57,11 +59,20 @@
//@PreAuthorize("@ss.hasPermi('hosp:rules:list')")
@GetMapping("/list")
@ApiOperation(value = "鏌ヨ瑙勫垯+鐥呯鍒楄〃")
- public TableDataInfo list(TjRules tjRules) {
- startPage();
+ public AjaxResult list(TjRules tjRules) {
+
+ Page<TjRules> page=new Page<>(tjRules.getPageNum(),tjRules.getPageSize());
+
LambdaQueryWrapper<TjRules> wq = new LambdaQueryWrapper<>();
if (tjRules.getProId() != null) {
- wq.eq(TjRules::getProId, tjRules.getProId());
+ List<TjProject> projects = projectService.getTjProjectListBySoneId(tjRules.getProId());
+ if(null !=projects && !projects.isEmpty()){
+ wq.and(w-> w.eq(TjRules::getProId, tjRules.getProId())
+ .or().in(TjRules::getProId,projects.stream().map(TjProject::getProId).collect(Collectors.toList())));
+ }else {
+ wq.eq(TjRules::getProId, tjRules.getProId());
+ }
+
}
if (tjRules.getProName() != null) {
wq.like(TjRules::getProName, tjRules.getProName());
@@ -82,16 +93,12 @@
wq.eq(TjRules::getSex, tjRules.getSex());
}
wq.orderByAsc(TjRules::getSort);
- List<TjRules> list = tjRulesService.list(wq);
- if (list != null) {
- for (TjRules rules : list) {
- LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();
- wq1.eq(TjRuleAdvice::getBz, rules.getAid());
- final List<TjRuleAdvice> list1 = tjRuleAdviceService.list(wq1);
- rules.setRuleAdvices(list1);
- }
- }
- return getDataTable(list);
+// List<TjRules> list = tjRulesService.list(wq);
+ Page<TjRules> page1 = tjRulesService.page(page, wq);
+ Map<String,Object>map=new HashMap<>();
+ map.put("rows",page1.getRecords());
+ map.put("total",page1.getTotal());
+ return AjaxResult.success(map);
}
--
Gitblit v1.8.0