诊断模板接口优化，父级要把所有子集的诊断模板查询出来

eitc-patient-base/src/main/java/com/eitc/patient/mapper/DiagnosisTypeMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.eitc.patient.domain.DiagnosisType;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * DiagnosisTypeMapper
  *
@@ -12,4 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface DiagnosisTypeMapper extends BaseMapper<DiagnosisType> {
+
+
+    List<DiagnosisType> selectChildrenListById(String diagnosisTypeId);
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/IDiagnosisTypeService.java

@@ -65,4 +65,6 @@ public interface IDiagnosisTypeService extends IService<DiagnosisType> {
      * @throws IllegalArgumentException 如果诊断类型ID为空或存在子类型，则抛出此异常
      */
     void checkAddDiagnosisType(String diagnosisTypeId);
+
+    List<DiagnosisType> selectChildrenListById(String diagnosisTypeId);
 }

eitc-patient-base/src/main/java/com/eitc/patient/service/impl/DiagnosisTypeServiceImpl.java

@@ -168,4 +168,9 @@ public class DiagnosisTypeServiceImpl extends ServiceImpl<DiagnosisTypeMapper, D
         }
     }
 
+    @Override
+    public List<DiagnosisType> selectChildrenListById(String diagnosisTypeId) {
+        return this.baseMapper.selectChildrenListById(diagnosisTypeId);
+    }
+
 }

eitc-patient-base/src/main/resources/mapper/patient/DiagnosisTypeMapper.xml

