lxd/FlowPacs
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge remote-tracking branch '公司/master'

Browse Source 
# Conflicts:
#	yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java
This commit is contained in:
lxd 2024-08-15 17:35:16 +08:00
commit c1496faa27
1 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java
View File

@ -20,30 +20,31 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
//IllnessCasePageReqVO分页
default PageResult<PatientexamlistDO> selectPage(IllnessCasePageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PatientexamlistDO>()
.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<PatientexamlistDO> selectPage(ReportPrintPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<PatientexamlistDO>()
.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<PatientexamlistDO> {
return selectPage(reqVO, new LambdaQueryWrapperX<PatientexamlistDO>()
.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));