From d5e0bd1b0a30a718ddc33a90ebec2624b08bdaad Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 6 Dec 2023 13:19:13 +0800 Subject: [PATCH] =?UTF-8?q?web=EF=BC=9A1.=20=E6=B7=BB=E5=8A=A0=20=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E7=97=85=E4=BE=8B=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=20=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/manage/MedicalRecPageResVO.java | 2 ++ .../resources/mapper/MedicalRecMapper.xml | 9 +++++--- .../controller/DiagnoseHallController.java | 22 +++++++++---------- .../controller/UserController.java | 2 -- .../service/DiagnoseHallService.java | 6 ++++- .../service/impl/DiagnoseHallServiceImpl.java | 20 ++++++++++++----- 6 files changed, 39 insertions(+), 22 deletions(-) diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java index ce1a20e1..f929ec3b 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/manage/MedicalRecPageResVO.java @@ -14,6 +14,8 @@ public class MedicalRecPageResVO { private Integer age; private String gender; private LocalDateTime time; + private String resourceId; + private String patientSelfDesc; /** * 初步诊断-> 就是对应的疾病名称 */ diff --git a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml index 6d31215c..8ad19072 100644 --- a/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/MedicalRecMapper.xml @@ -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 diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/DiagnoseHallController.java b/virtual-patient-web/src/main/java/com/supervision/controller/DiagnoseHallController.java index 98878ec4..a09ca938 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/DiagnoseHallController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/DiagnoseHallController.java @@ -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 queryDiagnoseProcessPageList(@ApiParam("起始页") @RequestParam(defaultValue = "1") Integer pageNum, - @ApiParam("每页大小") @RequestParam(defaultValue = "10") Integer pageSize, - DiagnoseProcessReqVo diagnoseProcessReqVo) { + public IPage 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 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 queryMedicalRecPageList(@ApiParam("起始页") @RequestParam(defaultValue = "1") Integer pageNum, + @ApiParam("每页大小") @RequestParam(defaultValue = "10") Integer pageSize) { + return diagnoseHallService.queryMedicalRecPageList(pageNum, pageSize); + } } diff --git a/virtual-patient-web/src/main/java/com/supervision/controller/UserController.java b/virtual-patient-web/src/main/java/com/supervision/controller/UserController.java index 3cdc361f..7e2b18b7 100644 --- a/virtual-patient-web/src/main/java/com/supervision/controller/UserController.java +++ b/virtual-patient-web/src/main/java/com/supervision/controller/UserController.java @@ -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 diff --git a/virtual-patient-web/src/main/java/com/supervision/service/DiagnoseHallService.java b/virtual-patient-web/src/main/java/com/supervision/service/DiagnoseHallService.java index 511572f4..ca556a69 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/DiagnoseHallService.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/DiagnoseHallService.java @@ -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 queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize, + IPage queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize, DiagnoseProcessReqVo diagnoseProcessReqVo); + + IPage queryMedicalRecPageList(Integer pageNum, Integer pageSize); } diff --git a/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java b/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java index 3acc1042..9cb6ab5e 100644 --- a/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java +++ b/virtual-patient-web/src/main/java/com/supervision/service/impl/DiagnoseHallServiceImpl.java @@ -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 queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize, + public IPage queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize, DiagnoseProcessReqVo diagnoseProcessReqVo) { Assert.notEmpty(diagnoseProcessReqVo.getUserId(),"用户id不允许为空"); - return processService.queryUserDiagnoseProcessPageList(new Page(pageNum,pageSize),diagnoseProcessReqVo); + return processService.queryUserDiagnoseProcessPageList(new Page<>(pageNum,pageSize),diagnoseProcessReqVo); + } + + @Override + public IPage queryMedicalRecPageList(Integer pageNum, Integer pageSize) { + + + return medicalRecService.queryMedicalRecManagePage(null, null, null, pageNum, pageSize); }