Merge branch 'master' of https://codeup.aliyun.com/61c0318acd8b75daa5a125f7/medical/openhis

openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java

@@ -1,6 +1,5 @@
 package com.openhis.clinical.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.clinical.domain.ConditionDefinition;
 
@@ -12,19 +11,6 @@ import com.openhis.clinical.domain.ConditionDefinition;
  */
 public interface IConditionDefinitionService extends IService<ConditionDefinition> {
 
-    /**
-     * 查询病种目录分页列表
-     *
-     * @param searchKey 查询条件
-     * @param status 查询条件-状态
-     * @param sourceEnum 查询条件-疾病种类
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @return
-     */
-    Page<ConditionDefinition> getPage(String searchKey, Integer status, Integer sourceEnum, Integer pageNo,
-        Integer pageSize);
-
     /**
      * 新增病种
      * 

openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java

@@ -2,12 +2,10 @@ package com.openhis.clinical.service.impl;
 
 import java.util.List;
 
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.clinical.domain.ConditionDefinition;
 import com.openhis.clinical.mapper.ConditionDefinitionMapper;
@@ -30,43 +28,6 @@ public class ConditionDefinitionServiceImpl extends ServiceImpl<ConditionDefinit
 
     private final ConditionDefinitionMapper conditionDefinitionMapper;
 
-    /**
-     * 查询病种目录分页列表
-     * 
-     * @param searchKey 查询条件
-     * @param status 查询条件-状态
-     * @param sourceEnum 查询条件-疾病种类
-     * @param pageNo 当前页码
-     * @param pageSize 查询条数
-     * @return
-     */
-    @Override
-    public Page<ConditionDefinition> getPage(String searchKey, Integer status, Integer sourceEnum, Integer pageNo,
-        Integer pageSize) {
-        Page<ConditionDefinition> conditionList;
-        // 生成查询条件
-        LambdaQueryWrapper<ConditionDefinition> queryWrapper = new LambdaQueryWrapper<>();
-        // 模糊查询项目
-        if (StringUtils.isNotEmpty(searchKey)) {
-            // 模糊查询项目为【疾病编码】，【疾病名称】，【拼音】，【五笔】
-            queryWrapper.and(q -> q.like(ConditionDefinition::getConditionCode, searchKey).or()
-                .like(ConditionDefinition::getName, searchKey).or().like(ConditionDefinition::getPyStr, searchKey).or()
-                .like(ConditionDefinition::getWbStr, searchKey));
-        }
-        // 查询状态
-        if (status != -1) {
-            queryWrapper.eq(ConditionDefinition::getStatusEnum, status);
-        }
-        // 分类查询
-        if (sourceEnum != -1) {
-            queryWrapper.eq(ConditionDefinition::getSourceEnum, sourceEnum);
-        }
-        // 查询病种目录列表
-        conditionList = conditionDefinitionMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
-        // 返回病种目录列表
-        return conditionList;
-    }
-
     /**
      * 新增病种
      *