|
@@ -64,7 +64,7 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
|
|
if (!CollectionUtils.isEmpty(responsibilityList)) {
|
|
if (!CollectionUtils.isEmpty(responsibilityList)) {
|
|
final Map<String, String> listMap = responsibilityList.stream().collect(Collectors.toMap(Responsibility::getResponsibilityCode, Responsibility::getResponsibilityName));
|
|
final Map<String, String> listMap = responsibilityList.stream().collect(Collectors.toMap(Responsibility::getResponsibilityCode, Responsibility::getResponsibilityName));
|
|
costIncomeGroupSetVOList.forEach(i -> {
|
|
costIncomeGroupSetVOList.forEach(i -> {
|
|
- String responsibilityCode = i.getResponsibilityCode();
|
|
|
|
|
|
+ String responsibilityCode = i.getResponsibilityCodes();
|
|
if (!StringUtils.isEmpty(responsibilityCode)){
|
|
if (!StringUtils.isEmpty(responsibilityCode)){
|
|
List<String> responsibilityCodeList = Arrays.asList(responsibilityCode.split(StrUtil.SLASH));
|
|
List<String> responsibilityCodeList = Arrays.asList(responsibilityCode.split(StrUtil.SLASH));
|
|
if (CollectionUtils.isEmpty(responsibilityCodeList)) {
|
|
if (CollectionUtils.isEmpty(responsibilityCodeList)) {
|
|
@@ -102,7 +102,7 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
|
|
.eq(Responsibility::getHospId, hospId));
|
|
.eq(Responsibility::getHospId, hospId));
|
|
if (!CollectionUtils.isEmpty(responsibilityList)) {
|
|
if (!CollectionUtils.isEmpty(responsibilityList)) {
|
|
Map<String, String> listMap = responsibilityList.stream().collect(Collectors.toMap(Responsibility::getResponsibilityCode, Responsibility::getResponsibilityName));
|
|
Map<String, String> listMap = responsibilityList.stream().collect(Collectors.toMap(Responsibility::getResponsibilityCode, Responsibility::getResponsibilityName));
|
|
- String responsibilityCode = costIncomeGroupSetVO.getResponsibilityCode();
|
|
|
|
|
|
+ String responsibilityCode = costIncomeGroupSetVO.getResponsibilityCodes();
|
|
if (!StringUtils.isEmpty(responsibilityCode)) {
|
|
if (!StringUtils.isEmpty(responsibilityCode)) {
|
|
List<String> asList = Arrays.asList(responsibilityCode.split(StrUtil.SLASH));
|
|
List<String> asList = Arrays.asList(responsibilityCode.split(StrUtil.SLASH));
|
|
if (!CollectionUtils.isEmpty(asList)){
|
|
if (!CollectionUtils.isEmpty(asList)){
|