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

2025-02-24 17:17:09 +08:00
parent 515280f8a3 6cb9019cfb
commit 3c80eab39d
7 changed files with 232 additions and 47 deletions
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
@@ -1,14 +1,15 @@
 package com.openhis.administration.service;

+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.administration.domain.Organization;

 /**
- * 机构管理Service接口
+ * 机构管理(科室)Service接口
 *
 * @author system
- * @date 2025-02-20
+ * @date 2025-02-21
 */
 public interface IOrganizationService extends IService<Organization> {
-
+    Page<Organization> getOrganizationPage(Integer classEnum,Integer activeFlag, Integer pageNo, Integer pageSize);
 }
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
@@ -1,19 +1,53 @@
 package com.openhis.administration.service.impl;

+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

+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.administration.domain.Organization;
 import com.openhis.administration.mapper.OrganizationMapper;
 import com.openhis.administration.service.IOrganizationService;
+import com.openhis.common.enums.DelFlag;

 /**
- * 机构管理Service业务层处理
+ * 机构管理(科室)Service业务层处理
 *
 * @author system
- * @date 2025-02-20
+ * @date 2025-02-21
 */
@Service
-public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization> implements IOrganizationService {
+public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Organization>
+    implements IOrganizationService {
+
+    @Autowired
+    private OrganizationMapper organizationMapper;
+
+    /**
+     * 查询科室列表
+     *
+     * @param classEnum 机构分类枚举
+     * @param activeFlag 活动标识
+     * @return 科室列表
+     */
+    @Override
+    public Page<Organization> getOrganizationPage(Integer classEnum,Integer activeFlag, Integer pageNo, Integer pageSize) {
+
+        LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
+
+        if (classEnum != null) {
+            queryWrapper.eq(Organization::getTypeEnum, classEnum);
+        }
+
+        if (activeFlag != null) {
+            queryWrapper.eq(Organization::getTypeEnum, activeFlag);
+        }
+
+        Page<Organization> organizationPage = organizationMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
+
+        // 返回科室信息列表
+        return organizationPage;
+    }

 }
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/domain/ConditionDefinition.java
@@ -1,15 +1,12 @@
 package com.openhis.clinical.domain;

-import java.math.BigDecimal;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.core.common.core.domain.HisBaseEntity;
 import com.openhis.common.enums.ConditionDefinitionSource;
 import com.openhis.common.enums.PublicationStatus;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -34,7 +31,7 @@ public class ConditionDefinition extends HisBaseEntity {
    private ConditionDefinitionSource sourceEnum;

    /** 编码 */
-    private String condition_code;
+    private String conditionCode;

    /** 诊断名称 */
    private String name;
@@ -63,5 +60,4 @@ public class ConditionDefinition extends HisBaseEntity {
    /** 状态 */
    private PublicationStatus statusEnum;

-
 }
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/IConditionDefinitionService.java
@@ -1,7 +1,5 @@
 package com.openhis.clinical.service;

-import java.util.List;
-
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.openhis.clinical.domain.ConditionDefinition;
@@ -13,28 +11,33 @@ import com.openhis.clinical.domain.ConditionDefinition;
 * @date 2025-02-20
 */
 public interface IConditionDefinitionService extends IService<ConditionDefinition> {
-    /**
-     * 病种分类查询
-     *
-     * @return
-     */
-    List<ConditionDefinition> getMedicationCategory();

    /**
     * 查询病种目录分页列表
-     * 
+     *
     * @param searchKey 查询条件
     * @param status 查询条件-状态
+     * @param sourceEnum 查询条件-疾病种类
     * @param pageNo 当前页码
     * @param pageSize 查询条数
     * @return
     */
-    Page<ConditionDefinition> getPage(String searchKey, Integer status, Integer source_enum, Long id, Integer pageNo,
+    Page<ConditionDefinition> getPage(String searchKey, Integer status, Integer sourceEnum, Integer pageNo,
        Integer pageSize);

-    // 新增病种目录
+    /**
+     * 新增病种
+     * 
+     * @param conditionDefinition 病种目录实体
+     * @return
+     */
    boolean addDisease(ConditionDefinition conditionDefinition);

-    // 新增医保病种目录
+    /**
+     * 新增医保病种
+     * 
+     * @param conditionDefinition 病种目录实体
+     * @return
+     */
    boolean addYbDisease(ConditionDefinition conditionDefinition);
 }
--- a/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
+++ b/openhis-server/openhis-domain/src/main/java/com/openhis/clinical/service/impl/ConditionDefinitionServiceImpl.java
@@ -12,7 +12,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.openhis.clinical.domain.ConditionDefinition;
 import com.openhis.clinical.mapper.ConditionDefinitionMapper;
 import com.openhis.clinical.service.IConditionDefinitionService;
-import com.openhis.common.enums.DelFlag;

 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -31,22 +30,18 @@ public class ConditionDefinitionServiceImpl extends ServiceImpl<ConditionDefinit

    private final ConditionDefinitionMapper conditionDefinitionMapper;

-    @Override
-    public List<ConditionDefinition> getMedicationCategory() {
-        return null;
-    }
-
    /**
     * 查询病种目录分页列表
     * 
     * @param searchKey 查询条件
     * @param status 查询条件-状态
+     * @param sourceEnum 查询条件-疾病种类
     * @param pageNo 当前页码
     * @param pageSize 查询条数
     * @return
     */
    @Override
-    public Page<ConditionDefinition> getPage(String searchKey, Integer status, Integer sourceEnum, Long id, Integer pageNo,
+    public Page<ConditionDefinition> getPage(String searchKey, Integer status, Integer sourceEnum, Integer pageNo,
        Integer pageSize) {
        Page<ConditionDefinition> conditionList;
        // 生成查询条件
@@ -54,7 +49,7 @@ public class ConditionDefinitionServiceImpl extends ServiceImpl<ConditionDefinit
        // 模糊查询项目
        if (StringUtils.isNotEmpty(searchKey)) {
            // 模糊查询项目为【疾病编码】，【疾病名称】，【拼音】，【五笔】
-            queryWrapper.and(q -> q.like(ConditionDefinition::getCondition_code, searchKey).or()
+            queryWrapper.and(q -> q.like(ConditionDefinition::getConditionCode, searchKey).or()
                .like(ConditionDefinition::getName, searchKey).or().like(ConditionDefinition::getPyStr, searchKey).or()
                .like(ConditionDefinition::getWbStr, searchKey));
        }
@@ -66,25 +61,25 @@ public class ConditionDefinitionServiceImpl extends ServiceImpl<ConditionDefinit
        if (sourceEnum != -1) {
            queryWrapper.eq(ConditionDefinition::getSourceEnum, sourceEnum);
        }
-        // Id查询
-        if (id != -1) {
-            queryWrapper.eq(ConditionDefinition::getId, id);
-        }
-        // 查询删除状态
-        queryWrapper.eq(ConditionDefinition::getDeleteFlag, DelFlag.NO.getCode());
        // 查询病种目录列表
        conditionList = conditionDefinitionMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
        // 返回病种目录列表
        return conditionList;
    }

+    /**
+     * 新增病种
+     * 
+     * @param conditionDefinition 病种目录实体
+     * @return
+     */
    @Override
    @Transactional(rollbackFor = Exception.class)
    public boolean addDisease(ConditionDefinition conditionDefinition) {
        // 根据病种编码判断病种是否存在
        List<ConditionDefinition> conditionDefinitions =
            conditionDefinitionMapper.selectList(new LambdaQueryWrapper<ConditionDefinition>()
-                .eq(ConditionDefinition::getCondition_code, conditionDefinition.getCondition_code()));
+                .eq(ConditionDefinition::getConditionCode, conditionDefinition.getConditionCode()));
        if (conditionDefinitions.size() > 0) {
            return false;
        }
@@ -96,6 +91,12 @@ public class ConditionDefinitionServiceImpl extends ServiceImpl<ConditionDefinit
        return true;
    }

+    /**
+     * 新增医保病种
+     * 
+     * @param conditionDefinition 病种目录实体
+     * @return
+     */
    @Override
    public boolean addYbDisease(ConditionDefinition conditionDefinition) {
        return false;