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 75bcfbc90..4174f544a 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 @@ -20,30 +20,31 @@ public interface PatientexamlistMapper extends BaseMapperX { //IllnessCasePageReqVO分页 default PageResult selectPage(IllnessCasePageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(PatientexamlistDO::getRegId,reqVO.getRegId()) - .likeIfPresent(PatientexamlistDO::getExamId,reqVO.getExamId()) - .geIfPresent(PatientexamlistDO::getExamDate,reqVO.getExamDate_ge()) - .leIfPresent(PatientexamlistDO::getExamDate,reqVO.getExamDate_le()) - .likeIfPresent(PatientexamlistDO::getDeviceName,reqVO.getDeviceName()) - .likeIfPresent(PatientexamlistDO::getDeviceType,reqVO.getDeviceType()) - .eqIfPresent(PatientexamlistDO::getDiagFlag,reqVO.getDiagFlag()) - .likeIfPresent(PatientexamlistDO::getExamItemName,reqVO.getExamItemName()) - .likeIfPresent(PatientexamlistDO::getReportstatus,reqVO.getReportstatus()) - .likeIfPresent(PatientexamlistDO::getPName,reqVO.getPname()) - .likeIfPresent(PatientexamlistDO::getGender,reqVO.getGender()) + .likeIfPresent(PatientexamlistDO::getRegId, reqVO.getRegId()) + .likeIfPresent(PatientexamlistDO::getExamId, reqVO.getExamId()) + .geIfPresent(PatientexamlistDO::getExamDate, reqVO.getExamDate_ge()) + .leIfPresent(PatientexamlistDO::getExamDate, reqVO.getExamDate_le()) + .likeIfPresent(PatientexamlistDO::getDeviceName, reqVO.getDeviceName()) + .likeIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType()) + .eqIfPresent(PatientexamlistDO::getDiagFlag, reqVO.getDiagFlag()) + .likeIfPresent(PatientexamlistDO::getExamItemName, reqVO.getExamItemName()) + .likeIfPresent(PatientexamlistDO::getReportstatus, reqVO.getReportstatus()) + .likeIfPresent(PatientexamlistDO::getPName, reqVO.getPname()) + .likeIfPresent(PatientexamlistDO::getGender, reqVO.getGender()) .orderByAsc(PatientexamlistDO::getRegId)); } //ReportPrintPageReqVO分页 default PageResult selectPage(ReportPrintPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() - .likeIfPresent(PatientexamlistDO::getRegId,reqVO.getRegId()) - .likeIfPresent(PatientexamlistDO::getExamId,reqVO.getExamId()) - .geIfPresent(PatientexamlistDO::getExamDate,reqVO.getExamDate_ge()) - .leIfPresent(PatientexamlistDO::getExamDate,reqVO.getExamDate_le()) - .likeIfPresent(PatientexamlistDO::getDeviceName,reqVO.getDeviceName()) - .eqIfPresent(PatientexamlistDO::getDeviceType,reqVO.getDeviceType()) - .likeIfPresent(PatientexamlistDO::getPName,reqVO.getPname()) + .likeIfPresent(PatientexamlistDO::getRegId, reqVO.getRegId()) + .likeIfPresent(PatientexamlistDO::getExamId, reqVO.getExamId()) + .geIfPresent(PatientexamlistDO::getExamDate, reqVO.getExamDate_ge()) + .leIfPresent(PatientexamlistDO::getExamDate, reqVO.getExamDate_le()) + .likeIfPresent(PatientexamlistDO::getDeviceName, reqVO.getDeviceName()) + .eqIfPresent(PatientexamlistDO::getDeviceType, reqVO.getDeviceType()) + .likeIfPresent(PatientexamlistDO::getPName, reqVO.getPname()) + .isNotNull(PatientexamlistDO::getDiagDate) .orderByAsc(PatientexamlistDO::getRegId)); } @@ -52,17 +53,27 @@ 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()) .betweenIfPresent(PatientexamlistDO::getUploadDate, reqVO.getUploadDate()) .likeIfPresent(PatientexamlistDO::getOrgName, reqVO.getOrgName()) .eqIfPresent(PatientexamlistDO::getOrgId, reqVO.getOrgId()) - // .eqIfPresent(PatientexamlistDO::getHighLevelOrgId, reqVO.getHighLevelOrgId()) + // .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));