汇总患者条件查询问题修改

This commit is contained in:
张佳炜 2025-03-10 17:50:40 +08:00
parent 35ed29b2c1
commit e8a6e0dbf8

View File

@ -21,15 +21,6 @@ public interface InspectPatientMapper extends BaseMapperX<InspectPatientDO> {
default PageResult<InspectPatientDO> selectPage(InspectPatientPageReqVO reqVO) {
LambdaQueryWrapperX<InspectPatientDO> queryWrapper = new LambdaQueryWrapperX<>();
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.eqIfPresent(InspectPatientDO::getMedicalSn, reqVO.getMedicalSn())
.likeIfPresent(InspectPatientDO::getPName, reqVO.getPName())
.eqIfPresent(InspectPatientDO::getGender, reqVO.getGender())
@ -52,6 +43,15 @@ public interface InspectPatientMapper extends BaseMapperX<InspectPatientDO> {
.eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion())
.betweenIfPresent(InspectPatientDO::getAuditorTime, reqVO.getAuditorTime())
.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, "");
}
}
return selectPage(reqVO, queryWrapper);
}