From b22f118eabab8f2f27dbd73e7c6cb1090cd82c82 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期四, 27 三月 2025 14:46:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/boymi/YiFeiNN
---
medicalWaste-system/src/main/java/com/sinata/system/service/SysDepartmentService.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 insertions(+), 1 deletions(-)
diff --git a/medicalWaste-system/src/main/java/com/sinata/system/service/SysDepartmentService.java b/medicalWaste-system/src/main/java/com/sinata/system/service/SysDepartmentService.java
index fdab3b1..9e0c981 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/service/SysDepartmentService.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/service/SysDepartmentService.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.sinata.common.entity.PageDTO;
+import com.sinata.system.domain.MwApplication;
import com.sinata.system.domain.SysDepartment;
import com.sinata.system.domain.dto.DisposalUnitDTO;
import com.sinata.system.domain.dto.MedicalInstitutionDTO;
@@ -45,6 +46,8 @@
* @return
*/
List<SysDepartmentVO> getRegionTree(String keyword);
+ List<SysDepartmentVO> getRegionTree1(String keyword);
+ List<SysDepartmentVO> getRegionTree2(String keyword);
/**
* 当前登录用户所在区域
@@ -75,7 +78,7 @@
* @param parentId
* @return
*/
- String getTreeCode(Long parentId);
+ String generateTreeCode(Long parentId);
/**
* 生成组织编码
@@ -132,6 +135,14 @@
* @return
*/
List<DisposalUnitVO> getDisposalUnitListByParentId(Long id);
+
+ /**
+ * 获取完整区域
+ *
+ * @param department
+ * @return
+ */
+ String getRegionName(SysDepartment department);
/**
* 删除医疗机构
@@ -214,4 +225,27 @@
* @param id
*/
void deleteRegulatoryUnit(Long id);
+
+ /**
+ * 根据部门id获取树编码，如果为空则获取当前登录用户所在区域树编码
+ *
+ * @param departmentId
+ * @return
+ */
+ String getTreeCodeByDepartmentId(Long departmentId);
+
+ /**
+ * 路线关联医院列表
+ *
+ * @param id
+ * @return
+ */
+ List<MedicalInstitutionVO> getHospitalListByRouteId(Long id);
+
+ /**
+ * 创建机构
+ *
+ * @param mwApplication
+ */
+ void createDepartment(MwApplication mwApplication);
}
--
Gitblit v1.7.1