From 905290ba3c9c37e9a2ea0d5ba7e457670a538679 Mon Sep 17 00:00:00 2001
From: lichuanyang <1176537920@qq.com>
Date: Thu, 15 Aug 2024 17:33:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PatientexamlistMapper.java                | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

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 66e0122b0..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<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));
     }
 
@@ -63,7 +64,7 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
                 .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())