From 85ce4f4a8003062e8b8cd714fc98c6f75cb06c87 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Tue, 26 Nov 2024 19:08:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AF=B9=E5=A4=96=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/patientexamlist/PatientexamlistController.java | 9 +++++++-- .../dal/mysql/patientexamlist/PatientexamlistMapper.java | 8 ++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java index a9b214aef..3f3e2fd92 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java @@ -125,8 +125,13 @@ public class PatientexamlistController { @GetMapping("/getplexamiddata") @Operation(summary = "根据examid获得PACS检查列表数据") - public CommonResult getkeyexamidPatientexamlist(@RequestParam("examid") String examid,@RequestParam("orgid") String orgid) { - PatientexamlistDO patientexamlist = patientexamlistService.getkeyexamidPatientexamlist(examid,orgid); + public CommonResult getkeyexamidPatientexamlist(@RequestParam("examid") String examid,@RequestParam("orgSN") String orgSN) { + OrgUnitDO orgUnitDO= Service.getSnonekey(orgSN); + if(orgUnitDO==null) + { + return success(null); + } + PatientexamlistDO patientexamlist = patientexamlistService.getkeyexamidPatientexamlist(examid,orgUnitDO.getOrgID()); return success(BeanUtils.toBean(patientexamlist, PatientexamlistRespVO.class)); } diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java index dd974ee8b..9ba6dbc06 100644 --- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java +++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java @@ -77,13 +77,13 @@ public interface PatientexamlistMapper extends BaseMapperX { .betweenIfPresent(PatientexamlistDO::getDiagDate, reqVO.getDiagDate()) .eqIfPresent(PatientexamlistDO::getDiagDoctor, reqVO.getDiagDoctor()) .betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime()) - .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()) + //.eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()) .eqIfPresent(PatientexamlistDO::getIsFavourite, reqVO.getIsFavourite()) .eq(PatientexamlistDO::getOrgId, reqVO.getOrgId()) // 始终添加orgId条件 .or(wrapper -> { - if (reqVO.getHighLevelOrgId() != null) { - wrapper.eq(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()); - } + // if (reqVO.getHighLevelOrgId() != null) { + wrapper.eq(PatientexamlistDO::getHighLevelOrgId, reqVO.getOrgId()); + // } }) .orderByDesc(PatientexamlistDO::getId));