diff --git a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java index 8dfda5c8..4adff55d 100644 --- a/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java +++ b/virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java @@ -66,7 +66,7 @@ public class AncillaryItemManageServiceImpl implements AncillaryItemManageServic .eq(ConfigAncillaryItem::getItemName, configAncillaryItem.getItemNameEn()).count()) { throw new BusinessException("英文名名已存在,请重新输入"); } - CommonDic one = commonDicService.lambdaQuery().eq(CommonDic::getNameZh, configAncillaryItem.getItemName()) + CommonDic one = commonDicService.lambdaQuery().eq(CommonDic::getNameZh, configAncillaryItem.getType()) .eq(CommonDic::getGroupCode, "ANCILLARY_ITEM_PRIORITY").last("limit 1").one(); Assert.notNull(one, () -> new BusinessException("检查项类型不正确")); configAncillaryItem.setTypePriority(Integer.valueOf(one.getCode())); diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/CommonDicServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/CommonDicServiceImpl.java index a10aee86..6738f056 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/CommonDicServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/CommonDicServiceImpl.java @@ -12,6 +12,7 @@ import com.supervision.mapper.CommonDicMapper; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -36,6 +37,7 @@ public class CommonDicServiceImpl extends ServiceImpl BeanUtil.toBean(node, CommonDictTreeDTO.class)).collect(Collectors.toList()); // 递归构建树 recursionBuildTree(commonDicParentIdMap, topList); + topList.sort(Comparator.comparingInt(CommonDic::getPriority)); return topList; } @@ -48,6 +50,7 @@ public class CommonDicServiceImpl extends ServiceImpl