From 6b2687b46f8de04041f2a815b410211649cf3ed7 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 04 三月 2025 09:58:27 +0800
Subject: [PATCH] zjh20250305
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 57 +++++++++++++++++++++++++++++++--------------------------
1 files changed, 31 insertions(+), 26 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
index 8061883..b7214e4 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java
@@ -1447,31 +1447,35 @@
if (null == tjOrder) {
return AjaxResult.error("鏈壘鍒颁綋妫�璁板綍");
}
- LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
- TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
- if (null != tjFlowingWater) {
- if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
- if (configByKey.equals("Y")) {
- HashMap<String, Object> hisRequestParams = new HashMap<>();
- // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
- hisRequestParams.put("patientId", tjOrder.getCardId());
- log.info("ltkj--- " + DateUtil.date() + "鎿嶄綔浜篿d: " + userId + "鎿嶄綔绉戝: " + sysUser.getDeptId() + "鎿嶄綔鐨勪綋妫�浜�: " + tjNumber);
- AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
- if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
- int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
- if (sfsf > 0) {
- log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
- log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
- return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+
+ SysDept dept = deptService.getById(ksId);
+
+ if(null !=dept && !dept.getDeptName().contains("浣撴涓績")){
+ LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId, tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition, "N");
+ TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
+ if (null != tjFlowingWater) {
+ if (tjFlowingWater.getPayStasus() != 1 && tjFlowingWater.getPayStasus() != 3) {
+ if (configByKey.equals("Y")) {
+ HashMap<String, Object> hisRequestParams = new HashMap<>();
+ // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
+ hisRequestParams.put("patientId", tjOrder.getCardId());
+ log.info("ltkj--- " + DateUtil.date() + "鎿嶄綔浜篿d: " + userId + "鎿嶄綔绉戝: " + sysUser.getDeptId() + "鎿嶄綔鐨勪綋妫�浜�: " + tjNumber);
+ AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
+ if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
+ int sfsf = ltkjJianchajianyanTreeService.getSfsfByCardId(tjOrder.getCardId());
+ if (sfsf > 0) {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏卞崟鏁� " + sfsf);
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 瀛樺湪鏈即璐归」鐩殑 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
+ return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
+ }
+ extracted(tjOrder, tjFlowingWater);
+ } else {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
- extracted(tjOrder, tjFlowingWater);
- } else {
- log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈煡璇㈠埌缂磋垂璁板綍鐨� 灏辫瘖鍙� " + tjOrder.getCardId() + " 浣撴鍙� " + tjOrder.getTjNumber());
- return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
- }
// String s = configService.selectConfigByKey("is_request_common_his_api");
// if (null != s && s.equals("Y")) {
// LambdaQueryWrapper<TjFlowingWater> wrapper1 = new LambdaQueryWrapper<>();
@@ -1482,10 +1486,11 @@
// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
// }
// }
+ }
+ } else {
+ log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈鎺is鎺ュ彛 " + " 浣撴鍙� " + tjOrder.getTjNumber());
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
- } else {
- log.error("璺嘲绉戞妧--- " + DateUtil.date() + " 鏈鎺is鎺ュ彛 " + " 浣撴鍙� " + tjOrder.getTjNumber());
- return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
}
String config = configService.selectConfigByKey("qt_open_xdt");
--
Gitblit v1.8.0