diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java old mode 100755 new mode 100644 index c972faa0..c8607e15 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java @@ -32,18 +32,6 @@ public interface IRequestFormManageAppService { */ List getRequestForm(Long encounterId, String typeCode); - /** - * 查询申请单(支持筛选) - * - * @param encounterId 就诊id - * @param typeCode 申请单类型 - * @param startDate 开始日期(可选,格式:yyyy-MM-dd) - * @param endDate 结束日期(可选,格式:yyyy-MM-dd) - * @param status 单据状态(可选) - * @return 申请单列表 - */ - List getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status); - /** * 分页查询申请单 * diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java old mode 100755 new mode 100644 diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java old mode 100755 new mode 100644 index f135ff44..2bf64a04 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java @@ -81,23 +81,14 @@ public class RequestFormManageController { * 查询检查申请单 * * @param encounterId 就诊id - * @param startDate 开始日期(可选,格式:yyyy-MM-dd) - * @param endDate 结束日期(可选,格式:yyyy-MM-dd) - * @param status 单据状态(可选) - * @param keyword 关键字(可选,申请单号/检查项目名称模糊匹配) * @return 检查申请单 */ @GetMapping(value = "/get-check") - public R getCheckRequestForm( - @RequestParam(required = false) Long encounterId, - @RequestParam(required = false) String startDate, - @RequestParam(required = false) String endDate, - @RequestParam(required = false) String status, - @RequestParam(required = false) String keyword) { + public R getCheckRequestForm(@RequestParam(required = false) Long encounterId) { if (encounterId == null) { return R.fail("就诊ID不能为空"); } - return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode(), startDate, endDate, status, keyword)); + return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode())); } /** diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormQueryDto.java old mode 100755 new mode 100644 diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml old mode 100755 new mode 100644