up
This commit is contained in:
@@ -19,12 +19,13 @@ public interface IOutpatientInfusionRecordService {
|
|||||||
/**
|
/**
|
||||||
* 获取门诊输液记录的患者列表
|
* 获取门诊输液记录的患者列表
|
||||||
*
|
*
|
||||||
|
* @param infusionPatientDto 输液患者实体
|
||||||
* @param searchKey 模糊查询关键字
|
* @param searchKey 模糊查询关键字
|
||||||
* @param pageNo 当前页
|
* @param pageNo 当前页
|
||||||
* @param pageSize 每页多少条
|
* @param pageSize 每页多少条
|
||||||
* @return 分页查询
|
* @return 分页查询
|
||||||
*/
|
*/
|
||||||
IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(
|
IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(OutpatientInfusionPatientDto infusionPatientDto,
|
||||||
String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request);
|
String searchKey, Integer pageNo, Integer pageSize, HttpServletRequest request);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -64,17 +64,19 @@ public class OutpatientInfusionRecordServiceImpl implements IOutpatientInfusionR
|
|||||||
/**
|
/**
|
||||||
* 获取门诊输液记录的患者列表
|
* 获取门诊输液记录的患者列表
|
||||||
*
|
*
|
||||||
|
* @param infusionPatientDto 输液患者实体
|
||||||
* @param searchKey 模糊查询关键字
|
* @param searchKey 模糊查询关键字
|
||||||
* @param pageNo 当前页
|
* @param pageNo 当前页
|
||||||
* @param pageSize 每页多少条
|
* @param pageSize 每页多少条
|
||||||
* @return 分页查询
|
* @return 分页查询
|
||||||
*/
|
*/
|
||||||
@Override
|
@Override
|
||||||
public IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(String searchKey, Integer pageNo,
|
public IPage<OutpatientInfusionPatientDto> getOutpatientInfusionPatientList(
|
||||||
Integer pageSize, HttpServletRequest request) {
|
OutpatientInfusionPatientDto infusionPatientDto, String searchKey, Integer pageNo, Integer pageSize,
|
||||||
|
HttpServletRequest request) {
|
||||||
|
|
||||||
// 构建查询条件
|
// 构建查询条件
|
||||||
QueryWrapper<OutpatientInfusionPatientDto> queryWrapper = HisQueryUtils.buildQueryWrapper(null, searchKey,
|
QueryWrapper<OutpatientInfusionPatientDto> queryWrapper = HisQueryUtils.buildQueryWrapper(infusionPatientDto, searchKey,
|
||||||
new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientBusNo,
|
new HashSet<>(Arrays.asList(CommonConstants.FieldName.PatientBusNo,
|
||||||
CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.PatientName)),
|
CommonConstants.FieldName.EncounterBusNo, CommonConstants.FieldName.PatientName)),
|
||||||
request);
|
request);
|
||||||
|
|||||||
@@ -36,18 +36,20 @@ public class OutpatientInfusionRecordController {
|
|||||||
/**
|
/**
|
||||||
* 查询门诊输液的患者列表
|
* 查询门诊输液的患者列表
|
||||||
*
|
*
|
||||||
|
* @param infusionPatientDto 患者实体
|
||||||
* @param searchKey 模糊查询关键字
|
* @param searchKey 模糊查询关键字
|
||||||
* @param pageNo 当前页
|
* @param pageNo 当前页
|
||||||
* @param pageSize 每页多少条
|
* @param pageSize 每页多少条
|
||||||
* @return 返回门诊输液的患者列表
|
* @return 返回门诊输液的患者列表
|
||||||
*/
|
*/
|
||||||
@GetMapping(value = "/infusion-patient-list")
|
@GetMapping(value = "/infusion-patient-list")
|
||||||
public R<?> getOutpatientInfusionPatientList(@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
|
public R<?> getOutpatientInfusionPatientList(OutpatientInfusionPatientDto infusionPatientDto,
|
||||||
|
@RequestParam(value = "searchKey", defaultValue = "") String searchKey,
|
||||||
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
@RequestParam(value = "pageNo", defaultValue = "1") Integer pageNo,
|
||||||
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
|
@RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest request) {
|
||||||
|
|
||||||
return R
|
return R
|
||||||
.ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(searchKey, pageNo, pageSize, request));
|
.ok(outpatientInfusionRecordService.getOutpatientInfusionPatientList(infusionPatientDto,searchKey, pageNo, pageSize, request));
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user