From 0b7a140a2e17ffe0f5b7135495dd347c8660236b Mon Sep 17 00:00:00 2001 From: lxd <1004405501@qq.com> Date: Tue, 22 Apr 2025 16:47:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=20=E5=87=8F=E5=B0=91=E4=B8=8D=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspectpatient/InspectPatientMapper.java | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java index 8170442..39b70ec 100644 --- a/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java +++ b/yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java @@ -27,8 +27,8 @@ public interface InspectPatientMapper extends BaseMapperX { .eqIfPresent(InspectPatientDO::getBirthday, reqVO.getBirthday()) .eqIfPresent(InspectPatientDO::getCardType, reqVO.getCardType()) .eqIfPresent(InspectPatientDO::getCardId, reqVO.getCardId()) - .eqIfPresent(InspectPatientDO::getNationality, reqVO.getNationality()) - .eqIfPresent(InspectPatientDO::getNation, reqVO.getNation()) + // .eqIfPresent(InspectPatientDO::getNationality, reqVO.getNationality()) + // .eqIfPresent(InspectPatientDO::getNation, reqVO.getNation()) // .eqIfPresent(InspectPatientDO::getRace, reqVO.getRace()) .eqIfPresent(InspectPatientDO::getPhoneNum, reqVO.getPhoneNum()) .eqIfPresent(InspectPatientDO::getStatus, reqVO.getStatus()) @@ -40,21 +40,21 @@ public interface InspectPatientMapper extends BaseMapperX { .eqIfPresent(InspectPatientDO::getSummaryResult, reqVO.getSummaryResult()) .eqIfPresent(InspectPatientDO::getAuditor, reqVO.getAuditor()) .eqIfPresent(InspectPatientDO::getAuditStatus, reqVO.getAuditStatus()) - .eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion()) + //.eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion()) .eqIfPresent(InspectPatientDO::getIsprint, reqVO.getIsprint()) - .betweenIfPresent(InspectPatientDO::getAuditorTime, reqVO.getAuditorTime()) + // .betweenIfPresent(InspectPatientDO::getAuditorTime, reqVO.getAuditorTime()) .betweenIfPresent(InspectPatientDO::getPrinttime, reqVO.getPrintTimeRange()) .orderByDesc(InspectPatientDO::getId); - if (reqVO.getInspectionStatus() != null) { - if (reqVO.getInspectionStatus() == 0) { - // 如果传过来的值为0，查询InspectionOpinion字段不为空 - queryWrapper.isNotNull(InspectPatientDO::getSummaryResult).ne(InspectPatientDO::getSummaryResult, ""); - } else if (reqVO.getInspectionStatus() == 1) { - // 如果传过来的值为1，查询InspectionOpinion字段为空 - //queryWrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, ""); - queryWrapper.and(wrapper -> wrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, "")); - } - } +// if (reqVO.getInspectionStatus() != null) { +// if (reqVO.getInspectionStatus() == 0) { +// // 如果传过来的值为0，查询InspectionOpinion字段不为空 +// queryWrapper.isNotNull(InspectPatientDO::getSummaryResult).ne(InspectPatientDO::getSummaryResult, ""); +// } else if (reqVO.getInspectionStatus() == 1) { +// // 如果传过来的值为1，查询InspectionOpinion字段为空 +// //queryWrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, ""); +// queryWrapper.and(wrapper -> wrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, "")); +// } +// } return selectPage(reqVO, queryWrapper); }