获取患者收费项目-患者列表添加分页入参

src/main/java/com/kcim/dao/mapper/ImportPatientItemMapper.java

@@ -3,6 +3,7 @@ package com.kcim.dao.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kcim.dao.model.ImportPatientItem;
+import com.kcim.dao.model.dto.ComputeDrugCostPageDto;
 import com.kcim.dao.model.dto.PatientItemDepartmentGroupVo;
 import com.kcim.dao.model.dto.PatientItemVo;
 import com.kcim.vo.PatientInfoVo;
@@ -27,7 +28,7 @@ public interface ImportPatientItemMapper extends BaseMapper<ImportPatientItem> {
     List<PatientItemVo> getAllGroupByOrder(@Param("computeDate") String computeDate,
                                            @Param("hospId") Long hospId);
 
-    List<PatientInfoVo> getPatientItemPatientInfo(@Param("computeDate") String computeDate,
+    List<PatientInfoVo> getPatientItemPatientInfo(Page<ComputeDrugCostPageDto> page, @Param("computeDate") String computeDate,
                                                   @Param("filter") String filter,
                                                   @Param("hospId") Long hospId);
 

src/main/java/com/kcim/dao/repository/ImportPatientItemRepository.java

@@ -8,6 +8,7 @@ import com.kcim.common.constants.NumberConstant;
 import com.kcim.common.util.UserContext;
 import com.kcim.dao.mapper.ImportPatientItemMapper;
 import com.kcim.dao.model.ImportPatientItem;
+import com.kcim.dao.model.dto.ComputeDrugCostPageDto;
 import com.kcim.dao.model.dto.PatientItemDepartmentGroupVo;
 import com.kcim.dao.model.dto.PatientItemVo;
 import com.kcim.vo.PatientInfoVo;
@@ -171,8 +172,9 @@ public class ImportPatientItemRepository extends ServiceImpl<ImportPatientItemMa
         return this.list(queryWrapper);
     }
 
-    public List<PatientInfoVo> getPatientItemPatientInfo(String computeDate, String filter) {
-        return this.baseMapper.getPatientItemPatientInfo(computeDate, filter, UserContext.getHospId());
+    public List<PatientInfoVo> getPatientItemPatientInfo(Integer current, Integer pageSize,String computeDate, String filter) {
+        Page<ComputeDrugCostPageDto> page = new Page<>(current,pageSize);
+        return this.baseMapper.getPatientItemPatientInfo(page,computeDate, filter, UserContext.getHospId());
     }
 
     public void removePatientItemByFileId(String computeDate, Long fileId) {

src/main/java/com/kcim/service/PatientItemImportService.java

@@ -43,7 +43,7 @@ public interface PatientItemImportService {
 
     void removePatientItem(String computeDate);
 
-    Object getPatientItemPatientInfo(String filter, String computeDate);
+    Object getPatientItemPatientInfo(Integer current, Integer pageSize,String filter, String computeDate);
 
     void removePatientItemByFileId(String computeDate,Long fileId);
 

src/main/java/com/kcim/service/impl/PatientItemImportServiceImpl.java

@@ -259,8 +259,8 @@ public class PatientItemImportServiceImpl implements PatientItemImportService {
     }
 
     @Override
-    public List<PatientInfoVo> getPatientItemPatientInfo(String filter, String computeDate) {
-        return repository.getPatientItemPatientInfo(computeDate,filter);
+    public List<PatientInfoVo> getPatientItemPatientInfo(Integer current, Integer pageSize, String filter, String computeDate) {
+        return repository.getPatientItemPatientInfo(current, pageSize, computeDate,filter);
     }
 
     /**

src/main/java/com/kcim/web/CostDataController.java

@@ -2,7 +2,6 @@ package com.kcim.web;
 
 import com.kcim.common.constants.NumberConstant;
 import com.kcim.common.util.Result;
-import com.kcim.dao.repository.ImportPatientInfoRepository;
 import com.kcim.service.*;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -127,8 +126,10 @@ public class CostDataController {
 
     @ApiOperation("月度数据采集-患者收费项目-患者信息")
     @GetMapping("getPatientItemPatientInfo")
-    public Result getPatientItemPatientInfo( @RequestParam String computeDate,
-                                            @RequestParam(required = false) String filter) {
-        return Result.ok(patientItemImportService.getPatientItemPatientInfo(filter,computeDate));
+    public Result getPatientItemPatientInfo( @RequestParam(defaultValue = "1", name = "current", required = false) Integer current,
+                                             @RequestParam(defaultValue = "10", name = "pageSize", required = false) Integer pageSize,
+                                             @RequestParam String computeDate,
+                                             @RequestParam(required = false) String filter) {
+        return Result.ok(patientItemImportService.getPatientItemPatientInfo(current,pageSize,filter,computeDate));
     }
 }