fix: 还原 Bug #443/#475/#477/#486/#497 引入的 getRequestForm 编译错误

This commit is contained in:
关羽
2026-05-11 14:40:07 +08:00
committed by 赵云
parent 51f4b84842
commit 9e2d683e19
5 changed files with 2 additions and 23 deletions

View File

@@ -32,18 +32,6 @@ public interface IRequestFormManageAppService {
*/ */
List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode); List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode);
/**
* 查询申请单(支持筛选)
*
* @param encounterId 就诊id
* @param typeCode 申请单类型
* @param startDate 开始日期可选格式yyyy-MM-dd
* @param endDate 结束日期可选格式yyyy-MM-dd
* @param status 单据状态(可选)
* @return 申请单列表
*/
List<RequestFormQueryDto> getRequestForm(Long encounterId, String typeCode, String startDate, String endDate, String status);
/** /**
* 分页查询申请单 * 分页查询申请单
* *

View File

@@ -81,23 +81,14 @@ public class RequestFormManageController {
* 查询检查申请单 * 查询检查申请单
* *
* @param encounterId 就诊id * @param encounterId 就诊id
* @param startDate 开始日期可选格式yyyy-MM-dd
* @param endDate 结束日期可选格式yyyy-MM-dd
* @param status 单据状态(可选)
* @param keyword 关键字(可选,申请单号/检查项目名称模糊匹配)
* @return 检查申请单 * @return 检查申请单
*/ */
@GetMapping(value = "/get-check") @GetMapping(value = "/get-check")
public R<?> getCheckRequestForm( public R<?> getCheckRequestForm(@RequestParam(required = false) Long encounterId) {
@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) {
if (encounterId == null) { if (encounterId == null) {
return R.fail("就诊ID不能为空"); 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()));
} }
/** /**