wangjunping/his
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Org

Browse Source
This commit is contained in:
anxin
2025-02-26 09:28:52 +08:00
parent 47eaa28202
commit 2dc2c61173
3 changed files with 6 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
openhis-server/openhis-application/src/main/java/com/openhis/web/basedatamanage/controller/OrganizationController.java
View File

@@ -29,8 +29,8 @@ import com.openhis.common.enums.OrganizationType;
import com.openhis.common.utils.HisPageUtils;
import com.openhis.common.utils.HisQueryUtils;
import com.openhis.web.basedatamanage.dto.OrgQueryParam;
import com.openhis.web.basedatamanage.dto.OrganizationQueryDto;
import com.openhis.web.basedatamanage.dto.OrganizationInitDto;
import com.openhis.web.basedatamanage.dto.OrganizationQueryDto;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;

3
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/IOrganizationService.java
View File

@@ -1,6 +1,5 @@
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;
@@ -11,7 +10,5 @@ import com.openhis.administration.domain.Organization;
* @date 2025-02-21
*/
public interface IOrganizationService extends IService<Organization> {
// Page<Organization> getOrganizationPage(Integer classEnum, Integer activeFlag, Integer pageNo, Integer pageSize);
boolean changeOrgFlag(Long orgId);
}

39
openhis-server/openhis-domain/src/main/java/com/openhis/administration/service/impl/OrganizationServiceImpl.java
View File

@@ -1,16 +1,14 @@
package com.openhis.administration.service.impl;
import com.openhis.common.enums.ActiveFlag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.AccountStatus;
import com.openhis.common.enums.ActiveFlag;
/**
* 机构管理Service业务层处理
@@ -25,43 +23,16 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
@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::getActiveFlag, activeFlag);
// }
//
// Page<Organization> organizationPage = organizationMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
//
// // 返回机构信息列表
// return organizationPage;
// }
@Override
public boolean changeOrgFlag(Long orgId) {
if (orgId != null) {
Organization organization = organizationMapper.selectById(orgId);
if (organization.getActiveFlag().equals(ActiveFlag.YES.getValue())) {
organization.setActiveFlag(ActiveFlag.NO.getValue());
if (organization.getActiveFlag().equals(AccountStatus.ACTIVE.getValue())) {
organization.setActiveFlag(ActiveFlag.INACTIVE.getValue());
return true;
} else {
organization.setActiveFlag(ActiveFlag.YES.getValue());
organization.setActiveFlag(ActiveFlag.ACTIVE.getValue());
return true;
}
} else {