diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java index 6ff69a4e..360a72ea 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckTypeController.java @@ -48,6 +48,16 @@ public class CheckTypeController extends BaseController { private final ICheckPackageDetailService checkPackageDetailService; private final ICheckPackageAppService checkPackageAppService; + /** + * 获取所有检查类型列表(不分页,用于下拉选项) + */ + @GetMapping("/all") + public AjaxResult getAllCheckTypes() { + List list = checkTypeService.list( + new QueryWrapper().orderByAsc("id")); + return AjaxResult.success(list); + } + /** * 获取检查类型列表(支持分页) */ diff --git a/openhis-ui-vue3/src/api/system/checkType.js b/openhis-ui-vue3/src/api/system/checkType.js index 8d04046b..eba269e6 100644 --- a/openhis-ui-vue3/src/api/system/checkType.js +++ b/openhis-ui-vue3/src/api/system/checkType.js @@ -1,5 +1,13 @@ import request from '@/utils/request' +// 查询所有检查类型列表(不分页,用于下拉选项) +export function getAllCheckTypes() { + return request({ + url: '/system/check-type/all', + method: 'get' + }) +} + // 查询检查类型列表 export function listCheckType(query) { return request({ diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue index 2d04d308..d2ca1d3a 100644 --- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue +++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue @@ -112,16 +112,16 @@ @@ -219,10 +219,10 @@ @@ -237,8 +237,8 @@ @@ -293,25 +293,37 @@ - - - -