From 6aaa47ce1028db3f3275eaf37beef4700971cfd6 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期三, 16 十月 2024 13:56:17 +0800
Subject: [PATCH] zjh20241016
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 49 +++++++++++++++++++++++++++++--------------------
1 files changed, 29 insertions(+), 20 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index c9b97ad..56314af 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -875,13 +875,12 @@
}
-
/**
* 浣撴绛惧埌鐧昏鎺ュ彛
*/
- ReentrantLock lock=new ReentrantLock();
+ ReentrantLock lock = new ReentrantLock();
@PostMapping
@ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
@@ -977,7 +976,7 @@
try {
boolean b = lock.tryLock(3, TimeUnit.MINUTES);
- if(b){
+ if (b) {
//鐢熸垚浣撴鍙�
String tjNumber = (SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmss").format(new Date()));
tjOrder.setTjNumber(tjNumber);
@@ -1047,7 +1046,7 @@
tjFlowingWater.setCopeWith(tjOrder.getTjFlowingWater().getCopeWith());
tjFlowingWater.setPaidIn(tjOrder.getTjFlowingWater().getPaidIn());
tjFlowingWater.setDiscount(tjOrder.getTjFlowingWater().getDiscount());
- // tjFlowingWater.setPayStasus(0L);
+ // tjFlowingWater.setPayStasus(0L);
}
}
if (tjFlowingWaterService.save(tjFlowingWater)) {
@@ -2569,7 +2568,7 @@
return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
}
}
- boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
if (zfHisApiMethods) {
return AjaxResult.success("鎾ら攢鎴愬姛");
} else {
@@ -2716,7 +2715,7 @@
public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) {
LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(TjOrder::getCardId,cardId);
+ queryWrapper.eq(TjOrder::getCardId, cardId);
TjOrder order = tjOrderService.getOne(queryWrapper);
order.setCardId(cardId);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
@@ -2737,7 +2736,7 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
} else {
- boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order, lisApiMethod.isUseLisAndPacsRegister(order));
if (zfHisApiMethods) {
return AjaxResult.success("鎾ら攢鎴愬姛", map);
} else {
@@ -2819,25 +2818,35 @@
if (null != order) {
String configByKey = configService.selectConfigByKey("sfkqdyhis");
if (null != configByKey && configByKey.equals("Y")) {
+ log.info("dto鐨勬暟鎹槸" + JSONUtil.toJsonStr(dto));
HashMap<String, Object> hisRequestParams = new HashMap<>();
hisRequestParams.put("patientId", order.getCardId());
AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
- BigDecimal cateFeeAll = BigDecimal.ZERO;
- List<String> advIds = new ArrayList<>();
- for (Map<String, String> datum : data) {
- String advId = datum.get("Adv_Id").split("_")[1];
- BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
- cateFeeAll = cateFeeAll.add(cateFee);
- advIds.add(advId);
+ log.info("data鐨勬暟鎹槸" + JSONUtil.toJsonStr(data));
+// BigDecimal cateFeeAll = BigDecimal.ZERO;
+// List<String> advIds = new ArrayList<>();
+ List<LtkjJianchajianyanTree> buLuXmXinXi = tjOrderService.getBuLuXmXinXi(dto.getBldhs(), order.getCardId());
+ log.info("buLuXmXinXi鐨勫�间负:==========" + buLuXmXinXi);
+ if (null != buLuXmXinXi && !buLuXmXinXi.isEmpty()) {
+ for (Map<String, String> datum : data) {
+ for (LtkjJianchajianyanTree tree : buLuXmXinXi) {
+ String advId = datum.get("Adv_Id").split("_")[1];
+ log.info("advid鐨勫�间负:==========" + advId);
+ log.info("tree鐨勫�间负:==========" + advId);
+ BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
+ log.info("cateFee鐨勫�间负:==========" + cateFee);
+ log.info("tree.getFyhj()鐨勫�间负:==========" + tree.getFyhj());
+ if (tree.getSqdh().equals(advId) && cateFee.compareTo(new BigDecimal(tree.getFyhj())) == 0) {
+ log.info("璇ラ」鐩凡缂磋垂涓嶅彲鎾ら攢");
+ return AjaxResult.error("璇ラ」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
+ }
+ }
+ }
}
- if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
- log.info("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢");
- return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
- }
-
}
+
boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
if (!b) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -2856,7 +2865,7 @@
return AjaxResult.error();
}
- @Transactional(propagation =Propagation.REQUIRES_NEW)
+ // @Transactional(propagation =Propagation.REQUIRES_NEW)
public void extracted(TjProBlDto dto) {
for (String bldh : dto.getBldhs()) {
remarkService.deleteTjOrderDetailByjxbz(bldh);
--
Gitblit v1.8.0