From e8b5530715cb66914858ce221c4a725acf8ebf0a Mon Sep 17 00:00:00 2001
From: "jian.wang" <824612544@qq.com>
Date: Thu, 22 Aug 2024 14:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/emr/service/CommomService.java |  8 +++-----
 src/main/resources/mapper/CommomMapper.xml       | 11 ++++++-----
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/emr/service/CommomService.java b/src/main/java/com/emr/service/CommomService.java
index abd8d7e..c2c0595 100644
--- a/src/main/java/com/emr/service/CommomService.java
+++ b/src/main/java/com/emr/service/CommomService.java
@@ -1054,15 +1054,13 @@ public class CommomService {
                 String disDate = "";
 
                 for (int i = 0; i < pdfNameList.size(); i++) {
-
                     String pdfName = pdfNameList.get(i);
                     if (pdfName.contains("_")) {
                         inpatientNo = pdfName.substring(0, pdfName.indexOf("_"));
-                        disDate = pdfName.substring(pdfName.lastIndexOf("_") + 1);
-                    }
-                    if (pdfName.contains("-")) {
+                        disDate = pdfName.substring(pdfName.indexOf("_") + 1);
+                    } else if (pdfName.contains("-")) {
                         inpatientNo = pdfName.substring(0, pdfName.indexOf("-"));
-                        disDate = pdfName.substring(pdfName.lastIndexOf("-") + 1);
+                        disDate = pdfName.substring(pdfName.indexOf("-") + 1);
                     }
                     //病案号转为数值型
                     //inpatientNo =String.valueOf(Long.parseLong(inpatientNo));
diff --git a/src/main/resources/mapper/CommomMapper.xml b/src/main/resources/mapper/CommomMapper.xml
index 359c567..25be858 100644
--- a/src/main/resources/mapper/CommomMapper.xml
+++ b/src/main/resources/mapper/CommomMapper.xml
@@ -1402,11 +1402,12 @@
     </update>
 
     <select id="getCommomTableList" resultType="com.emr.vo.commomSearch.CommomVo">
-        select * from  commomtable c
-        where 1 = 1
-          and c.inpatient_no= #{inpatientNo}
-          AND CONVERT ( VARCHAR ( 100 ), c.dis_date, 23 )  = #{disDate}
-
+        select
+            c.file_path filePath,
+            c.patient_id patientId
+        from  commomtable c
+        where c.inpatient_no= #{inpatientNo}
+          AND c.dis_date like #{disDate} + '%'
     </select>
 
     <select id="queryTableConfig" parameterType="string" resultType="map">