Merge remote-tracking branch 'origin/his/wenfuyi' into his/wenfuyi

src/main/resources/bootstrap.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: mrqc-sys
   profiles:
-    active: local
+    active: pre
   main:
     allow-bean-definition-overriding: true
 

src/main/resources/jdbc.properties

@@ -9,16 +9,16 @@
 #jdbc.username=ETRACKMRQC
 #jdbc.password=ETRACKMRQC
 
-#jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
-#jdbc.url=jdbc:sqlserver://192.168.100.39\\tzmhemr;DatabaseName=bigemr
-#jdbc.username=zjlt
-#jdbc.password=zjlt@2020
+jdbc.driverClassName=com.microsoft.sqlserver.jdbc.SQLServerDriver
+jdbc.url=jdbc:sqlserver://192.168.100.39\\tzmhemr;DatabaseName=bigemr
+jdbc.username=zjlt
+jdbc.password=zjlt@2020
 
 #\u6570\u636e\u670d\u52a1\u6a21\u5f0f
-#remote.address.ver=http://192.18.101.207:2030/index.html
-#remote.address.hor=http://192.18.101.207:2030/indexHorizontal.html
+remote.address.ver=http://192.18.101.207:2030/index.html
+remote.address.hor=http://192.18.101.207:2030/indexHorizontal.html
 
 process.qc.url=http://172.16.203.210:1489/index.html
 
 #his\u65b9\u60a3\u8005\u63a5\u53e3\u5730\u5740
-#his.patient.url=
+his.patient.url=