From 0d50919da24bda3b51e2c19a75d71bdfee36de98 Mon Sep 17 00:00:00 2001
From: lige <bestlige@outlook.com>
Date: 星期三, 06 三月 2024 11:41:05 +0800
Subject: [PATCH] 小程序绑定查看就诊人、查看报告问题
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 19 ++++++++++++++++++-
1 files changed, 18 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 ac3f3de..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
@@ -1237,6 +1237,10 @@
return toAjax(deptService.insertDept(dept));
}
+
+ @Resource
+ private IDictHospService dictHospService;
+
/**
* 淇敼绉戝閮ㄩ棬
*/
@@ -1255,6 +1259,16 @@
return error("璇ラ儴闂ㄥ寘鍚湭鍋滅敤鐨勫瓙閮ㄩ棬锛�");
}
dept.setUpdateBy(getUsername());
+
+ //鏌ヨ闄㈠尯鍚嶅瓧璧嬪��
+ if (dept.getHospId()!=null){
+ final DictHosp byId = dictHospService.getById(dept.getHospId());
+ if (byId!=null){
+ dept.setHospName(byId.getHospAreaName());
+ }
+ }
+
+
return toAjax(deptService.updateDept(dept));
}
@@ -1352,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);
@@ -1421,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());
@@ -1428,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