From 7d702f59202496e28a80582b4aeeab2a9b9da76d Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期一, 14 十月 2024 15:05:16 +0800 Subject: [PATCH] 修改判断是否需要lis、pacs --- ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 25 ++++++++----------------- 1 files changed, 8 insertions(+), 17 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..d3e61e3 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("鎾ら攢澶辫触,闂ㄨ瘖鎮h�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖"); } else { - boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order); + boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order)); if (zfHisApiMethods) { return AjaxResult.success("鎾ら攢鎴愬姛", map); } else { -- Gitblit v1.8.0