diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java index 8b9db6d..a0754c6 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AppController.java @@ -3,6 +3,7 @@ package com.ruoyi.web.controller.api; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.system.domain.THospital; import com.ruoyi.system.domain.TPatient; @@ -238,10 +239,10 @@ public class AppController extends BaseController */ @ApiOperation("患者已诊列表") @GetMapping("/record/diagnosedList") - public AjaxResult patientsDiagnosedList(TRecordResultReq recordResultReq) { + public TableDataInfo patientsDiagnosedList(TRecordResultReq recordResultReq) { recordResultReq.setStatus("1"); startPage(); - return AjaxResult.success(tRecordService.selectTRecordListWithoutResult(recordResultReq)); + return getDataTable(tRecordService.selectTRecordListWithoutResult(recordResultReq)); } /** @@ -252,10 +253,10 @@ public class AppController extends BaseController */ @ApiOperation("患者候诊列表") @GetMapping("/record/waitingList") - public AjaxResult patientsWaitingList(TRecordResultReq recordResultReq) { + public TableDataInfo patientsWaitingList(TRecordResultReq recordResultReq) { recordResultReq.setStatus("0"); startPage(); - return AjaxResult.success(tRecordService.selectTRecordListWithoutResult(recordResultReq)); + return getDataTable(tRecordService.selectTRecordListWithoutResult(recordResultReq)); } @ApiOperation("获取患者详细信息")