From 54242d5f750f3f74245749384cddcbab659c36c4 Mon Sep 17 00:00:00 2001 From: ccsens_zhengzhichuan Date: Mon, 16 Mar 2026 08:34:04 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8E=E5=8F=B0=E5=B0=B1?= =?UTF-8?q?=E8=AF=8A=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/controller/PmsController.java | 22 ++++++++++++++++++- .../admin/persist/dao/PmsPatientDao.java | 22 ++++++++++++++----- .../admin/service/IPmsPatientService.java | 3 ++- .../service/impl/PmsPatientServiceImpl.java | 6 ++--- .../resources/mapper/dao/PmsPatientDao.xml | 16 +++++++++----- 5 files changed, 53 insertions(+), 16 deletions(-) diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/PmsController.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/PmsController.java index a2d3eef..5055b6d 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/PmsController.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/controller/PmsController.java @@ -260,8 +260,28 @@ public class PmsController extends BaseController { dataScope = loginUser.getUser().getRoles().get(0).getDataScope(); } dto.getParam().setDeptId(loginUser.getDeptId()); + + + List deptIdList = new ArrayList<>(); + if (dto.getParam().getDeptId() == null) { + try { + deptIdList.addAll(sysPowerService.queryPowerDept()); + } catch (Exception e) { + log.info("获取当前登录用户部门错误"); + // 获取请求携带的令牌 + HttpServletRequest request = ((ServletRequestAttributes) + RequestContextHolder.getRequestAttributes()).getRequest(); + String deptId = request.getHeader(WebConstant.HEADER_KEY_DEPT_ID); + if (StrUtil.isNotEmpty(deptId)) { + deptIdList.add(Long.parseLong(deptId)); + } + } + }else { + deptIdList.add(dto.getParam().getDeptId()); + } + startPage(dto); - return JsonResponse.ok(new PageInfo<>(patientService.queryPatientJzList(dto.getParam(), dataScope, loginUser.getUserId(),loginUser.getUsername()))); + return JsonResponse.ok(new PageInfo<>(patientService.queryPatientJzList(dto.getParam(), dataScope, loginUser.getUserId(),loginUser.getUsername(), deptIdList))); } @ApiOperation("导出患者就诊列表") diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/PmsPatientDao.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/PmsPatientDao.java index b3263f3..0244248 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/PmsPatientDao.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/persist/dao/PmsPatientDao.java @@ -14,25 +14,35 @@ public interface PmsPatientDao extends PmsPatientMapper { List queryPatientList(@Param("param") PmsPatientDto.QueryPatient param, @Param("dataScope") String dataScope, @Param("userId") Long userId, - @Param("userName")String userName, - @Param("deptIdList")List deptIdList); + @Param("userName") String userName, + @Param("deptIdList") List deptIdList); - PmsPatientVo.PatientInfo queryPatientEvaluationById(@Param("id")Long id); + PmsPatientVo.PatientInfo queryPatientEvaluationById(@Param("id") Long id); void deleteById(Long id); + void deletePatientAcpByPatientId(Long patientId); + void deletePatientBodyByPatientId(Long patientId); + void deletePatientFamilyIllnessByPatientId(Long patientId); + void deletePatientIllnessHistoryByPatientId(Long patientId); + void deletePatientParentIllnessByPatientId(Long patientId); + void deletePatientPersonalByPatientId(Long patientId); + void batchDeleteByIdCard(@Param("pmsPatientList") List pmsPatientList); + void batchInsert(@Param("pmsPatientList") List pmsPatientList); + void batchInsertTjbg(@Param("list") List list); List queryPatientJzList(@Param("param") PmsPatientDto.QueryPatientJz param, - @Param("dataScope") String dataScope, - @Param("userId") Long userId, - @Param("userName")String userName); + @Param("dataScope") String dataScope, + @Param("userId") Long userId, + @Param("userName") String userName, + @Param("deptIdList") List deptIdList); } diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IPmsPatientService.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IPmsPatientService.java index 66f659a..532b1d6 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IPmsPatientService.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/IPmsPatientService.java @@ -64,7 +64,8 @@ public interface IPmsPatientService { List queryPatientJzList(PmsPatientDto.QueryPatientJz param, String dataScope, Long userId, - String userName); + String userName, + List deptIdList); void exportPatientJz(HttpServletResponse response, PmsPatientDto.QueryPatientJz param, String dataScope, Long userId, String userName) throws IOException; diff --git a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/PmsPatientServiceImpl.java b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/PmsPatientServiceImpl.java index de015b8..0bea350 100644 --- a/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/PmsPatientServiceImpl.java +++ b/ruisi_java/ruisi-web-admin/src/main/java/com/ccsens/admin/service/impl/PmsPatientServiceImpl.java @@ -2217,8 +2217,8 @@ public class PmsPatientServiceImpl implements IPmsPatientService { } @Override - public List queryPatientJzList(PmsPatientDto.QueryPatientJz param, String dataScope, Long userId, String userName) { - List queryPatientJzs = patientDao.queryPatientJzList(param, dataScope, SecurityUtils.isAdmin(userId) ? null : userId, userName); + public List queryPatientJzList(PmsPatientDto.QueryPatientJz param, String dataScope, Long userId, String userName, List deptIdList) { + List queryPatientJzs = patientDao.queryPatientJzList(param, dataScope, SecurityUtils.isAdmin(userId) ? null : userId, userName, deptIdList); if (CollUtil.isNotEmpty(queryPatientJzs)) { for (PmsPatientVo.QueryPatientJz queryPatientJz : queryPatientJzs) { //查询就诊 @@ -2273,7 +2273,7 @@ public class PmsPatientServiceImpl implements IPmsPatientService { @Override public void exportPatientJz(HttpServletResponse response, PmsPatientDto.QueryPatientJz param, String dataScope, Long userId, String userName) throws IOException { - List queryPatientJzs = queryPatientJzList(param, dataScope, userId, userName); + List queryPatientJzs = queryPatientJzList(param, dataScope, userId, userName, null); if (CollUtil.isEmpty(queryPatientJzs)) { throw new BaseException("没有数据"); } diff --git a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml index 555c044..19157df 100644 --- a/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml +++ b/ruisi_java/ruisi-web-admin/src/main/resources/mapper/dao/PmsPatientDao.xml @@ -440,14 +440,20 @@ and b.diagnosis_code like concat('%',#{param.diagnosisCode},'%') - + - and uu.dept_id IN ( - SELECT d.dept_id FROM ums_user u LEFT JOIN ums_dept d on (d.dept_id = u.dept_id or - FIND_IN_SET(u.dept_id,ancestors)) - WHERE user_id = #{userId} + and (uu.dept_id IN + + #{item} + + or + b.dept_id IN + + #{item} + ) + order by b.id desc