@@ -3,4 +3,19 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.eitc.patient.mapper.DiagnosisTypeMapper">
+    <select id="selectChildrenListById" resultType="com.eitc.patient.domain.DiagnosisType">
+        select
+            parent_id,
+            ancestors,
+            diagnosis_name,
+            diagnosis_name_pinyin_first_letter,
+            diagnosis_name_pinyin,
+            id,
+            create_date,
+            create_user,
+            update_date,
+            update_user
+            from erm_diagnosis_type
+            where is_del = 0 and find_in_set(#{diagnosisTypeId}, ancestors)
+    </select>
 </mapper>

eitc-patient-pc/src/main/java/com/eitc/patient/controller/DiagnosisTypeTemplateController.java

@@ -10,8 +10,10 @@ import com.eitc.common.core.page.TableDataInfo;
 import com.eitc.common.enums.BusinessType;
 import com.eitc.common.utils.bean.BeanUtils;
 import com.eitc.common.utils.poi.ExcelUtil;
+import com.eitc.patient.domain.DiagnosisType;
 import com.eitc.patient.domain.DiagnosisTypeTemplate;
 import com.eitc.patient.excel.DiagnosisTypeTemplateExcel;
+import com.eitc.patient.service.IDiagnosisTypeService;
 import com.eitc.patient.service.IDiagnosisTypeTemplateService;
 import com.eitc.patient.vo.DiagnosisTypeTemplateSaveVO;
 import com.eitc.patient.vo.DiagnosisTypeTemplateVO;
@@ -35,8 +37,10 @@ import javax.validation.Valid;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -52,6 +56,8 @@ public class DiagnosisTypeTemplateController extends BaseController {
 
     @Resource
     private IDiagnosisTypeTemplateService diagnosisTypeTemplateService;
+    @Resource
+    private IDiagnosisTypeService diagnosisTypeService;
 
 
     /**
@@ -60,10 +66,19 @@ public class DiagnosisTypeTemplateController extends BaseController {
     @GetMapping("/page")
     @ApiOperation("查询诊断分类模板")
     public TableDataInfo page(DiagnosisTypeTemplate diagnosisTypeTemplate) {
+        Set<String> ids = new HashSet<>();
+        if (Objects.nonNull(diagnosisTypeTemplate.getDiagnosisTypeId())) {
+            ids.add(diagnosisTypeTemplate.getDiagnosisTypeId());
+            List<DiagnosisType> list = diagnosisTypeService.selectChildrenListById(diagnosisTypeTemplate.getDiagnosisTypeId());
+            Set<String> collect = list.stream().map(DiagnosisType::getId).collect(Collectors.toSet());
+            if (CollectionUtils.isNotEmpty(collect)) {
+                ids.addAll(collect);
+            }
+        }
+
         startPage();
         LambdaQueryWrapper<DiagnosisTypeTemplate> eq = Wrappers.<DiagnosisTypeTemplate>lambdaQuery()
-                .like(Objects.nonNull(diagnosisTypeTemplate.getDiagnosisTypeId()),
-                        DiagnosisTypeTemplate::getDiagnosisTypeId, diagnosisTypeTemplate.getDiagnosisTypeId())
+                .in(CollectionUtils.isNotEmpty(ids), DiagnosisTypeTemplate::getDiagnosisTypeId, ids)
                 .orderByDesc(DiagnosisTypeTemplate::getCreateDate);
         List<DiagnosisTypeTemplate> list = diagnosisTypeTemplateService.list(eq);
         List<DiagnosisTypeTemplateVO> voList = new ArrayList<>();

sql/初始化脚本.sql

@@ -35195,38 +35195,38 @@ CREATE TABLE `erm_diagnosis_type_order_doctor`  (
 -- Table structure for erm_diagnosis_type_template
 -- ----------------------------
 DROP TABLE IF EXISTS `erm_diagnosis_type_template`;
-CREATE TABLE `erm_diagnosis_type_template`  (
-                                              `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
-                                              `is_del` int NOT NULL DEFAULT 0 COMMENT '删除标识：0正常，1已删除',
-                                              `create_date` datetime NOT NULL COMMENT '创建时间',
-                                              `create_user` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建人',
-                                              `update_date` datetime NULL DEFAULT NULL COMMENT '更新时间',
-                                              `update_user` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '更新人',
-                                              `tenant_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT '000000' COMMENT '租户ID',
-                                              `diagnosis_type_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '诊断分类id',
-                                              `template_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '模板名称',
-                                              `name_pinyin_first_letter` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '诊断名称首拼',
-                                              `name_pinyin` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '诊断名称拼音',
-                                              `template_desc` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '模板描述',
-                                              `diagnosis_manage_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '诊断管理id',
-                                              `diagnosis_manage_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '诊断管理名称',
-                                              `apply_dept` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '适用科室',
-                                              `visit_type` int NULL DEFAULT NULL COMMENT '就诊类型（1初诊，2复诊）',
-                                              `enable_status` int NULL DEFAULT 1 COMMENT '启用状态（1启用，0未启用）',
-                                              `chief_complaint_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主诉内容',
-                                              `chief_complaint_option` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '主诉选项',
-                                              `present_illness_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '现病史内容',
-                                              `present_illness_option` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '现病史选项',
-                                              `inspect_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '检查内容',
-                                              `inspect_option` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '检查选项',
-                                              `treatment_planning_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '治疗计划内容',
-                                              `treatment_planning_option` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '治疗计划选项',
-                                              `dispose_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '处置内容',
-                                              `dispose_option` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '处置选项',
-                                              `note_content` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '便签内容',
-                                              `note_option` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT '便签选项',
-                                              PRIMARY KEY (`id`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8 COLLATE = utf8_general_ci COMMENT = '诊断分类模板' ROW_FORMAT = DYNAMIC;
+CREATE TABLE `erm_diagnosis_type_template` (
+  `id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+  `is_del` int NOT NULL DEFAULT '0' COMMENT '删除标识：0正常，1已删除',
+  `create_date` datetime NOT NULL COMMENT '创建时间',
+  `create_user` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建人',
+  `update_date` datetime DEFAULT NULL COMMENT '更新时间',
+  `update_user` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '更新人',
+  `tenant_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '000000' COMMENT '租户ID',
+  `diagnosis_type_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '诊断分类id',
+  `template_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '模板名称',
+  `name_pinyin_first_letter` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '诊断名称首拼',
+  `name_pinyin` varchar(200) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '诊断名称拼音',
+  `template_desc` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '模板描述',
+  `diagnosis_manage_id` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '诊断管理id',
+  `diagnosis_manage_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '诊断管理名称',
+  `apply_dept` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '适用科室',
+  `visit_type` int DEFAULT NULL COMMENT '就诊类型（1初诊，2复诊）',
+  `enable_status` int DEFAULT '1' COMMENT '启用状态（1启用，0未启用）',
+  `chief_complaint_content` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '主诉内容',
+  `chief_complaint_option` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '主诉选项',
+  `present_illness_content` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '现病史内容',
+  `present_illness_option` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '现病史选项',
+  `inspect_content` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '检查内容',
+  `inspect_option` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '检查选项',
+  `treatment_planning_content` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '治疗计划内容',
+  `treatment_planning_option` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '治疗计划选项',
+  `dispose_content` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '处置内容',
+  `dispose_option` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '处置选项',
+  `note_content` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '便签内容',
+  `note_option` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '便签选项',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb3 COMMENT='诊断分类模板';
 
 -- ----------------------------
 -- Records of erm_diagnosis_type_template