diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java
index 250f5abd..eabffd63 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/mapper/department/DepartmentMapper.java
@@ -2,6 +2,7 @@ package com.xinelu.manage.mapper.department;
import com.xinelu.manage.domain.department.Department;
import com.xinelu.manage.dto.department.DepartmentDTO;
+import com.xinelu.manage.vo.department.DepartmentListVO;
import com.xinelu.manage.vo.department.DepartmentVO;
import org.apache.ibatis.annotations.Param;
@@ -23,6 +24,14 @@ public interface DepartmentMapper {
*/
Department selectDepartmentById(Long id);
+ /**
+ * 查询科室信息
+ *
+ * @param id 科室信息主键
+ * @return 科室信息
+ */
+ DepartmentListVO selectDepartment(Long id);
+
/**
* 查询科室信息列表
*
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java
index 3f44beb0..f7715ff9 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/IDepartmentService.java
@@ -3,6 +3,7 @@ package com.xinelu.manage.service.department;
import com.xinelu.common.core.domain.AjaxResult;
import com.xinelu.manage.domain.department.Department;
import com.xinelu.manage.dto.department.DepartmentDTO;
+import com.xinelu.manage.vo.department.DepartmentListVO;
import com.xinelu.manage.vo.department.DepartmentVO;
import java.util.List;
@@ -21,7 +22,7 @@ public interface IDepartmentService {
* @param id 科室信息主键
* @return 科室信息
*/
- Department selectDepartmentById(Long id);
+ DepartmentListVO selectDepartmentById(Long id);
/**
* 查询科室信息列表
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
index 0aa6be73..744db875 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/department/impl/DepartmentServiceImpl.java
@@ -11,6 +11,7 @@ import com.xinelu.manage.domain.department.Department;
import com.xinelu.manage.dto.department.DepartmentDTO;
import com.xinelu.manage.mapper.department.DepartmentMapper;
import com.xinelu.manage.service.department.IDepartmentService;
+import com.xinelu.manage.vo.department.DepartmentListVO;
import com.xinelu.manage.vo.department.DepartmentVO;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
@@ -45,8 +46,8 @@ public class DepartmentServiceImpl implements IDepartmentService {
* @return 科室信息
*/
@Override
- public Department selectDepartmentById(Long id) {
- return departmentMapper.selectDepartmentById(id);
+ public DepartmentListVO selectDepartmentById(Long id) {
+ return departmentMapper.selectDepartment(id);
}
/**
@@ -140,7 +141,6 @@ public class DepartmentServiceImpl implements IDepartmentService {
}
/**
- *
* 查询科室信息列表及包含短信库数量
*
* @param departmentDto
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/department/DepartmentListVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/department/DepartmentListVO.java
new file mode 100644
index 00000000..3e4c44ea
--- /dev/null
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/department/DepartmentListVO.java
@@ -0,0 +1,21 @@
+package com.xinelu.manage.vo.department;
+
+import com.xinelu.manage.domain.department.Department;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 科室信息对象vo
+ *
+ * @author zh
+ * @date 2024-02-26
+ */
+@EqualsAndHashCode(callSuper = true)
+@Data
+public class DepartmentListVO extends Department {
+
+ /**
+ * 上级科室名称
+ */
+ private String parentDepartmentName;
+}
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/department/DepartmentVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/department/DepartmentVO.java
index 3e327668..960c0da6 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/department/DepartmentVO.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/department/DepartmentVO.java
@@ -7,8 +7,6 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
/**
* @author : youxilong
@@ -44,17 +42,4 @@ public class DepartmentVO extends BaseEntity {
*/
@ApiModelProperty(value = "科室代码")
private Integer countNum;
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("departmentName", getDepartmentName())
- .append("departmentCode", getDepartmentCode())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
- }
}
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
index 4d9a1c31..83fafcab 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
@@ -133,6 +133,37 @@
where id = #{id}
+
+