From 2e889a77d448ab6826ec04fb8fc78d942989bc48 Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Thu, 15 Aug 2024 13:59:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BD=B1=E5=83=8F=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/dicomworklist/DicomworklistMapper.xml    | 2 +-
 .../admin/patientexamlist/PatientexamlistController.java      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/dicomworklist/DicomworklistMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/dicomworklist/DicomworklistMapper.xml
index 14916a2d9..d73ab4f2b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/dicomworklist/DicomworklistMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/dicomworklist/DicomworklistMapper.xml
@@ -10,7 +10,7 @@
      -->
 
     <select id="GetPatientIdData" resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicompatientDO">
-        select * from dicompatients where PatientID=#{patientId} and dataSync='0' and orgId=#{orgId}
+        select * from dicompatients where PatientID=#{patientId} and dataSync='1' and orgId=#{orgId}
     </select>
     <select id="GetPatientData" resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicompatientDO">
         select * from dicompatients where  dataSync='0' and orgId=#{orgId}
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 ea3936eb4..ceb9636f0 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,7 +103,7 @@ public class PatientexamlistController {
         PageResult<PatientexamlistDO> pageResult = patientexamlistService.getPatientexamlistPage(pageReqVO);
         List<PatientexamlistDO>  doList=new ArrayList<>();
         String devicetype=pageReqVO.getDeviceType();
-        if(devicetype!=null&&devicetype.equals("US"))//表示只查询超声的数据
+        if(devicetype!=null&&devicetype.contains("US"))//表示只查询超声的数据
         {
             // 筛选条件：
             doList =  pageResult.getList().stream()
@@ -114,7 +114,7 @@ public class PatientexamlistController {
         {
             // 筛选条件：
             doList =  pageResult.getList().stream()
-                    .filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().equals("US")))
+                    .filter(PatientexamlistDO -> !(PatientexamlistDO.getDeviceType().contains("US")))
                     .collect(Collectors.toList());
         }
         else //devicetype为空，查询全部数据