From f04141f904ad9253dd6381aa9ae2fbeabdbb5c8c Mon Sep 17 00:00:00 2001 From: zhaowenxuan <chacca165@163.com> Date: 星期一, 14 十月 2024 18:06:46 +0800 Subject: [PATCH] 补录作废增加lis、pacs作废请求 --- ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 76 +++++++++++++++++++++++++------------ 1 files changed, 51 insertions(+), 25 deletions(-) diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java index 6752265..ddb0200 100644 --- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java +++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java @@ -861,36 +861,62 @@ List<String> cfhs = cfService.getCfBlhs(order.getCardId(),bldh); - //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇� - if (null != jcsqdh && jcsqdh.size()>0) { - for (String s : jcsqdh) { - AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s); - String result1 = getAjaxResult(result); - JSONObject object = getJSONObject(result1); - String code = object.getStr("ResultCode"); - if (code.equals("0")) { - orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh); - } - } - - } - - - //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇� - AjaxResult ajaxResult = null; String result2 = null; JSONObject object1 = null; String code1 = null; - if (null != jysqdh && jysqdh.size()>0) { - for (String s : jysqdh) { - ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s); - result2 = getAjaxResult(ajaxResult); - object1 = getJSONObject(result2); - code1 = object1.getStr("ResultCode"); - if (code1.equals("0")) { - orderService.delHuoQuBlJysqdh(order.getCardId(),bldh); + if (lisApiMethod.isUseLisAndPacsRegister(order)) { + TjCustomer customer1 = customerService.getById(order.getUserId()); + // 浣滃簾妫�鏌ョ敵璇� + if (jcsqdh != null && !jcsqdh.isEmpty()){ + for (String sqdh : jcsqdh) { + AjaxResult cancelPacsAjaxResult = pacsApiMethodService.updatePacsApply(sqdh, order.getCardId(), customer1.getCusName()); + String result = cancelPacsAjaxResult.get("data").toString(); + JSONObject object = JSONUtil.parseObj(result); + String code = object.getStr("ResultCode"); + if(code.equals("1")){ + orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh); + } + } + } + // 浣滃簾妫�楠岀敵璇� + if (jysqdh != null && !jysqdh.isEmpty()){ + for (String sqdh : jysqdh) { + AjaxResult cancelLisAjaxResult = lisApiMethod.cancel(sqdh, order.getCardId(), customer1.getCusName()); + String result = cancelLisAjaxResult.get("data").toString(); + JSONObject object = JSONUtil.parseObj(result); + String code= object.getStr("ResultCode"); + if(code.equals("1")){ + orderService.delHuoQuBlJysqdh(order.getCardId(),bldh); + } + } + } + + }else { + //2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇� + if (null != jcsqdh && jcsqdh.size()>0) { + for (String s : jcsqdh) { + AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", s); + String result1 = getAjaxResult(result); + JSONObject object = getJSONObject(result1); + String code = object.getStr("ResultCode"); + if (code.equals("0")) { + orderService.delHuoQuBlJcsqdh(order.getCardId(),bldh); + } + } + } + + //2.1.6.3 浣滃簾闂ㄨ瘖妫�楠岀敵璇� + if (null != jysqdh && jysqdh.size()>0) { + for (String s : jysqdh) { + ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", s); + result2 = getAjaxResult(ajaxResult); + object1 = getJSONObject(result2); + code1 = object1.getStr("ResultCode"); + if (code1.equals("0")) { + orderService.delHuoQuBlJysqdh(order.getCardId(),bldh); + } } } } -- Gitblit v1.8.0