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

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Euni4U 2025-02-24 16:05:08 +08:00
commit 2daf02b9e6
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
yudao-module-inspect/yudao-module-inspect-biz/src/main/java/cn/iocoder/yudao/module/inspect/controller/admin/inspectpatient/vo/InspectPatientPageReqVO.java
View File

@ -91,4 +91,7 @@ public class InspectPatientPageReqVO extends PageParam {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss ", timezone = "GMT+8")
private LocalDateTime chargetime;
@Schema(description = "总检状态")
private Integer inspectionStatus;
}

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

@ -20,8 +20,17 @@ import cn.iocoder.yudao.module.inspect.controller.admin.inspectpatient.vo.*;
public interface InspectPatientMapper extends BaseMapperX<InspectPatientDO> {
default PageResult<InspectPatientDO> selectPage(InspectPatientPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<InspectPatientDO>()
.eqIfPresent(InspectPatientDO::getMedicalSn, reqVO.getMedicalSn())
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())
.eqIfPresent(InspectPatientDO::getBirthday, reqVO.getBirthday())
@ -39,8 +48,12 @@ public interface InspectPatientMapper extends BaseMapperX<InspectPatientDO> {
.eqIfPresent(InspectPatientDO::getHeadPicUrl, reqVO.getHeadPicUrl())
.eqIfPresent(InspectPatientDO::getSummaryResult, reqVO.getSummaryResult())
.eqIfPresent(InspectPatientDO::getAuditor, reqVO.getAuditor())
.eqIfPresent(InspectPatientDO::getAuditStatus, reqVO.getAuditStatus())
.eqIfPresent(InspectPatientDO::getInspectionOpinion, reqVO.getInspectionOpinion())
.betweenIfPresent(InspectPatientDO::getAuditorTime, reqVO.getAuditorTime())
.orderByDesc(InspectPatientDO::getId));
.orderByDesc(InspectPatientDO::getId);
return selectPage(reqVO, queryWrapper);
}
}