From 5086973d12062220ae677dedf5c82a94311ffd32 Mon Sep 17 00:00:00 2001
From: lxd <1004405501@qq.com>
Date: Thu, 15 Aug 2024 09:47:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E4=BC=A0=E8=BE=93=E7=9B=B8=E5=85=B3=E8=A1=A8=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/dicomworklist/DicomImagesDO.java |  7 +++++++
 .../mysql/dicomworklist/DicomworklistMapper.java    |  2 ++
 .../service/dicomworklist/DicomworklistService.java |  2 ++
 .../dicomworklist/DicomworklistServiceImpl.java     |  5 +++++
 .../mapper/dicomworklist/DicomworklistMapper.xml    | 13 +++++++++++--
 5 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dicomworklist/DicomImagesDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dicomworklist/DicomImagesDO.java
index aaaa41528..5b325b808 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dicomworklist/DicomImagesDO.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dicomworklist/DicomImagesDO.java
@@ -178,4 +178,11 @@ public class DicomImagesDO {
     @TableField("orgId")
     private String orgId;
 
+    /**
+     *dicom 访问前缀
+     */
+    @TableField("urlPrefix")
+    private String urlPrefix;
+
+
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java
index eee7f94bf..834047b12 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dicomworklist/DicomworklistMapper.java
@@ -66,5 +66,7 @@ public interface DicomworklistMapper extends BaseMapperX<DicomworklistDO> {
 
     // 根据Series的SeriesInst查询Dicomiamge表对应的数据
     List<DicomImagesDO> GetDicomImageData(@Param("SeriesInst") String SeriesInst, @Param("orgId") String orgId);
+    // 根据Series的SeriesInst集合查询Dicomiamge表对应的数据
+    List<DicomImagesDO> GetDicomImageListData(@Param("seriesInstList") List<String> seriesInstList, @Param("orgId") String orgId);
 
 }
\ No newline at end of file
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dicomworklist/DicomworklistService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dicomworklist/DicomworklistService.java
index d631e2dcf..7898e6b30 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dicomworklist/DicomworklistService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dicomworklist/DicomworklistService.java
@@ -77,4 +77,6 @@ public interface DicomworklistService {
      *  根据Series的SeriesInst查询Dicomiamge表对应的数据
      */
     List<DicomImagesDO> GetDicomImageData(String SeriesInst, String orgId);
+
+    List<DicomImagesDO> GetDicomImageListData(List<String> seriesInstList,String orgId);
 }
\ No newline at end of file
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dicomworklist/DicomworklistServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dicomworklist/DicomworklistServiceImpl.java
index 76db4c851..30d0d5f72 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dicomworklist/DicomworklistServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dicomworklist/DicomworklistServiceImpl.java
@@ -103,4 +103,9 @@ public class DicomworklistServiceImpl implements DicomworklistService {
         return dicomworklistMapper.GetDicomImageData(SeriesInst,orgId);
     }
 
+    @Override
+    public List<DicomImagesDO> GetDicomImageListData(List<String> seriesInstList, String orgId) {
+        return dicomworklistMapper.GetDicomImageListData(seriesInstList,orgId);
+    }
+
 }
\ No newline at end of file
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 a0e4fb5a0..14916a2d9 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
@@ -21,12 +21,21 @@
     </select>
     <select id="GetDicomSeriesData"
             resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicomSeriesDO">
-        select * from dicomseries where StudyInsta=#{StudyInsta} and orgId=${orgId}
+        select * from dicomseries where StudyInsta=#{StudyInsta} and orgId=#{orgId} and BodyPartEx is not null and BodyPartEx!='' ORDER BY SeriesNumb
     </select>
     <select id="GetDicomImageData"
             resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicomImagesDO">
 
-        select * from dicomimages where SeriesInst=#{SeriesInst} and orgId=${orgId}
+        select * from dicomimages where SeriesInst=#{SeriesInst} and orgId=#{orgId}
+    </select>
+    <select id="GetDicomImageListData"
+            resultType="cn.iocoder.yudao.module.system.dal.dataobject.dicomworklist.DicomImagesDO">
+        SELECT * FROM dicomimages
+        WHERE  orgId=#{orgId} and SeriesInst IN
+        <foreach item="seriesInst" collection="seriesInstList" open="(" separator="," close=")">
+            #{seriesInst}
+        </foreach>
+
     </select>
 
 </mapper>
\ No newline at end of file