From 9dfe13a0bc2dc3afeed9ae134c857d7d7895fd02 Mon Sep 17 00:00:00 2001
From: youxilong <yxllx@163.com>
Date: Wed, 28 Feb 2024 13:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=A7=91?=
 =?UTF-8?q?=E5=AE=A4=E5=8F=8A=E5=85=B6=E4=B8=8B=E5=B1=9E=E6=89=8B=E6=9C=AF?=
 =?UTF-8?q?=E3=80=81=E8=AF=9D=E6=9C=AF=E3=80=81=E5=BE=AE=E4=BF=A1=E5=BA=93?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../department/DepartmentController.java      |  16 ++-
 .../mapper/department/DepartmentMapper.java   |   8 ++
 .../department/IDepartmentService.java        |   7 +
 .../impl/DepartmentServiceImpl.java           |  11 ++
 .../manage/department/DepartmentMapper.xml    | 125 ++++--------------
 5 files changed, 62 insertions(+), 105 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java
index 870994f2..49f17832 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/department/DepartmentController.java
@@ -99,18 +99,26 @@ public class DepartmentController extends BaseController {
      * 查询科室信息列表及包含话术数量
      */
     @GetMapping("/listScriptNum")
-    public R<List<Department>> listScriptNum(Department department) {
+    public AjaxResult listScriptNum(Department department) {
         List<Department> list = departmentService.selectDepartmentListScriptNum(department);
-        return R.ok(list);
+        return AjaxResult.success(list);
     }
 
     /**
      * 查询科室信息列表及包含手术数量
      */
     @GetMapping("/listOperationNum")
-    public R<List<Department>> listOperationNum(Department department) {
+    public AjaxResult listOperationNum(Department department) {
         List<Department> list = departmentService.selectDepartmentListOperationNum(department);
-        return R.ok(list);
+        return AjaxResult.success(list);
     }
 
+    /**
+     * 查询科室信息列表及包含微信库数量
+     */
+    @GetMapping("/listWechatTemplateNum")
+    public AjaxResult listWechatTemplateNum(Department department) {
+        List<Department> list = departmentService.selectDepartmentListWechatTemplateNum(department);
+        return AjaxResult.success(list);
+    }
 }
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 150738dd..a0a6f072 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
@@ -73,4 +73,12 @@ public interface DepartmentMapper {
      * @return
      */
     List<Department> selectDepartmentListOperationNum(Department department);
+
+    /**
+     * 查询科室信息列表及包含微信库数量
+     * @param department
+     * @return
+     */
+    List<Department> selectDepartmentListWechatTemplateNum(Department department);
+
 }
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 45c3405a..f4133ebe 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
@@ -73,4 +73,11 @@ public interface IDepartmentService {
      * @return
      */
     List<Department> selectDepartmentListOperationNum(Department department);
+
+    /**
+     * 查询科室信息列表及包含微信库数量
+     * @param department
+     * @return
+     */
+    List<Department> selectDepartmentListWechatTemplateNum(Department department);
 }
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 2d8a55b4..336b9c72 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
@@ -110,4 +110,15 @@ public class DepartmentServiceImpl implements IDepartmentService {
     public List<Department> selectDepartmentListOperationNum(Department department) {
         return departmentMapper.selectDepartmentListOperationNum(department);
     }
+
+    /**
+     * 查询科室信息列表及包含微信库数量
+     *
+     * @param department
+     * @return
+     */
+    @Override
+    public List<Department> selectDepartmentListWechatTemplateNum(Department department) {
+        return departmentMapper.selectDepartmentListWechatTemplateNum(department);
+    }
 }
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 0354e172..241f5090 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/department/DepartmentMapper.xml
@@ -165,136 +165,59 @@
 
     <select id="selectDepartmentListScriptNum" resultType="com.xinelu.manage.domain.department.Department">
         select d.id,
-        d.parent_department_id,
-        d.agency_id,
-        d.agency_name,
         d.department_name,
         d.department_code,
-        d.department_type,
-        d.department_abbreviation,
-        d.department_person_id,
-        d.department_person_name,
-        d.node_type,
-        d.provide_service_category,
-        d.subdivision_category_id,
-        d.subdivision_category_name,
-        d.norm_department_compare_id,
-        d.norm_department_compare_name,
-        d.prepare_beds_count,
-        d.department_phone,
-        d.department_mail,
-        d.establish_date,
-        d.revoke_date,
-        d.create_by,
-        d.create_time,
-        d.update_by,
-        d.update_time,
         count(si.id) AS countNum
         from department d left join script_info si on d.id = si.department_id
         <where>
             <if test="departmentCode != null  and departmentCode != ''">
-                and d.department_code =
-                #{departmentCode}
+                and d.department_code = #{departmentCode}
             </if>
             <if test="departmentName != null  and departmentName != ''">
-                and d.department_name like concat('%',
-                #{departmentName},
-                '%'
-                )
+                and d.department_name like concat('%',#{departmentName},'%')
             </if>
         </where>
         GROUP BY d.id,
-        d.parent_department_id,
-        d.agency_id,
-        d.agency_name,
         d.department_name,
-        d.department_code,
-        d.department_type,
-        d.department_abbreviation,
-        d.department_person_id,
-        d.department_person_name,
-        d.node_type,
-        d.provide_service_category,
-        d.subdivision_category_id,
-        d.subdivision_category_name,
-        d.norm_department_compare_id,
-        d.norm_department_compare_name,
-        d.prepare_beds_count,
-        d.department_phone,
-        d.department_mail,
-        d.establish_date,
-        d.revoke_date,
-        d.create_by,
-        d.create_time,
-        d.update_by,
-        d.update_time;
+        d.department_code
     </select>
 
     <select id="selectDepartmentListOperationNum" resultType="com.xinelu.manage.domain.department.Department">
         select d.id,
-        d.parent_department_id,
-        d.agency_id,
-        d.agency_name,
         d.department_name,
         d.department_code,
-        d.department_type,
-        d.department_abbreviation,
-        d.department_person_id,
-        d.department_person_name,
-        d.node_type,
-        d.provide_service_category,
-        d.subdivision_category_id,
-        d.subdivision_category_name,
-        d.norm_department_compare_id,
-        d.norm_department_compare_name,
-        d.prepare_beds_count,
-        d.department_phone,
-        d.department_mail,
-        d.establish_date,
-        d.revoke_date,
-        d.create_by,
-        d.create_time,
-        d.update_by,
-        d.update_time,
         count(oi.id) AS countNum
         from department d left join operation_info oi on d.id = oi.department_id
         <where>
             <if test="departmentCode != null  and departmentCode != ''">
-                and d.department_code =
-                #{departmentCode}
+                and d.department_code = #{departmentCode}
             </if>
             <if test="departmentName != null  and departmentName != ''">
-                and d.department_name like concat('%',
-                #{departmentName},
-                '%'
-                )
+                and d.department_name like concat('%',#{departmentName},'%')
             </if>
         </where>
         GROUP BY d.id,
-        d.parent_department_id,
-        d.agency_id,
-        d.agency_name,
+        d.department_name,
+        d.department_code
+    </select>
+    <select id="selectDepartmentListWechatTemplateNum"
+            resultType="com.xinelu.manage.domain.department.Department">
+        select d.id,
         d.department_name,
         d.department_code,
-        d.department_type,
-        d.department_abbreviation,
-        d.department_person_id,
-        d.department_person_name,
-        d.node_type,
-        d.provide_service_category,
-        d.subdivision_category_id,
-        d.subdivision_category_name,
-        d.norm_department_compare_id,
-        d.norm_department_compare_name,
-        d.prepare_beds_count,
-        d.department_phone,
-        d.department_mail,
-        d.establish_date,
-        d.revoke_date,
-        d.create_by,
-        d.create_time,
-        d.update_by,
-        d.update_time;
+        count(wt.id) AS countNum
+        from department d left join wechat_template wt on d.id = wt.department_id
+        <where>
+            <if test="departmentCode != null  and departmentCode != ''">
+                and d.department_code = #{departmentCode}
+            </if>
+            <if test="departmentName != null  and departmentName != ''">
+                and d.department_name like concat('%',#{departmentName},'%')
+            </if>
+        </where>
+        GROUP BY d.id,
+        d.department_name,
+        d.department_code
     </select>
 
     <insert id="insertDepartment" parameterType="Department" useGeneratedKeys="true"