From f19df04f716111166633e33ac7d75989d85f561d Mon Sep 17 00:00:00 2001
From: linjj <850658129@qq.com>
Date: Fri, 14 Jun 2024 14:09:41 +0800
Subject: [PATCH] =?UTF-8?q?pacs=E8=A1=A5=E5=81=BF=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ipml/BatchExportServiceImpl.java  |   2 +-
 src/main/resources/config/jdbc.properties     | 132 ++++++++----------
 2 files changed, 63 insertions(+), 71 deletions(-)

diff --git a/src/main/java/com/emr/service/ipml/BatchExportServiceImpl.java b/src/main/java/com/emr/service/ipml/BatchExportServiceImpl.java
index 61ad326..be8d350 100644
--- a/src/main/java/com/emr/service/ipml/BatchExportServiceImpl.java
+++ b/src/main/java/com/emr/service/ipml/BatchExportServiceImpl.java
@@ -196,6 +196,6 @@ public class BatchExportServiceImpl implements BatchExportService {
         SimpleDateFormat targetFormat = new SimpleDateFormat("yyyyMMdd");
         Date date = originalFormat.parse(dto.getDischargeDateTime());
         String formattedDate = targetFormat.format(date);
-        return flieName + "_" + dto.getInpNo() + "_" + formattedDate;
+        return flieName + "_" + dto.getInpNo().trim() + "_" + formattedDate;
     }
 }
diff --git a/src/main/resources/config/jdbc.properties b/src/main/resources/config/jdbc.properties
index 3dc3b60..00588ab 100644
--- a/src/main/resources/config/jdbc.properties
+++ b/src/main/resources/config/jdbc.properties
@@ -1,72 +1,16 @@
-#\u6570\u636E\u5E93IP
-dataBaseIp=localhost
-##\u6570\u636E\u5E93\u540D\u79F0
-#dataBaseName=yd_record
-##\u6570\u636E\u5E93\u5BC6\u7801
-#dataBasePassword=docus702
-
-#\u6570\u636E\u5E93IP
-#dataBaseIp=10.36.116.108
-##\u6570\u636E\u5E93\u540D\u79F0
-dataBaseName=yd_record
-#\u6570\u636E\u5E93\u5BC6\u7801
-dataBasePassword=admin123
-
-jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
-jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName}
-jdbc.username=sa
-jdbc.password=${dataBasePassword}
-
-#oracle
-#jdbc.url1=jdbc:oracle:thin:@localhost:1521/ORCL
-#jdbc.username1=docus
-#jdbc.password1=docus702
-
-jdbc.url1=jdbc:oracle:thin:@192.168.10.6:1521/orc1
-jdbc.username1=pacs
-jdbc.password1=pacs
-
-jdbc.driver1=oracle.jdbc.driver.OracleDriver
-
-filters: stat
-maxActive: 20
-initialSize: 1
-maxWait: 60000
-minIdle: 10
-timeBetweenEvictionRunsMillis: 60000
-minEvictableIdleTimeMillis: 300000
-validationQuery: SELECT 'x'
-testWhileIdle: true
-testOnBorrow: false
-testOnReturn: false
-maxOpenPreparedStatements: 20
-removeAbandoned: true
-removeAbandonedTimeout: 1800
-logAbandoned: true
-
-#\u56FE\u7247\u5730\u5740
-pictureUrl=src\\main\\webapp
-
-powerUrl=http://localhost:8084/power/font/getMenusByUserIdAndSysFlag
-POWER_URLHEAD=http://localhost:8084/power
-POWER_JSP=http://localhost:8084/power
-recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863
-HomepageDictionary=http://localhost:8080/WholeCheckInterface/services/HomepageDictionary?wsdl
-HomepageMethod=CheckData
-#\u5bfc\u51fa\u4fe1\u606f\u683c\u5f0f\u9700\u8981\u4e3aunicode\u683c\u5f0f\u4e0d\u7136\u4f1a\u4e71\u7801
-export_pdf_hospital_info = \u5e7f\u4e1c\u7701_\u5e7f\u4e1c\u533b\u79d1\u5927\u5b66\u9644\u5c5e\u533b\u9662
-#
-#
-#
-#
-#
-#
 ##\u6570\u636E\u5E93IP
 #dataBaseIp=localhost
 ###\u6570\u636E\u5E93\u540D\u79F0
