From 159c6ba1276a8cbdefb3625219c9fe110fa56f3c Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 14 十月 2024 15:34:01 +0800
Subject: [PATCH] 退费后取消接诊作废申请单等操作
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 2b3d4ca..c7c9a75 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -33,6 +33,7 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
+import com.mysql.cj.jdbc.exceptions.MySQLTransactionRollbackException;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -493,6 +494,8 @@
/*鍚屾妫�鏌� his瀛樺偍杩囩▼*/
AjaxResult results = jcsqdService.getTjJcProByHisCall("浣撴涓績", order.getCardId(), "''", 100, 1, "'1'");
+
+ DynamicDataSourceContextHolder.setDataSourceType(DataSourceType.MASTER.name());
DynamicDataSourceContextHolder.clearDataSourceType();
log.info("妫�鏌ラ」鐩煡璇㈣繑鍥炲��: " + results.toString());
@@ -553,7 +556,24 @@
jcbgdService.save(jcbgd);
}
jcsqdService.saveLtkjExamJcsqd(order.getCardId());
- testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+
+ int maxRetries=3;
+ for (int attempt = 0; attempt < maxRetries; attempt++) {
+ try {
+ testMapper.updateDetailByTjJcCall(order.getCardId(),
+ String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
+ break;
+ } catch (Exception e) {
+ if (attempt==maxRetries-1){
+ throw e;
+ }
+ try {
+ Thread.sleep(1000);
+ } catch (InterruptedException ignored) {
+ }
+ }
+ }
+
}else {
return AjaxResult.error("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
@@ -1242,6 +1262,7 @@
}
if (StrUtil.isNotBlank(ckfw)) {
try {
+ if (ckfw != null && ckfw.contains("-")) {
Integer.parseInt(tjOrderDetail.getYcbz());
String[] split = ckfw.split("-");
BigDecimal min = new BigDecimal(split[0]);
@@ -1253,8 +1274,9 @@
tjOrderDetail.setYcbz("鈫�");
} else if (jyjgval.compareTo(max) > 0) {
tjOrderDetail.setYcbz("鈫�");
- }
- else {
+ } else if(proResult.contains("闃�")) {
+ tjOrderDetail.setYcbz("");
+ }else {
tjOrderDetail.setYcbz("");
}
if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
@@ -1263,6 +1285,11 @@
}else {
tjOrderDetail.setYcbz("");
}
+ }else {
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("");
+
+ if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("闃�")) tjOrderDetail.setYcbz("鈫�");
+ }
} catch (NumberFormatException ignored) {
ignored.printStackTrace();
}
--
Gitblit v1.8.0