From ae31e51996a8c567fa234e05ee70ce8cc3650fea Mon Sep 17 00:00:00 2001
From: hcy <314517173@qq.com>
Date: Mon, 27 May 2024 13:12:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B9=98=E9=9B=85=E4=BA=8C=E5=8C=BB=E9=99=A2em?=
 =?UTF-8?q?r=E7=97=85=E6=A1=88=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/tScanAssort/T_Scan_AssortServiceImpl.java  | 10 +++++++---
 .../mapper/tScanAssort/T_Scan_AssortMapper.xml         |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java
index 38b254d..96641aa 100644
--- a/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java
+++ b/src/main/java/com/emr/service/tScanAssort/T_Scan_AssortServiceImpl.java
@@ -146,7 +146,11 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService {
             List<IndexFds> indexFdsList = patientAssortVo.getIndexFds();
             //编辑图片信息
             for (IndexFds indexFds : indexFdsList) {
-                String srcPath = indexFds.getScanFile().replaceAll("\\\\", "/");
+                String srcPath ="";
+                if(indexFds.getScanFile().startsWith("\\\\")){
+                    srcPath = indexFds.getScanFile().replaceAll("\\\\", "/");
+                }
+
                 //获取盘符并转换映射地址的头部地址
                 String root = "";
                 //获取盘符后面的地址
@@ -163,8 +167,8 @@ public class T_Scan_AssortServiceImpl implements T_Scan_AssortService {
                     //获取盘符并转换映射地址的头部地址
                     root = selectRootByNotWater(srcPath);
                     //获取盘符后面的地址
-                    picPath = srcPath.substring(srcPath.indexOf('/'));
-                    fileUrl = NEW_EMR_RECORD_JSP + File.separator + root + picPath;
+                    picPath = srcPath.substring(srcPath.indexOf('/')+1);
+                    fileUrl = NEW_EMR_RECORD_JSP + File.separator + root + picPath.replace("/",File.separator);
                 } else {
                     //获取盘符并转换映射地址的头部地址
                     root = selectRootByNotWater(indexFds.getScanFile());
diff --git a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml
index bfa3313..f11a3d8 100644
--- a/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml
+++ b/src/main/resources/mapper/tScanAssort/T_Scan_AssortMapper.xml
@@ -281,7 +281,8 @@
                 LEFT JOIN  t_scan_assort t on c.patient_id=t.patient_id
         WHERE
             c.inpatient_no = #{patientId}
-        ORDER BY t.assort_id
+          and  t.is_del = 0
+        ORDER BY c.admiss_times,t.assort_id
     </select>