web:1. 添加 分页查询病例信息列表 接口

dev_2.0.0
xueqingkun 1 year ago
parent 0bde7b509a
commit d5e0bd1b0a

@ -14,6 +14,8 @@ public class MedicalRecPageResVO {
private Integer age;
private String gender;
private LocalDateTime time;
private String resourceId;
private String patientSelfDesc;
/**
* ->
*/

@ -59,9 +59,12 @@
t2.id as patientId,
t3.disease_name as diagnosisPrimaryStr,
t1.no as no,
t2.name as name,
t2.age as age,
t2.gender as gender,
t1.patient_id as patientId,
t1.patient_name as name,
t1.patient_age as age,
t1.patient_gender as gender,
t2.resource_id as resourceId,
t1.patient_self_desc as patientSelfDesc,
if(t1.update_time is null, t1.create_time, t1.update_time) as time
from vp_medical_rec t1
left join vp_patient t2 on t1.patient_id = t2.id

@ -1,7 +1,8 @@
package com.supervision.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.supervision.service.DiagnoseHallService;
import com.supervision.vo.manage.MedicalRecPageResVO;
import com.supervision.vo.result.DiagnoseProcessReqVo;
import com.supervision.vo.result.DiagnoseProcessResVo;
import io.swagger.annotations.Api;
@ -31,19 +32,18 @@ public class DiagnoseHallController {
@ApiOperation("分页查询问诊流程列表")
@GetMapping("queryDiagnoseProcessPageList")
public Page<DiagnoseProcessResVo> queryDiagnoseProcessPageList(@ApiParam("起始页") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam("每页大小") @RequestParam(defaultValue = "10") Integer pageSize,
DiagnoseProcessReqVo diagnoseProcessReqVo) {
public IPage<DiagnoseProcessResVo> queryDiagnoseProcessPageList(@ApiParam("起始页") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam("每页大小") @RequestParam(defaultValue = "10") Integer pageSize,
DiagnoseProcessReqVo diagnoseProcessReqVo) {
return diagnoseHallService.queryDiagnoseProcessPageList(pageNum, pageSize, diagnoseProcessReqVo);
}
/*@ApiOperation("分页查询问诊流程列表")
@GetMapping("queryDiagnoseProcessPageList")
public Page<DiagnoseProcessResVo> queryDiagnoseProcessPageList(@ApiParam("起始页") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam("每页大小") @RequestParam(defaultValue = "10") Integer pageSize,
@ApiParam("用户id") @RequestParam("userId") String userId) {
return diagnoseHallService.queryDiagnoseProcessPageList(pageNum, pageSize, userId);
}*/
@ApiOperation("分页查询病例信息列表")
@GetMapping("queryMedicalRecPageList")
public IPage<MedicalRecPageResVO> queryMedicalRecPageList(@ApiParam("起始页") @RequestParam(defaultValue = "1") Integer pageNum,
@ApiParam("每页大小") @RequestParam(defaultValue = "10") Integer pageSize) {
return diagnoseHallService.queryMedicalRecPageList(pageNum, pageSize);
}
}

@ -10,7 +10,6 @@ import com.supervision.pojo.vo.LoginReqVO;
import com.supervision.pojo.vo.LoginResVO;
import com.supervision.service.UserService;
import com.supervision.util.TokenUtil;
import com.supervision.util.UserUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
@ -18,7 +17,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.web.bind.annotation.*;
import java.util.Optional;
import java.util.concurrent.TimeUnit;
@Api(tags = "用户管理")
@RestController

@ -1,6 +1,8 @@
package com.supervision.service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.supervision.vo.manage.MedicalRecPageResVO;
import com.supervision.vo.result.DiagnoseProcessReqVo;
import com.supervision.vo.result.DiagnoseProcessResVo;
@ -9,6 +11,8 @@ public interface DiagnoseHallService {
boolean achieveDiagnoseResource();
Page<DiagnoseProcessResVo> queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize,
IPage<DiagnoseProcessResVo> queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize,
DiagnoseProcessReqVo diagnoseProcessReqVo);
IPage<MedicalRecPageResVO> queryMedicalRecPageList(Integer pageNum, Integer pageSize);
}

@ -1,20 +1,21 @@
package com.supervision.service.impl;
import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.lock.annotation.Lock4j;
import com.supervision.constant.UserTokenConstant;
import com.supervision.service.DiagnoseHallService;
import com.supervision.service.MedicalRecService;
import com.supervision.service.ProcessService;
import com.supervision.vo.manage.MedicalRecPageResVO;
import com.supervision.vo.result.DiagnoseProcessReqVo;
import com.supervision.vo.result.DiagnoseProcessResVo;
import com.supervision.usermanage.UserResourceCheck;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
@Slf4j
@ -24,6 +25,8 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService {
private final ProcessService processService;
private final MedicalRecService medicalRecService;
@Lock4j(name = "achieveDiagnoseResource")
@Override
public boolean achieveDiagnoseResource() {
@ -32,11 +35,18 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService {
}
@Override
public Page<DiagnoseProcessResVo> queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize,
public IPage<DiagnoseProcessResVo> queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize,
DiagnoseProcessReqVo diagnoseProcessReqVo) {
Assert.notEmpty(diagnoseProcessReqVo.getUserId(),"用户id不允许为空");
return processService.queryUserDiagnoseProcessPageList(new Page<DiagnoseProcessResVo>(pageNum,pageSize),diagnoseProcessReqVo);
return processService.queryUserDiagnoseProcessPageList(new Page<>(pageNum,pageSize),diagnoseProcessReqVo);
}
@Override
public IPage<MedicalRecPageResVO> queryMedicalRecPageList(Integer pageNum, Integer pageSize) {
return medicalRecService.queryMedicalRecManagePage(null, null, null, pageNum, pageSize);
}

Loading…
Cancel
Save