-#dataBaseName=emr_record
+##dataBaseName=yd_record
+###\u6570\u636E\u5E93\u5BC6\u7801
+##dataBasePassword=docus702
+#
+##\u6570\u636E\u5E93IP
+##dataBaseIp=10.36.116.108
+###\u6570\u636E\u5E93\u540D\u79F0
+#dataBaseName=yd_record
 ##\u6570\u636E\u5E93\u5BC6\u7801
-#dataBasePassword=xjgs+docus911
+#dataBasePassword=admin123
 #
 #jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
 #jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName}
@@ -103,16 +47,64 @@ export_pdf_hospital_info = \u5e7f\u4e1c\u7701_\u5e7f\u4e1c\u533b\u79d1\u5927\u5b
 ##\u56FE\u7247\u5730\u5740
 #pictureUrl=src\\main\\webapp
 #
-#powerUrl=http://10.36.116.108:8080/power/font/getMenusByUserIdAndSysFlag
-#POWER_URLHEAD=http://10.36.116.108:8080/power
-#POWER_JSP=http://10.36.116.108:8080/power
+#powerUrl=http://localhost:8084/power/font/getMenusByUserIdAndSysFlag
+#POWER_URLHEAD=http://localhost:8084/power
+#POWER_JSP=http://localhost:8084/power
 #recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863
-#HomepageDictionary=http://10.36.116.108:8080/WholeCheckInterface/services/HomepageDictionary?wsdl
+#HomepageDictionary=http://localhost:8080/WholeCheckInterface/services/HomepageDictionary?wsdl
 #HomepageMethod=CheckData
-##
 #
 #
 #
 #
 #
 #
+#\u6570\u636E\u5E93IP
+dataBaseIp=localhost
+##\u6570\u636E\u5E93\u540D\u79F0
+dataBaseName=emr_record
+#\u6570\u636E\u5E93\u5BC6\u7801
+dataBasePassword=xjgs+docus911
+
+jdbc.driver=com.microsoft.sqlserver.jdbc.SQLServerDriver
+jdbc.url=jdbc\:sqlserver\://${dataBaseIp}:1433;databaseName=${dataBaseName}
+jdbc.username=sa
+jdbc.password=${dataBasePassword}
+
+#oracle
+#jdbc.url1=jdbc:oracle:thin:@localhost:1521/ORCL
+#jdbc.username1=docus
+#jdbc.password1=docus702
+
+jdbc.url1=jdbc:oracle:thin:@192.168.10.6:1521/orc1
+jdbc.username1=pacs
+jdbc.password1=pacs
+
+jdbc.driver1=oracle.jdbc.driver.OracleDriver
+
+filters: stat
+maxActive: 20
+initialSize: 1
+maxWait: 60000
+minIdle: 10
+timeBetweenEvictionRunsMillis: 60000
+minEvictableIdleTimeMillis: 300000
+validationQuery: SELECT 'x'
+testWhileIdle: true
+testOnBorrow: false
+testOnReturn: false
+maxOpenPreparedStatements: 20
+removeAbandoned: true
+removeAbandonedTimeout: 1800
+logAbandoned: true
+
+#\u56FE\u7247\u5730\u5740
+pictureUrl=src\\main\\webapp
+
+powerUrl=http://10.36.116.108:8080/power/font/getMenusByUserIdAndSysFlag
+POWER_URLHEAD=http://10.36.116.108:8080/power
+POWER_JSP=http://10.36.116.108:8080/power
+recallReason=\u533B\u9662\u9700\u8981\u8FD9\u4EFD\u6587\u6863
+HomepageDictionary=http://10.36.116.108:8080/WholeCheckInterface/services/HomepageDictionary?wsdl
+HomepageMethod=CheckData
+export_pdf_hospital_info = \u5e7f\u4e1c\u7701_\u82f1\u5fb7\u5e02\u4eba\u6c11\u533b\u9662