lxd/inspect-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: lxd:8cd34e42d7c5779931fc32e1e1afaf2b56928901
Branches Tags
lxd:main
...
compare: lxd:f4c0c84373894fd59d2bfa03b113800cdfac22ea
Branches Tags
lxd:main

2 Commits
8cd34e42d7 ... f4c0c84373

Author SHA1 Message Date
lxd
f4c0c84373 Merge remote-tracking branch 'origin/main' 2025-04-22 16:47:50 +08:00
lxd
0b7a140a2e 修改查询的字段 减少不使用的字段 2025-04-22 16:47:30 +08:00
1 changed files with 14 additions and 14 deletions
Show Stats Expand all files Collapse all files

28
yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/dal/mysql/inspectpatient/InspectPatientMapper.java
View File

@ -27,8 +27,8 @@ public interface InspectPatientMapper extends BaseMapperX<InspectPatientDO> {
.eqIfPresent(InspectPatientDO::getBirthday, reqVO.getBirthday()) .eqIfPresent(InspectPatientDO::getBirthday, reqVO.getBirthday())
.eqIfPresent(InspectPatientDO::getCardType, reqVO.getCardType()) .eqIfPresent(InspectPatientDO::getCardType, reqVO.getCardType())
.eqIfPresent(InspectPatientDO::getCardId, reqVO.getCardId()) .eqIfPresent(InspectPatientDO::getCardId, reqVO.getCardId())
.eqIfPresent(InspectPatientDO::getNationality, reqVO.getNationality()) // .eqIfPresent(InspectPatientDO::getNationality, reqVO.getNationality())
.eqIfPresent(InspectPatientDO::getNation, reqVO.getNation()) // .eqIfPresent(InspectPatientDO::getNation, reqVO.getNation())
// .eqIfPresent(InspectPatientDO::getRace, reqVO.getRace()) // .eqIfPresent(InspectPatientDO::getRace, reqVO.getRace())
.eqIfPresent(InspectPatientDO::getPhoneNum, reqVO.getPhoneNum()) .eqIfPresent(InspectPatientDO::getPhoneNum, reqVO.getPhoneNum())
.eqIfPresent(InspectPatientDO::getStatus, reqVO.getStatus()) .eqIfPresent(InspectPatientDO::getStatus, reqVO.getStatus())
@ -40,21 +40,21 @@ public interface InspectPatientMapper extends BaseMapperX<InspectPatientDO> {
.eqIfPresent(InspectPatientDO::getSummaryResult, reqVO.getSummaryResult()) .eqIfPresent(InspectPatientDO::getSummaryResult, reqVO.getSummaryResult())
.eqIfPresent(InspectPatientDO::getAuditor, reqVO.getAuditor()) .eqIfPresent(InspectPatientDO::getAuditor, reqVO.getAuditor())
.eqIfPresent(InspectPatientDO::getAuditStatus, reqVO.getAuditStatus()) .eqIfPresent(InspectPatientDO::getAuditStatus, reqVO.getAuditStatus())
.eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion()) //.eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion())
.eqIfPresent(InspectPatientDO::getIsprint, reqVO.getIsprint()) .eqIfPresent(InspectPatientDO::getIsprint, reqVO.getIsprint())
.betweenIfPresent(InspectPatientDO::getAuditorTime, reqVO.getAuditorTime()) // .betweenIfPresent(InspectPatientDO::getAuditorTime, reqVO.getAuditorTime())
.betweenIfPresent(InspectPatientDO::getPrinttime, reqVO.getPrintTimeRange()) .betweenIfPresent(InspectPatientDO::getPrinttime, reqVO.getPrintTimeRange())
.orderByDesc(InspectPatientDO::getId); .orderByDesc(InspectPatientDO::getId);
if (reqVO.getInspectionStatus() != null) { // if (reqVO.getInspectionStatus() != null) {
if (reqVO.getInspectionStatus() == 0) { // if (reqVO.getInspectionStatus() == 0) {
// 如果传过来的值为0，查询InspectionOpinion字段不为空 // // 如果传过来的值为0，查询InspectionOpinion字段不为空
queryWrapper.isNotNull(InspectPatientDO::getSummaryResult).ne(InspectPatientDO::getSummaryResult, ""); // queryWrapper.isNotNull(InspectPatientDO::getSummaryResult).ne(InspectPatientDO::getSummaryResult, "");
} else if (reqVO.getInspectionStatus() == 1) { // } else if (reqVO.getInspectionStatus() == 1) {
// 如果传过来的值为1，查询InspectionOpinion字段为空 // // 如果传过来的值为1，查询InspectionOpinion字段为空
//queryWrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, ""); // //queryWrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, "");
queryWrapper.and(wrapper -> wrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, "")); // queryWrapper.and(wrapper -> wrapper.isNull(InspectPatientDO::getSummaryResult).or().eq(InspectPatientDO::getSummaryResult, ""));
} // }
} // }
return selectPage(reqVO, queryWrapper); return selectPage(reqVO, queryWrapper);
} }