动态socket以及退药问题，删除没用的东西

pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>thyyxxk</groupId>
     <artifactId>web-server</artifactId>
-    <version>11.0.3</version>
+    <version>11.0.6</version>
     <name>web-server</name>
     <description>server for yibao-web</description>
     <properties>

src/main/java/thyyxxk/webserver/service/datamodify/YzActOrderModifyVerifyService.java

@@ -53,7 +53,6 @@ public class YzActOrderModifyVerifyService {
      */
     public ResultVo<IPage<TYzActOrderModify>> chaKanZhuangTai(TYzActOrderModify param) {
         QueryWrapper<TYzActOrderModify> qw = new QueryWrapper<>();
-
         qw.select("inpatient_no,act_order_no,order_name,audit_flag");
         if (param.getActOrderNo() != null) {
             qw.eq("act_order_no", param.getActOrderNo());

src/main/java/thyyxxk/webserver/service/externalhttp/WebSocketService.java

@@ -4,10 +4,9 @@ import com.dtflys.forest.annotation.*;
 import thyyxxk.webserver.entity.ResultVo;
 import thyyxxk.webserver.entity.socketmessage.ApiMessageBody;
 
-import javax.websocket.Session;
 import java.util.List;
 
-@BaseRequest(baseURL = "http://172.16.30.26:8707/socketApi")
+@BaseRequest(baseURL = "${socketCenter}")
 public interface WebSocketService {
     @Post("/sendMessageBySid")
     ResultVo<String> sendMessageBySid(@JSONBody ApiMessageBody body);

src/main/java/thyyxxk/webserver/service/hospitalizationCosts/HospitalizationCostsService.java

@@ -189,7 +189,7 @@ public class HospitalizationCostsService {
                         if (!"refundOnly".equals(param.getRefundFlag())) {
                             // 口服药无法退费 包装规格是 09,盒，15,瓶 的可以退费
                             if ("1".equals(order.getClassCode())) {
-                                if (order.getRefundableFees().equals(1)) {
+                                if (!order.getRefundableFees().equals(1)) {
                                     sb.append("医嘱给药方式为口服药，口服无法退费，药剂科要求只有包装规格为，瓶、盒、听、支可以退费有退药。");
                                 }
                             }

src/main/resources/application-dev.yml

@@ -1,84 +0,0 @@
-server:
-  port: 9201
-  servlet:
-    encoding:
-      charset: utf-8
-spring:
-  thymeleaf:
-    cache: false
-  datasource:
-    dynamic:
-      primary: dev
-      strict: false
-      datasource:
-        his:
-          url: "jdbc:sqlserver://172.16.32.168:1433;databaseName=thxyhisdb"
-          username: "sa"
-          password:
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        lis:
-          url: "jdbc:sqlserver://172.16.32.178:1433;databaseName=eLimsCore"
-          username: "sa"
-          password: "hnthxyyy"
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-        dev:
-          url: "jdbc:sqlserver://172.16.32.179:1433;databaseName=thxyhisdb"
-          username: "sa"
-          password:
-          type: "com.zaxxer.hikari.HikariDataSource"
-          driver-class-name: "com.microsoft.sqlserver.jdbc.SQLServerDriver"
-    hikari:
-      minimum-idle: 3
-      idle-timeout: 180000
-      maximum-pool-size: 10
-      auto-commit: true
-      pool-name: lisDbPool
-      connection-timeout: 30000
-      connection-test-query: select 1
-  jackson:
-    time-zone: Asia/Shanghai
-    date-format: yyyy-MM-dd HH:mm:ss
-  mvc:
-    format:
-      date: yyyy-MM-dd
-      date-time: yyyy-MM-dd HH:mm:ss
-forest:
-  timeout: 0
-  read-timeout: 0
-  log-enabled: false
-  log-request: false
-  log-response-status: false
-mybatis-plus:
-  configuration:
-    map-underscore-to-camel-case: true
-
-execute-scheduled: false
-
-triage-notify-url: http://localhost:8082/triage/roomScreen/pushMsg
-si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
-
-#正式环境
-si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
-si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
-si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
-si-zy-fee-url: http://172.16.32.166:1000
-si-mz-fee-url: http://172.16.32.166:1100/mzFee
-si-injury-fee-url: http://172.16.32.163:2100/siInjury
-si-injury-systm-url: http://172.16.32.163:2000/siInjury
-thmz-api-url: http://172.16.32.160:81/thmz/api/v1
-
-#测试环境
-#si-api-url: http://10.93.30.130:20001/isp-api/powercsb/1101
-#si-access-key: Zgs5jfxaKb86XbCuUzLK9EhFjiQfHR1vydaPzp
-#si-secret-key: SKT2ETMT3XkAYApqh79DCnN9ZjfbQEBMPU0GyLz9
-#si-zy-fee-url: http://localhost:1000
-#si-mz-fee-url: http://localhost:1100/mzFee
-#si-injury-fee-url: http://localhost:2100/siInjury
-#si-injury-systm-url: http://localhost:2000/siInjury
-#thmz-api-url: http://172.16.30.33:81/thmz/api/v1
-
-logging:
-  level:
-    thyyxxk.webserver.dao: debug

src/main/resources/application-prod.yml

@@ -28,11 +28,11 @@ spring:
       pool-name: lisDbPool
       connection-timeout: 30000
       connection-test-query: select 1
-#  rabbitmq:
-#    host: 192.168.200.3
-#    port: 5672
-#    username: dj
-#    password: 123456
+  #  rabbitmq:
+  #    host: 192.168.200.3
+  #    port: 5672
+  #    username: dj
+  #    password: 123456
   jackson:
     time-zone: GMT+8
     date-format: yyyy-MM-dd HH:mm:ss
@@ -46,12 +46,19 @@ mybatis-plus:
 logging:
   level:
     thyyxxk.webserver.dao: info
+forest:
+  timeout: 0
+  read-timeout: 0
+  log-enabled: false
+  log-request: false
+  log-response-status: false
+  variables:
+    socketCenter: http://172.16.32.160:8707/socketApi
 
 execute-scheduled: true
 
 triage-notify-url: http://172.16.32.160:8082/triage/roomScreen/pushMsg
 si-tj-url: http://jkglcsx.server.zhongmeihealth.com/openInter
-
 si-api-url: http://dms.hun.hsip.gov.cn/isp-api/powercsb/1101
 si-access-key: 04eMGRg7beAO6vqwrZiLacV8Uy3jNn7QGDUcBO
 si-secret-key: SK3Oip3a2R3NLz2xm58Mpmi69oFu96KrdKNRKglN
@@ -59,4 +66,4 @@ si-zy-fee-url: http://172.16.32.166:1000
 si-mz-fee-url: http://172.16.32.166:1100/mzFee
 si-injury-fee-url: http://172.16.32.163:2100/siInjury
 si-injury-systm-url: http://172.16.32.163:2000/siInjury
-thmz-api-url: http://172.16.32.160:81/thmz/api/v1
+thmz-api-url: http://172.16.32.160:81/thmz/api/v1

src/main/resources/application.yml

@@ -50,6 +50,9 @@ forest:
   log-enabled: false
   log-request: false
   log-response-status: false
+  variables:
+    socketCenter: http://localhost:8707/socketApi
+
 mybatis-plus:
   configuration:
     map-underscore-to-camel-case: true
@@ -69,6 +72,7 @@ si-injury-fee-url: http://172.16.32.163:2100/siInjury
 si-injury-systm-url: http://172.16.32.163:2000/siInjury
 thmz-api-url: http://172.16.32.160:81/thmz/api/v1
 
+
 #测试环境
 #si-api-url: http://10.93.30.130:20001/isp-api/powercsb/1101
 #si-access-key: Zgs5jfxaKb86XbCuUzLK9EhFjiQfHR1vydaPzp