diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java index 4ecab9a9..1f286b2f 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckMethodAppService.java @@ -3,6 +3,7 @@ package com.openhis.web.check.appservice; import com.core.common.core.domain.R; import com.openhis.check.domain.CheckMethod; +import io.swagger.models.auth.In; /** @@ -21,5 +22,5 @@ public interface ICheckMethodAppService{ R removeCheckMethod(Integer checkMethodId); - + R searchCheckMethodList(Integer pageNo, Integer pageSize, String checkTpye, String name, String packageName); } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java index 220c9c54..80b3403c 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/ICheckPartAppService.java @@ -11,4 +11,6 @@ public interface ICheckPartAppService { R removeCheckPart(Integer checkPartId); R updateCheckPart(CheckPart checkPart); + + R searchCheckPartList(Integer pageNo, Integer pageSize, String checkTpye, String name, String packageName); } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java index 3a15699a..b6e1f802 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckMethodAppServiceImpl.java @@ -2,12 +2,10 @@ package com.openhis.web.check.appservice.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.core.common.core.domain.R; import com.openhis.check.domain.CheckMethod; import com.openhis.check.service.ICheckMethodService; import com.openhis.web.check.appservice.ICheckMethodAppService; -import com.openhis.web.check.dto.CheckMethodDto; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -27,6 +25,22 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService { return R.ok(list); } + @Override + public R searchCheckMethodList(Integer pageNo, Integer pageSize, String checkTpye, String name, String packageName) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (checkTpye != null && ObjectUtil.isNotEmpty(checkTpye)) { + wrapper.eq(CheckMethod::getCheckType, checkTpye); + } + if (name != null && ObjectUtil.isNotEmpty(name)) { + wrapper.like(CheckMethod::getName, name); + } + if (packageName != null && ObjectUtil.isNotEmpty(packageName)) { + wrapper.eq(CheckMethod::getPackageName, packageName); + } + List list = checkMethodService.list(wrapper); + return R.ok(list); + } + @Override public R addCheckMethod(CheckMethod checkMethod) { //1.数据校验 @@ -66,6 +80,4 @@ public class CheckMethodAppServiceImpl implements ICheckMethodAppService { boolean remove = checkMethodService.removeById(checkMethodId); return R.ok(remove); } - - } diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java index 7c574e89..dd8edfe8 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/appservice/impl/CheckPartAppServiceImpl.java @@ -3,10 +3,10 @@ package com.openhis.web.check.appservice.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.core.common.core.domain.R; +import com.openhis.check.domain.CheckMethod; import com.openhis.check.domain.CheckPart; import com.openhis.check.service.ICheckPartService; import com.openhis.web.check.appservice.ICheckPartAppService; -import com.openhis.web.check.dto.CheckPartDto; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -23,6 +23,22 @@ public class CheckPartAppServiceImpl implements ICheckPartAppService { return R.ok(list); } + @Override + public R searchCheckPartList(Integer pageNo, Integer pageSize, String checkTpye, String name, String packageName) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + if (checkTpye != null && ObjectUtil.isNotEmpty(checkTpye)) { + wrapper.eq(CheckPart::getCheckType, checkTpye); + } + if (name != null && ObjectUtil.isNotEmpty(name)) { + wrapper.like(CheckPart::getName, name); + } + if (packageName != null && ObjectUtil.isNotEmpty(packageName)) { + wrapper.eq(CheckPart::getPackageName, packageName); + } + List list = checkPartService.list(wrapper); + return R.ok(list); + } + @Override public R addCheckPart(CheckPart checkPart) { //数据检验 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java index 08fe4519..0a5d4a52 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckMethodController.java @@ -18,13 +18,27 @@ public class CheckMethodController { /* * 获取检查方法 - * @Param检查方法 此处参数注释有问题,完全是按照需求给的图来注释的 + * @Param 此处参数注释有问题,完全是按照需求给的图来注释的 */ @GetMapping("/list") public R getCheckMethodList(){ return R.ok(checkMethodAppService.getCheckMethodList()); } + /* + * 条件查询检查方法 + * @Para + * */ + @GetMapping("/search") + public R searchCheckMethodList( + @RequestParam(required = false) Integer pageNo, + @RequestParam(required = false) Integer pageSize, + @RequestParam(required = false) String checkTpye, + @RequestParam(required = false) String name, + @RequestParam(required = false) String packageName) { + return R.ok(checkMethodAppService.searchCheckMethodList(pageNo,pageSize,checkTpye,name,packageName)); + } + /* * 新增检查方法 * @Param diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java index 775707f8..9d773231 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/check/controller/CheckPartController.java @@ -24,6 +24,19 @@ public class CheckPartController { return R.ok(checkPartAppService.getCheckPartList()); } + /* + * 条件搜索检查部位 + * @Param + * */ + @GetMapping("/search") + public R searchCheckPartList(@RequestParam(required = false) Integer pageNo, + @RequestParam(required = false) Integer pageSize, + @RequestParam(required = false) String checkTpye, + @RequestParam(required = false) String name, + @RequestParam(required = false) String packageName){ + return R.ok(checkPartAppService.searchCheckPartList(pageNo,pageSize,checkTpye,name,packageName)); + } + /* * 新增检查部位 * @Param diff --git a/openhis-ui-vue3/src/api/system/checkType.js b/openhis-ui-vue3/src/api/system/checkType.js index ad83be91..e117bf70 100644 --- a/openhis-ui-vue3/src/api/system/checkType.js +++ b/openhis-ui-vue3/src/api/system/checkType.js @@ -52,6 +52,15 @@ export function listCheckMethod(query) { }) } +// 搜索检查方法列表 +export function searchCheckMethod(query) { + return request({ + url: '/check/method/search', + method: 'get', + params: query + }) +} + // 新增检查方法 export function addCheckMethod(data) { return request({ @@ -87,6 +96,15 @@ export function listCheckPart(query) { }) } +// 搜索检查部位列表 +export function searchCheckPart(query) { + return request({ + url: '/check/part/search', + method: 'get', + params: query + }) +} + // 新增检查部位 export function addCheckPart(data) { diff --git a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue index 32183f63..982ba3de 100644 --- a/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue +++ b/openhis-ui-vue3/src/views/maintainSystem/checkprojectSettings/index.vue @@ -202,8 +202,8 @@