From c2135fe71c57e304e6056ddb1d4717447935561c Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期二, 27 八月 2024 18:20:09 +0800
Subject: [PATCH] zjh 2024-08-27
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java | 38 +++++++++++++-------------------------
ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java | 4 ++--
2 files changed, 15 insertions(+), 27 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 1778e4e..63e79f4 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
@@ -1421,47 +1421,35 @@
ksId = Math.toIntExact(sysUser.getDeptId());
}
String configByKey = configService.selectConfigByKey("sfkqdyhis");
- if (configByKey.equals("Y")){
- // 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
- LambdaQueryWrapper<TjOrder> tjOrderLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjOrderLambdaQueryWrapper.eq(TjOrder::getTjNumber,tjNumber);
- TjOrder tjOrder = orderService.getOne(tjOrderLambdaQueryWrapper);
- LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
- tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
- tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
- TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
-
+ // 鍒ゆ柇鏄惁鏀惰垂 璇锋眰鎺ュ彛
+ TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
+ LambdaQueryWrapper<TjFlowingWater> tjFlowingWaterLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getOrderId,tjOrder.getOrderId());
+ tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
+ TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
+ if(null !=tjFlowingWater && (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);
+ 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;
-// for (Map<String, String> datum : data) {
-// BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
-// cateFeeAll = cateFeeAll.add(cateFee);
-// }
-// BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
-// if (cateFeeAll.compareTo(fyhj) != 0){
-// return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
-// }
-
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("鏈煡璇㈠埌缂磋垂璁板綍");
}
-// }
+ }else {
+ log.error("璺嘲绉戞妧--- "+DateUtil.date()+" 鏈鎺is鎺ュ彛 "+" 浣撴鍙� "+tjOrder.getTjNumber());
+ return AjaxResult.error("鏈煡璇㈠埌缂磋垂璁板綍");
+ }
}
String config = configService.selectConfigByKey("qt_open_xdt");
String byKey = configService.selectConfigByKey("qt_kjksid");
diff --git a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
index ea30b57..db229d3 100644
--- a/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
+++ b/ltkj-framework/src/main/java/com/ltkj/framework/web/service/SysLoginService.java
@@ -96,7 +96,7 @@
public String login(String username, String password, Boolean type,String code,String uuid) {
String aSwitch = configService.selectConfigByKey("captcha_switch");
- if(null !=aSwitch && aSwitch.equals("Y")){
+ if(null !=aSwitch && aSwitch.equalsIgnoreCase("Y")){
String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
String captcha = redisCache.getCacheObject(verifyKey);
redisCache.deleteObject(verifyKey);
@@ -219,7 +219,7 @@
public String Cuslogin(String username, String password, Boolean type,String code,String uuid) {
String aSwitch = configService.selectConfigByKey("captcha_switch");
- if(null !=aSwitch && aSwitch.equals("Y")){
+ if(null !=aSwitch && aSwitch.equalsIgnoreCase("Y")){
String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
String captcha = redisCache.getCacheObject(verifyKey);
redisCache.deleteObject(verifyKey);
--
Gitblit v1.8.0