From cd6114bf85d19e6bdcd6a17c66f34b8c838870d5 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 16 十月 2024 15:31:23 +0800
Subject: [PATCH] 增加标本代码设置
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 113 +++++++++++++++++++++++++++-----------------------------
1 files changed, 54 insertions(+), 59 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 b872d26..cb85d44 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
@@ -212,8 +212,6 @@
private HisPDFUtil hisPDFUtil;
@Value("${path.reportServer}")
private String urlValue;
- @Autowired
- private TjSysAsyncServiceImpl tjSysAsyncService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -877,13 +875,12 @@
}
-
/**
* 浣撴绛惧埌鐧昏鎺ュ彛
*/
- ReentrantLock lock=new ReentrantLock();
+ ReentrantLock lock = new ReentrantLock();
@PostMapping
@ApiOperation(value = "浣撴绛惧埌鐧昏鎺ュ彛")
@@ -979,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);
@@ -1049,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)) {
@@ -1085,24 +1082,11 @@
newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
}
// 鏌ヨ 瀵规帴Lis銆丳acs鐢宠濡傛灉绫诲瀷鍖呭惈鍦ㄩ厤缃唴鍒欎娇鐢ㄥ鎺is銆乸acs
-// if (isUseLisAndPacsRegister(tjOrder)) {
-// List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(tjCustomer.getCusIdcard(),tjOrder.getCardId());
-//// lisApiMethod.save(tjOrder,tjCustomer,detailList);
-// if(!pacsApiMethodService.save(tjOrder,tjCustomer,detailList)){
-// TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-// Object jzh = result.get("jzh");
-// if (null != jzh && null != jzh.toString()) {
-// hisApiMethod.ZfHisApiMethod(jzh.toString());
-// }
-// log.error("pacs鐢宠澶辫触 璇ョ櫥璁颁汉鎸傚彿澶辫触, 灏辫瘖鍙蜂负: " + tjOrder.getCardId());
-// return AjaxResult.error("鎸傚彿澶辫触!" + result.get("msg").toString());
-// }
-// LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
-// wq2.eq(TjOrderDetail::getOrderId, order.getOrderId());
-// wq2.isNotNull(TjOrderDetail::getFlowingWaterId);
-// wq2.eq(TjOrderDetail::getIsSampling, 0);
-// List<TjOrderDetail> detailList1 = tjOrderDetailService.list(wq2);
-// tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList.isEmpty(), order, sysUser);
+// if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
+ // 杩欐槸涓婇潰涓汉鏂规硶寮曞叆鏁版嵁
+// newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
+// AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
+// if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
// }else {
// hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
// }
@@ -1134,20 +1118,6 @@
lock.unlock();
}
return AjaxResult.error();
- }
-
- /**
- * 鏍规嵁浣撴绫诲瀷鍒ゆ柇鏄惁闇�瑕佺洿鎺ヤ粠Lis銆乸acs鐩存帴鐢宠
- */
- public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
- try {
- String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
- String[] split = useLisAndPacsRegisterDictTeam.split(",");
- List<String> list = Arrays.asList(split);
- return list.contains(tjOrder.getTjType());
- } catch (Exception e) {
- return false;
- }
}
@@ -2601,7 +2571,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 {
@@ -2747,7 +2717,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")) {
@@ -2767,7 +2739,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 {
@@ -2837,10 +2809,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("璇烽�夋嫨瑕佹挙閿�鐨勮ˉ褰曢」鐩�");
}
@@ -2848,42 +2821,64 @@
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) {
- return AjaxResult.error("鏀归」鐩凡缂磋垂涓嶅彲鎾ら攢!!!");
- }
-
}
+
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