From 8a328877cbca02f2733021687faf5547dfd8e897 Mon Sep 17 00:00:00 2001
From: luoyisheng <yangdongji@argo-ai.cn>
Date: 星期三, 26 三月 2025 17:26:36 +0800
Subject: [PATCH] bug
---
medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
index bf300e5..7b9c98f 100644
--- a/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
+++ b/medicalWaste-admin/src/main/java/com/sinata/web/controller/applet/AppDepartmentController.java
@@ -94,9 +94,8 @@
@ApiOperation("获取医院监管列表")
@PostMapping("/hospita/list")
public R<List<SysDepartment>> list(String name, Long areaId) {
- Long departmentId = SecurityUtils.getLoginUser().getUser().getDepartmentId();
- SysDepartment byId = sysDepartmentService.getById(departmentId);
- List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).eq(areaId != null, SysDepartment::getParentId, areaId).like(name != null, SysDepartment::getDepartmentName, name).eq(SysDepartment::getOrgType, 2).list();
+ SysDepartment byId = sysDepartmentService.getMyDepartment();
+ List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(name != null, SysDepartment::getDepartmentName, name).eq(SysDepartment::getOrgType, 2).list();
for (SysDepartment sysDepartment : list) {
//获取医院暂存间信息
MwStagingRoom one = roomService.lambdaQuery().eq(MwStagingRoom::getDepartmentId, sysDepartment.getId()).one();
@@ -119,8 +118,9 @@
@ApiOperation("获取处置监管列表")
@PostMapping("/end/list")
- public R<List<SysDepartment>> list2(String name) {
- List<SysDepartment> list = sysDepartmentService.lambdaQuery().like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 3).list();
+ public R<List<SysDepartment>> list2(String name,Long areaId) {
+ SysDepartment byId = sysDepartmentService.getById(areaId);
+ List<SysDepartment> list = sysDepartmentService.lambdaQuery().likeRight(SysDepartment::getTreeCode, byId.getTreeCode()).like(name!=null,SysDepartment::getDepartmentName,name).eq(SysDepartment::getOrgType, 3).list();
LocalDate now = LocalDate.now();
for (SysDepartment sysDepartment : list) {
//获取库存总量
--
Gitblit v1.7.1