修改PatientexamlistPageReqVO分页查询条件

# Conflicts:
#	yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/dal/mysql/patientexamlist/PatientexamlistMapper.java

yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java

@@ -107,7 +107,7 @@ public class PatientexamlistController {
         {
             // 筛选条件：
             doList =  pageResult.getList().stream()
-                    .filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().equals(devicetype)))
+                    .filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().contains("US")))
                     .collect(Collectors.toList());
         }
         else if(devicetype!=null&&!devicetype.trim().isEmpty())//表示只查询影像的数据

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

@@ -54,13 +54,9 @@ public interface PatientexamlistMapper extends BaseMapperX<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())
@@ -70,9 +66,6 @@ public interface PatientexamlistMapper extends BaseMapperX<PatientexamlistDO> {
                 .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));