From de03286f270f83f93926ef7bd279f22fb47e1d31 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 28 Feb 2024 16:12:51 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E8=A1=8C=E6=94=BF?=
 =?UTF-8?q?=E5=8C=BA=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agency/impl/AgencyServiceImpl.java        |  2 +
 .../com/xinelu/manage/vo/agency/AgencyVO.java | 10 +++
 .../manage/department/DepartmentMapper.xml    | 70 ++++++-------------
 3 files changed, 32 insertions(+), 50 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
index e1f9e9f2..bc39bcef 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/agency/impl/AgencyServiceImpl.java
@@ -61,6 +61,8 @@ public class AgencyServiceImpl implements IAgencyService {
             agency.setRegionName(StringUtils.isBlank(nurseStationAndAreaCode.getRegionName()) ? "" : nurseStationAndAreaCode.getRegionName());
             agency.setStreetCode(StringUtils.isBlank(nurseStationAndAreaCode.getStreetCode()) ? "" : nurseStationAndAreaCode.getStreetCode());
             agency.setStreetName(StringUtils.isBlank(nurseStationAndAreaCode.getStreetName()) ? "" : nurseStationAndAreaCode.getStreetName());
+            agency.setCommunityCode(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityCode()) ? "" : nurseStationAndAreaCode.getCommunityCode());
+            agency.setCommunityName(StringUtils.isBlank(nurseStationAndAreaCode.getCommunityName()) ? "" : nurseStationAndAreaCode.getCommunityName());
         }
         return agency;
     }
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java
index 64ec09b9..906c719b 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/vo/agency/AgencyVO.java
@@ -59,6 +59,16 @@ public class AgencyVO extends Agency {
      */
     private String streetCode;
 
+    /**
+     * 社区名称
+     */
+    private String communityName;
+
+    /**
+     * 社区区域编码
+     */
+    private String communityCode;
+
     /**
      * 上级机构
      */
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 7568865a..4d9a1c31 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
@@ -65,94 +65,64 @@
         <include refid="selectDepartmentVo"/>
         <where>
             <if test="parentDepartmentId != null ">
-                and parent_department_id =
-                #{parentDepartmentId}
+                and parent_department_id =#{parentDepartmentId}
             </if>
             <if test="agencyId != null ">
-                and agency_id =
-                #{agencyId}
+                and agency_id =#{agencyId}
             </if>
             <if test="agencyName != null  and agencyName != ''">
-                and agency_name like concat('%',
-                #{agencyName},
-                '%'
-                )
+                and agency_name like concat('%',#{agencyName},'%')
             </if>
             <if test="departmentName != null  and departmentName != ''">
-                and department_name like concat('%',
-                #{departmentName},
-                '%'
-                )
+                and department_name like concat('%',#{departmentName},'%')
             </if>
             <if test="departmentCode != null  and departmentCode != ''">
-                and department_code =
-                #{departmentCode}
+                and department_code =#{departmentCode}
             </if>
             <if test="departmentType != null  and departmentType != ''">
-                and department_type =
-                #{departmentType}
+                and department_type =#{departmentType}
             </if>
             <if test="departmentAbbreviation != null  and departmentAbbreviation != ''">
-                and department_abbreviation =
-                #{departmentAbbreviation}
+                and department_abbreviation =#{departmentAbbreviation}
             </if>
             <if test="departmentPersonId != null ">
-                and department_person_id =
-                #{departmentPersonId}
+                and department_person_id =#{departmentPersonId}
             </if>
             <if test="departmentPersonName != null  and departmentPersonName != ''">
-                and department_person_name like concat('%',
-                #{departmentPersonName},
-                '%'
-                )
+                and department_person_name like concat ('%',#{departmentPersonName},'%')
             </if>
             <if test="nodeType != null  and nodeType != ''">
-                and node_type =
-                #{nodeType}
+                and node_type =#{nodeType}
             </if>
             <if test="provideServiceCategory != null  and provideServiceCategory != ''">
-                and provide_service_category =
-                #{provideServiceCategory}
+                and provide_service_category =#{provideServiceCategory}
             </if>
             <if test="subdivisionCategoryId != null ">
-                and subdivision_category_id =
-                #{subdivisionCategoryId}
+                and subdivision_category_id =#{subdivisionCategoryId}
             </if>
             <if test="subdivisionCategoryName != null  and subdivisionCategoryName != ''">
-                and subdivision_category_name like concat('%',
-                #{subdivisionCategoryName},
-                '%'
-                )
+                and subdivision_category_name like concat('%',#{subdivisionCategoryName},'%')
             </if>
             <if test="normDepartmentCompareId != null ">
-                and norm_department_compare_id =
-                #{normDepartmentCompareId}
+                and norm_department_compare_id =#{normDepartmentCompareId}
             </if>
             <if test="normDepartmentCompareName != null  and normDepartmentCompareName != ''">
-                and norm_department_compare_name like concat('%',
-                #{normDepartmentCompareName},
-                '%'
-                )
+                and norm_department_compare_name like concat('%',#{normDepartmentCompareName},'%')
             </if>
             <if test="prepareBedsCount != null ">
-                and prepare_beds_count =
-                #{prepareBedsCount}
+                and prepare_beds_count =#{prepareBedsCount}
             </if>
             <if test="departmentPhone != null  and departmentPhone != ''">
-                and department_phone =
-                #{departmentPhone}
+                and department_phone =#{departmentPhone}
             </if>
             <if test="departmentMail != null  and departmentMail != ''">
-                and department_mail =
-                #{departmentMail}
+                and department_mail =#{departmentMail}
             </if>
             <if test="establishDate != null ">
-                and establish_date =
-                #{establishDate}
+                and establish_date =#{establishDate}
             </if>
             <if test="revokeDate != null ">
-                and revoke_date =
-                #{revokeDate}
+                and revoke_date =#{revokeDate}
             </if>
         </where>
     </select>

From 293e8b025739cb95a9434b068aa5dcfc1b361c7e Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Wed, 28 Feb 2024 16:34:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=B8=8A=E7=BA=A7?=
 =?UTF-8?q?=E7=A7=91=E5=AE=A4=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/department/DepartmentMapper.java   |  9 ++++++
 .../department/IDepartmentService.java        |  3 +-
 .../impl/DepartmentServiceImpl.java           |  6 ++--
 .../vo/department/DepartmentListVO.java       | 21 +++++++++++++
 .../manage/vo/department/DepartmentVO.java    | 15 ---------
 .../manage/department/DepartmentMapper.xml    | 31 +++++++++++++++++++
 6 files changed, 66 insertions(+), 19 deletions(-)
 create mode 100644 postdischarge-manage/src/main/java/com/xinelu/manage/vo/department/DepartmentListVO.java

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}
     </select>
 
+    <select id="selectDepartment" resultType="com.xinelu.manage.vo.department.DepartmentListVO">
+        select id,
+               dt.parent_department_id,
+               agency_id,
+               agency_name,
+               department_name,
+               department_code,
+               department_type,
+               department_abbreviation,
+               department_person_id,
+               department_person_name,
+               node_type,
+               provide_service_category,
+               subdivision_category_id,
+               subdivision_category_name,
+               norm_department_compare_id,
+               norm_department_compare_name,
+               prepare_beds_count,
+               department_phone,
+               department_mail,
+               establish_date,
+               revoke_date,
+               create_by,
+               create_time,
+               update_by,
+               update_time,
+               (select department_name from department where id = dt.parent_department_id) parentDepartmentName
+        from department dt
+        where id = #{id}
+    </select>
+
     <select id="selectDepartmentListScriptNum" resultType="com.xinelu.manage.vo.department.DepartmentVO">
         select d.id,
         d.department_name,