xinyilu/PostDischargePatientManage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'youxilong_2.26_院后第一增量' of http://192.168.16.64:3000/jihan/PostDischargePatientManage into youxilong_2.26_院后第一增量

Browse Source
This commit is contained in:
youxilong 2024-03-07 13:33:06 +08:00
commit bec524dfc4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
postdischarge-manage/src/main/java/com/xinelu/manage/service/agencycategory/impl/AgencyCategoryServiceImpl.java
View File

@ -1,6 +1,5 @@
package com.xinelu.manage.service.agencycategory.impl; package com.xinelu.manage.service.agencycategory.impl;
import com.xinelu.common.constant.Constants;
import com.xinelu.common.utils.DateUtils; import com.xinelu.common.utils.DateUtils;
import com.xinelu.common.utils.SecurityUtils; import com.xinelu.common.utils.SecurityUtils;
import com.xinelu.common.utils.StringUtils; import com.xinelu.common.utils.StringUtils;
@ -16,6 +15,7 @@ import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@ -29,8 +29,6 @@ import java.util.stream.Collectors;
public class AgencyCategoryServiceImpl implements IAgencyCategoryService { public class AgencyCategoryServiceImpl implements IAgencyCategoryService {
@Resource @Resource
private AgencyCategoryMapper agencyCategoryMapper; private AgencyCategoryMapper agencyCategoryMapper;
@Resource
private GenerateSystemCodeUtil generateSystemCodeUtil;
/** /**
* 查询机构类别 * 查询机构类别
@ -62,12 +60,11 @@ public class AgencyCategoryServiceImpl implements IAgencyCategoryService {
*/ */
@Override @Override
public int insertAgencyCategory(AgencyCategory agencyCategory) { public int insertAgencyCategory(AgencyCategory agencyCategory) {
if (agencyCategory.getCategoryLevel().equals(1)) { if (Objects.isNull(agencyCategory.getCategoryLevel()) || agencyCategory.getCategoryLevel().equals(1)) {
agencyCategory.setParentCategoryId(null); agencyCategory.setParentCategoryId(null);
} }
agencyCategory.setCreateTime(DateUtils.getNowDate()); agencyCategory.setCreateTime(DateUtils.getNowDate());
agencyCategory.setCreateBy(SecurityUtils.getUsername()); agencyCategory.setCreateBy(SecurityUtils.getUsername());
agencyCategory.setCategoryCode(Constants.CATEGORY_CODE + generateSystemCodeUtil.generateSystemCode(Constants.CATEGORY_CODE));
return agencyCategoryMapper.insertAgencyCategory(agencyCategory); return agencyCategoryMapper.insertAgencyCategory(agencyCategory);
} }