From a2d12d52275c9fc34277d3e41c662a5ea9fb597f Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 24 一月 2024 10:11:44 +0800
Subject: [PATCH] 报告合并判断心电图和附件
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java | 49 ++++++++++++++++++++++++++++++++++++-------------
1 files changed, 36 insertions(+), 13 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
index a6687df..2661014 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjProjectController.java
@@ -12,7 +12,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.core.domain.entity.SysDept;
import com.ltkj.common.utils.bean.BeanUtils;
+import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
+import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.treeUtil.TreeSelect;
import com.ltkj.system.service.ISysConfigService;
@@ -57,6 +59,20 @@
private DictProSfxmService dictProSfxmService;
@Autowired
private ITjRulesService tjRulesService;
+ @Resource
+ private TestMapper testMapper;
+
+
+ @GetMapping("/getTjHyBgList")
+ @ApiOperation(value = "鏌ヨlis鏁版嵁搴撻」鐩俊鎭帴鍙�")
+ public AjaxResult getTjHyBgList(@RequestParam(required = false)String pacCode,
+ @RequestParam(required = false)String pacName,
+ @RequestParam(required = false)String pacRemark) {
+ List<Map<String, Object>> maps = testMapper.getTjHyBgList(pacCode,pacName,pacRemark);
+ DynamicDataSourceContextHolder.clearDataSourceType();
+ return AjaxResult.success(maps);
+ }
+
/**
* 鏌ヨ浣撴椤圭洰鍒楄〃
@@ -66,27 +82,34 @@
public AjaxResult getlist(@RequestParam(required = false) @ApiParam(value = "椤圭洰鍚嶇О") String proName,
@RequestParam(required = false) @ApiParam(value = "妫�鏌ョ被鍒�") String checkType,
@RequestParam(required = false) @ApiParam(value = "閮ㄩ棬id") String deptId) {
- LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
- wq0.eq(TjProject::getProParentId, 0);
- if(null !=proName){
- wq0.like(TjProject::getProName,proName);
- }
- if(null !=checkType){
- wq0.like(TjProject::getProCheckType,checkType);
- }
- if(null !=deptId){
- wq0.like(TjProject::getDeptId,deptId);
- }
+// LambdaQueryWrapper<TjProject> wq0 = new LambdaQueryWrapper<>();
+// wq0.eq(TjProject::getProParentId, 0);
+// if(null !=proName){
+// wq0.like(TjProject::getProName,proName);
+// }
+// if(null !=checkType){
+// wq0.like(TjProject::getProCheckType,checkType);
+// }
+// if(null !=deptId){
+// wq0.like(TjProject::getDeptId,deptId);
+// }
+//
+// List<TjProject> tjProjects = tjProjectService.list(wq0);
- List<TjProject> tjProjects = tjProjectService.list(wq0);
+ //涓婇潰鐨勬崲sql
+ final List<TjProject> tjProjects = tjProjectService.getProBySqlAndName(proName, checkType, deptId);
+
if (tjProjects != null) {
for (TjProject project : tjProjects) {
LambdaQueryWrapper<TjProject> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjProject::getProParentId, project.getProId());
+ if(null !=proName) {
+ wq1.like(TjProject::getProName, proName);
+ }
List<TjProject> projectList = tjProjectService.list(wq1);
project.setTjProjectList(projectList);
- //鏍规嵁姣忎釜椤圭洰鐨刣eptId鎷垮埌name 2023/2/7
+
SysDept sysDept = deptService.selectDeptById(project.getDeptId());
if (sysDept!=null){
project.setDeptName(sysDept.getDeptName());
--
Gitblit v1.8.0