Merge remote-tracking branch 'origin/dev_2.1.0' into dev_2.1.0

virtual-patient-manage/src/main/java/com/supervision/manage/service/impl/AncillaryItemManageServiceImpl.java

@@ -96,7 +96,7 @@ public class AncillaryItemManageServiceImpl implements AncillaryItemManageServic
             throw new BusinessException("英文名名已存在,请重新输入");
         }
         if (!StrUtil.equals(configAncillaryItem.getType(), old.getType())) {
-            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()));