From 4eb86349cdfb1fd2461d2dd53f1f2bea58dc2e82 Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Thu, 15 Aug 2024 17:33:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=B1=E5=83=8F=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../patientexamlist/PatientexamlistController.java | 2 +- .../mysql/patientexamlist/PatientexamlistMapper.java | 10 ---------- 2 files changed, 1 insertion(+), 11 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 ceb9636f0..a85b96d53 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 @@ -107,7 +107,7 @@ public class PatientexamlistController { { // 筛选条件： doList = pageResult.getList().stream() - .filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().equals(devicetype))) + .filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US"))) .collect(Collectors.toList()); } else if(devicetype!=null&&!devicetype.trim().isEmpty())//表示只查询影像的数据 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 66e0122b0..75bcfbc90 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 @@ -52,11 +52,7 @@ public interface PatientexamlistMapper extends BaseMapperX { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(PatientexamlistDO::getExamId, reqVO.getExamId()) .likeIfPresent(PatientexamlistDO::getPName, reqVO.getPName()) - .eqIfPresent(PatientexamlistDO::getGender, reqVO.getGender()) - .eqIfPresent(PatientexamlistDO::getBirthday, reqVO.getBirthday()) .betweenIfPresent(PatientexamlistDO::getExamDate, reqVO.getExamDate()) - .eqIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType()) - .eqIfPresent(PatientexamlistDO::getSeDc, reqVO.getSeDc()) .likeIfPresent(PatientexamlistDO::getExamItemName, reqVO.getExamItemName()) .eqIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus()) .betweenIfPresent(PatientexamlistDO::getApplicationDate, reqVO.getApplicationDate()) @@ -64,15 +60,9 @@ public interface PatientexamlistMapper extends BaseMapperX { .likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId()) // .eqIfPresent(PatientexamlistDO::getHighLevelOrgId, reqVO.getHighLevelOrgId()) - .betweenIfPresent(PatientexamlistDO::getCreateDate, reqVO.getCreateDate()) .eqIfPresent(PatientexamlistDO::getExamDescription, reqVO.getExamDescription()) .eqIfPresent(PatientexamlistDO::getDiagResults, reqVO.getDiagResults()) .betweenIfPresent(PatientexamlistDO::getDiagDate, reqVO.getDiagDate()) - .eqIfPresent(PatientexamlistDO::getDiagDoctor, reqVO.getDiagDoctor()) - .eqIfPresent(PatientexamlistDO::getReviewDoctor, reqVO.getReviewDoctor()) - .betweenIfPresent(PatientexamlistDO::getReviewDate, reqVO.getReviewDate()) - .eqIfPresent(PatientexamlistDO::getThumbnailImgUrl, reqVO.getThumbnailImgUrl()) - .betweenIfPresent(PatientexamlistDO::getCreateTime, reqVO.getCreateTime()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getHighLevelOrgId()) .orderByDesc(PatientexamlistDO::getId));