From b814abb328d65253e1ecf0a2ed1055d09506c414 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 06 三月 2024 10:23:34 +0800
Subject: [PATCH] zjh 本地 2024/03/6 -1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index a2b8c34..2eec84e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1366,7 +1366,7 @@
                     if (null != summaryList && summaryList.size()>0 && !summaryList.contains(null)) {
                         one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                     }
-                    one.setDeptId(orderRemark.getDeptId());
+//                    one.setDeptId(orderRemark.getDeptId());
                     one.setDoctorName(orderRemark.getDoctorName());
                     one.setType(1);
                     remarkService.updateById(one);
@@ -1435,6 +1435,7 @@
             wqq.eq(TjOrderDetail::getOrderId, one.getOrderId());
             wqq.isNotNull(TjOrderDetail::getFlowingWaterId);
             wqq.in(TjOrderDetail::getProId, proIdList);
+            wqq.notIn(TjOrderDetail::getProId, proIdList,projectService.getNneedReprotProId());
             List<TjOrderDetail> detailList = detailService.list(wqq);
             if (detailList != null && detailList.size() > 0) {
                 List<Long> collect = detailList.stream().map(TjOrderDetail::getProId).collect(Collectors.toList());
@@ -1442,6 +1443,8 @@
                 wq.eq("tj_number", tjNumber);
                 wq.in("pro_id", collect);
                 wq.ne("type", 2);
+                wq.ne("dept_id",241);
+                wq.notIn("pro_id", proIdList,projectService.getNneedReprotProId());
                 List<TjOrderRemark> list = remarkService.list(wq);
                 if (list.size() == 0) {
                     return AjaxResult.success("璇ョ瀹や笅鏃犻」鐩紒");

--
Gitblit v1.8.0