From 102f4dda6197116b1380b725560e8c32ade76b5a Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 14 十月 2024 15:50:18 +0800
Subject: [PATCH] zjh20241014
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 52 ++++++++++++++++++++++++++++------------------------
1 files changed, 28 insertions(+), 24 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 cf4d7d8..c9b97ad 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
@@ -78,6 +78,7 @@
import com.ltkj.web.controller.his.*;
import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
+import com.ltkj.web.controller.service.TjSysAsyncServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -1082,20 +1083,8 @@
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
-// String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
-// String[] split = useLisAndPacsRegisterDictTeam.split(",");
-// List<String> list = Arrays.asList(split);
-// if (list.contains(tjOrder.getTjType())) {
-// List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
-// try {
-// lisApiMethod.save(tjOrder,tjCustomer,detailList);
-// pacsApiMethodService.save(tjOrder,tjCustomer,detailList);
-// }catch (Exception e){
-// String jyxh = "";
-// String cardId = "";
-// String cusName = "";
-// lisApiMethod.cancel(jyxh,cardId,cusName);
-// }
+// if (isUseLisAndPacsRegister(tjOrder)) {
+// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"),tjOrder,sysUser,result);
// }else {
// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
// }
@@ -2580,7 +2569,7 @@
return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
}
}
- boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
if (zfHisApiMethods) {
return AjaxResult.success("鎾ら攢鎴愬姛");
} else {
@@ -2726,7 +2715,9 @@
@Transactional
public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) {
- TjOrder order = new TjOrder();
+ LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(TjOrder::getCardId,cardId);
+ TjOrder order = tjOrderService.getOne(queryWrapper);
order.setCardId(cardId);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
if (configByKey.equals("Y")) {
@@ -2746,7 +2737,7 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
} else {
- boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
if (zfHisApiMethods) {
return AjaxResult.success("鎾ら攢鎴愬姛", map);
} else {
@@ -2816,10 +2807,11 @@
@PostMapping("/revokeBlProByBldhAndTjh")
@ApiOperation(value = "鏍规嵁琛ュ綍鍗曞彿鍜屼綋妫�鍙峰垹闄よ褰�")
- @Transactional
+// @Transactional
public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {
if (null == dto.getBldhs() || dto.getBldhs().size() == 0) {
+ log.info("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
return AjaxResult.error("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
}
@@ -2841,6 +2833,7 @@
advIds.add(advId);
}
if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO) != 0) {
+ log.info("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢");
return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
}
@@ -2848,21 +2841,32 @@
boolean b = hisApiMethod.ZfBlXm(dto.getBldhs(), order);
if (!b) {
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ log.info("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
}
}
- for (String bldh : dto.getBldhs()) {
- remarkService.deleteTjOrderDetailByjxbz(bldh);
- tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
- tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
- transitionService.deleteTjOrderDetailByjxbz(bldh);
- blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
+ try {
+ extracted(dto);
+ } catch (Exception e) {
+ log.info("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�");
+ return AjaxResult.error("鎾ら攢澶辫触,鍒犻櫎琛ㄥけ璐�!");
}
return AjaxResult.success();
}
return AjaxResult.error();
}
+ @Transactional(propagation =Propagation.REQUIRES_NEW)
+ public void extracted(TjProBlDto dto) {
+ for (String bldh : dto.getBldhs()) {
+ remarkService.deleteTjOrderDetailByjxbz(bldh);
+ tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
+ tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
+ transitionService.deleteTjOrderDetailByjxbz(bldh);
+ blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh, dto.getTjh()).eq(TjProBl::getBldh, bldh));
+ }
+ }
+
@PostMapping("/addYaoPinShenQing")
@ApiOperation(value = "鑽搧淇℃伅鐢宠")
--
Gitblit v1.8.0