diff --git a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java
index 4af019762..e37e734f3 100644
--- a/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java
+++ b/yudao-module-tblist/yudao-module-tblist-biz/src/main/java/cn/iocoder/yudao/module/tblist/controller/admin/patientexamlist/PatientexamlistController.java
@@ -103,20 +103,24 @@ public class PatientexamlistController {
         PageResult<PatientexamlistDO> pageResult = patientexamlistService.getPatientexamlistPage(pageReqVO);
         List<PatientexamlistDO>  doList=new ArrayList<>();
         String devicetype=pageReqVO.getDeviceType();
-        if(devicetype.equals("US"))//表示只查询超声的数据
+        if(devicetype!=null&&devicetype.equals("US"))//表示只查询超声的数据
         {
             // 筛选条件：
             doList =  pageResult.getList().stream()
                     .filter(PatientexamlistDO -> (PatientexamlistDO.getDeviceType().equals(devicetype)))
                     .collect(Collectors.toList());
         }
-        else//表示只查询影像的数据
+        else if(devicetype!=null&&!devicetype.trim().isEmpty())//表示只查询影像的数据
         {
             // 筛选条件：
             doList =  pageResult.getList().stream()
                     .filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().equals("US")))
                     .collect(Collectors.toList());
         }
+        else //devicetype为空，查询全部数据
+        {
+            doList=pageResult.getList();
+        }
 
         pageResult.setList(doList);