From f959cbc0a095dd3c86a1513b327931ca4ca996cb Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Tue, 9 Jul 2024 16:05:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=BA=93=E6=97=A0=E6=95=B0=E6=8D=AE=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../labelfieldinfo/LabelFieldInfoController.java      |  3 +++
 .../impl/LabelFieldInfoServiceImpl.java               | 11 +++++++++++
 .../manage/wechattemplate/WechatTemplateMapper.xml    | 10 +++++-----
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java
index 404b88b2..4da42b40 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/controller/labelfieldinfo/LabelFieldInfoController.java
@@ -116,6 +116,9 @@ public class LabelFieldInfoController extends BaseController {
         return toAjax(labelFieldInfoService.deleteLabelFieldInfoByIds(ids));
     }
 
+    /**
+     * 任务类型分组
+     */
     @GetMapping("/taskTypeGrouping")
     public AjaxResult taskTypeGrouping() {
         return labelFieldInfoService.taskTypeGrouping();
diff --git a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java
index b60813be..af02220b 100644
--- a/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java
+++ b/postdischarge-manage/src/main/java/com/xinelu/manage/service/labelfieldinfo/impl/LabelFieldInfoServiceImpl.java
@@ -181,14 +181,25 @@ public class LabelFieldInfoServiceImpl implements ILabelFieldInfoService {
         return 1;
     }
 
+    /**
+     * 查询字段信息
+     *
+     * @return AjaxResult
+     */
     @Override
     public AjaxResult taskTypeGrouping() {
+        //查询任务类型
         List<TaskTypeDictVO> taskTypeDictList = taskTypeDictMapper.selectTaskTypeDicts();
         List<Long> ids = taskTypeDictList.stream().filter(Objects::nonNull).map(TaskTypeDictVO::getTaskTypeId).filter(Objects::nonNull).collect(Collectors.toList());
+        //查询细分类型
+        if (CollectionUtils.isEmpty(taskTypeDictList)) {
+            return AjaxResult.success(taskTypeDictList);
+        }
         List<TaskPartitionDict> taskPartitionDicts = taskPartitionDictMapper.selectTaskPartitionList(ids);
         if (CollectionUtils.isEmpty(taskPartitionDicts)) {
             return AjaxResult.success(taskPartitionDicts);
         }
+        //组装
         for (TaskTypeDictVO taskTypeDictVO : taskTypeDictList) {
             List<TaskPartitionDict> collect = taskPartitionDicts.stream().filter(Objects::nonNull).filter(item -> Objects.nonNull(item.getTaskTypeId()) && taskTypeDictVO.getTaskTypeId().equals(item.getTaskTypeId())).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(collect)) {
diff --git a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
index 743a29b2..6cdc913d 100644
--- a/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
+++ b/postdischarge-manage/src/main/resources/mapper/manage/wechattemplate/WechatTemplateMapper.xml
@@ -125,14 +125,14 @@
         wt.template_sort,
         wt.template_remark,
         wtst.id AS taskId,
-	    GROUP_CONCAT(wtst.suit_task_type_name SEPARATOR ',') as suitTaskTypeName
+        GROUP_CONCAT(wtst.suit_task_type_name SEPARATOR ',') as suitTaskTypeName
         from wechat_template wt
         left join wechat_template_suit_task wtst on wt.id = wtst.wechat_template_id
         left join department d on d.id = wt.department_id
         <where>
-	        <if test="hospitalAgencyId != null">
-		        and d.hospital_agency_id = #{hospitalAgencyId}
-	        </if>
+            <if test="hospitalAgencyId != null">
+                and d.hospital_agency_id = #{hospitalAgencyId}
+            </if>
             <if test="departmentId != null ">
                 and wt.department_id =
                 #{departmentId}
@@ -156,7 +156,7 @@
             <!-- 数据范围过滤 -->
             ${params.dataScope}
         </where>
-        group by wt.id order by wt.create_time DESC,wtst.create_time DESC
+        group by wt.id,wtst.id order by wt.create_time DESC,wtst.create_time DESC
     </select>
     <select id="selectWechatTemplateDtoById" resultMap="WechatTemplateVOResultMap">
         select wt.id,