From 0bde7b509a37cfb600295982fcc6edf6fc194b9e Mon Sep 17 00:00:00 2001 From: xueqingkun Date: Wed, 6 Dec 2023 10:49:58 +0800 Subject: [PATCH] =?UTF-8?q?web=EF=BC=9A1.=20=E9=97=AE=E8=AF=8A=E5=AE=9E?= =?UTF-8?q?=E4=BE=8B=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/supervision/mapper/ProcessMapper.java | 6 +++ .../supervision/service/ProcessService.java | 8 ++++ .../service/impl/ProcessServiceImpl.java | 7 +++ .../vo/result/DiagnoseProcessReqVo.java | 11 +++++ .../vo/result/DiagnoseProcessResVo.java | 44 +++++++++++++++++++ .../main/resources/mapper/ProcessMapper.xml | 22 ++++++++++ .../controller/DiagnoseHallController.java | 24 ++++++++++ .../controller/UserController.java | 2 - .../service/DiagnoseHallService.java | 8 ++++ .../service/impl/DiagnoseHallServiceImpl.java | 16 +++++++ 10 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessReqVo.java create mode 100644 virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessResVo.java diff --git a/virtual-patient-model/src/main/java/com/supervision/mapper/ProcessMapper.java b/virtual-patient-model/src/main/java/com/supervision/mapper/ProcessMapper.java index f7698be7..3402b3d8 100644 --- a/virtual-patient-model/src/main/java/com/supervision/mapper/ProcessMapper.java +++ b/virtual-patient-model/src/main/java/com/supervision/mapper/ProcessMapper.java @@ -1,7 +1,11 @@ package com.supervision.mapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.model.Process; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.supervision.vo.result.DiagnoseProcessReqVo; +import com.supervision.vo.result.DiagnoseProcessResVo; +import org.apache.ibatis.annotations.Param; /** * @author flevance @@ -11,6 +15,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; */ public interface ProcessMapper extends BaseMapper { + Page queryDiagnoseProcessPageList(Page page, + @Param("diagnoseProcess") DiagnoseProcessReqVo diagnoseProcessReqVo); } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/ProcessService.java b/virtual-patient-model/src/main/java/com/supervision/service/ProcessService.java index 041c9bc1..38e160da 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/ProcessService.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/ProcessService.java @@ -1,7 +1,10 @@ package com.supervision.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.model.Process; import com.baomidou.mybatisplus.extension.service.IService; +import com.supervision.vo.result.DiagnoseProcessReqVo; +import com.supervision.vo.result.DiagnoseProcessResVo; /** * @author flevance @@ -10,4 +13,9 @@ import com.baomidou.mybatisplus.extension.service.IService; */ public interface ProcessService extends IService { + + + Page queryUserDiagnoseProcessPageList(Page page, DiagnoseProcessReqVo diagnoseProcessReqVo); + + } diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/ProcessServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ProcessServiceImpl.java index 2fb92d3a..2dbdaf44 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/ProcessServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/ProcessServiceImpl.java @@ -1,9 +1,12 @@ package com.supervision.service.impl; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.supervision.mapper.ProcessMapper; import com.supervision.model.Process; import com.supervision.service.ProcessService; +import com.supervision.vo.result.DiagnoseProcessReqVo; +import com.supervision.vo.result.DiagnoseProcessResVo; import org.springframework.stereotype.Service; /** @@ -15,6 +18,10 @@ import org.springframework.stereotype.Service; public class ProcessServiceImpl extends ServiceImpl implements ProcessService { + @Override + public Page queryUserDiagnoseProcessPageList(Page page, DiagnoseProcessReqVo diagnoseProcessReqVo) { + return super.getBaseMapper().queryDiagnoseProcessPageList(page,diagnoseProcessReqVo); + } } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessReqVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessReqVo.java new file mode 100644 index 00000000..7ab921de --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessReqVo.java @@ -0,0 +1,11 @@ +package com.supervision.vo.result; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class DiagnoseProcessReqVo { + + @ApiModelProperty("用户id") + private String userId; +} diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessResVo.java b/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessResVo.java new file mode 100644 index 00000000..1c55a92e --- /dev/null +++ b/virtual-patient-model/src/main/java/com/supervision/vo/result/DiagnoseProcessResVo.java @@ -0,0 +1,44 @@ +package com.supervision.vo.result; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.time.LocalDateTime; +import java.util.List; + +@Data +public class DiagnoseProcessResVo { + + @ApiModelProperty("流程实例id") + private String processId; + + @ApiModelProperty("用户id") + private String userId; + + @ApiModelProperty("任务状态 0:待问诊 1:待处置 2:已评估") + private String status; + + @ApiModelProperty("最近问诊时间") + private LocalDateTime recentTime; + + @ApiModelProperty("主诉") + private String patientSelfDesc; + + @ApiModelProperty("病人id") + private String patientId; + + @ApiModelProperty("病人姓名") + private String patientName; + + @ApiModelProperty("年龄") + private Integer age; + + @ApiModelProperty("性别") + private String gender; + + @ApiModelProperty("资源id") + private String resourceId; + + @ApiModelProperty("初步诊断疾病名") + private List primaryDiseaseNameList; +} diff --git a/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml b/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml index 33d3205d..d14ead6b 100644 --- a/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/ProcessMapper.xml @@ -22,4 +22,26 @@ ,patient_id,user_id,status,process_type, create_user_id,create_time,update_user_id,update_time + + + + select pro.id as processId, + pro.user_id as userId, + pro.status as status, + pro.update_time as recentTime, + mre.patient_self_desc as patientSelfDesc, + mre.patient_id as patientId, + mre.patient_name as patientName, + mre.patient_age as age, + mre.patient_gender as gender, + pat.resource_id as resourceId + from vp_process pro + left join vp_medical_rec mre on pro.medical_rec_id = mre.id + left join vp_patient pat on mre.patient_id = pat.id + where pro.user_id = #{diagnoseProcess.userId} ORDER BY pro.update_time desc + + + 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 3dc74183..98878ec4 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,10 +1,16 @@ package com.supervision.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.supervision.service.DiagnoseHallService; +import com.supervision.vo.result.DiagnoseProcessReqVo; +import com.supervision.vo.result.DiagnoseProcessResVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; /** @@ -22,4 +28,22 @@ public class DiagnoseHallController { public boolean achieveDiagnoseResource(){ return diagnoseHallService.achieveDiagnoseResource(); } + + @ApiOperation("分页查询问诊流程列表") + @GetMapping("queryDiagnoseProcessPageList") + public Page 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); + }*/ + } 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 36d6ec88..3cdc361f 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 @@ -42,8 +42,6 @@ public class UserController { throw new BusinessException("用户名或密码有误！"); } String token = TokenUtil.creatToken(JSONUtil.toJsonStr(user.get())); - // 将用户的token保存起来,超时时间为5分钟 - redisTemplate.opsForValue().set(UserTokenConstant.TOKEN_CACHE + user.get().getId(), String.valueOf(System.currentTimeMillis()), 1000 * 5L, TimeUnit.MILLISECONDS); LoginResVO loginResVO = BeanUtil.toBean(user.get(), LoginResVO.class); loginResVO.setToken(token); 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 504914fe..511572f4 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,14 @@ package com.supervision.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.supervision.vo.result.DiagnoseProcessReqVo; +import com.supervision.vo.result.DiagnoseProcessResVo; + + public interface DiagnoseHallService { boolean achieveDiagnoseResource(); + + Page queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize, + DiagnoseProcessReqVo diagnoseProcessReqVo); } 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 9bbcf208..3acc1042 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,8 +1,13 @@ package com.supervision.service.impl; +import cn.hutool.core.lang.Assert; +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.ProcessService; +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; @@ -17,6 +22,7 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService { private final UserResourceCheck userResourceCheck; + private final ProcessService processService; @Lock4j(name = "achieveDiagnoseResource") @Override @@ -24,4 +30,14 @@ public class DiagnoseHallServiceImpl implements DiagnoseHallService { // 如果小于数字人最大连接数,则可以连接 return userResourceCheck.achieveDiagnoseResource(); } + + @Override + public Page queryDiagnoseProcessPageList(Integer pageNum, Integer pageSize, + DiagnoseProcessReqVo diagnoseProcessReqVo) { + Assert.notEmpty(diagnoseProcessReqVo.getUserId(),"用户id不允许为空"); + + return processService.queryUserDiagnoseProcessPageList(new Page(pageNum,pageSize),diagnoseProcessReqVo); + } + + }