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-25 18:51:25 +08:00
parent 32e64e84d3
commit 0d0742d174
6 changed files with 256 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,6 +11,7 @@ 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);
// Page<Organization> getOrganizationPage(Integer classEnum, Integer activeFlag, Integer pageNo, Integer pageSize);
boolean changeOrgFlag(Long orgId);
}

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

@@ -1,5 +1,6 @@
package com.openhis.administration.service.impl;
import com.openhis.common.enums.ActiveFlag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -24,31 +25,48 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
@Autowired
private OrganizationMapper organizationMapper;
/**
* 查询机构列表
*
* @param classEnum 机构分类枚举
* @param activeFlag 活动标识
* @return 机构列表
*/
// /**
// * 查询机构列表
// *
// * @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 Page<Organization> getOrganizationPage(Integer classEnum, Integer activeFlag, Integer pageNo,
Integer pageSize) {
public boolean changeOrgFlag(Long orgId) {
LambdaQueryWrapper<Organization> queryWrapper = new LambdaQueryWrapper<>();
if (classEnum != null) {
queryWrapper.eq(Organization::getTypeEnum, classEnum);
if (orgId != null) {
Organization organization = organizationMapper.selectById(orgId);
if (organization.getActiveFlag().equals(ActiveFlag.YES.getValue())) {
organization.setActiveFlag(ActiveFlag.NO.getValue());
return true;
} else {
organization.setActiveFlag(ActiveFlag.YES.getValue());
return true;
}
} else {
return false;
}
if (activeFlag != null) {
queryWrapper.eq(Organization::getActiveFlag, activeFlag);
}
Page<Organization> organizationPage = organizationMapper.selectPage(new Page<>(pageNo, pageSize), queryWrapper);
// 返回机构信息列表
return organizationPage;
}
}