From 11c3eed72663870f1140616c631bb3ad1cab2838 Mon Sep 17 00:00:00 2001
From: zjh <1084500556@qq.com>
Date: 星期一, 22 七月 2024 17:58:21 +0800
Subject: [PATCH] zjh 2024/07/22-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java |   42 +++++++++++++-----------------------------
 1 files changed, 13 insertions(+), 29 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 7f20eda..ccf8bed 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
@@ -1425,40 +1425,24 @@
             tjFlowingWaterLambdaQueryWrapper.ne(TjFlowingWater::getPayStasus,2);
             tjFlowingWaterLambdaQueryWrapper.eq(TjFlowingWater::getIsAddition,"N");
             TjFlowingWater tjFlowingWater = tjFlowingWaterService.getOne(tjFlowingWaterLambdaQueryWrapper);
-//            if (tjFlowingWater1.getPayStasus() != 1){
-//                LambdaQueryWrapper<TjCustomer> tjCustomerLambdaQueryWrapper = new LambdaQueryWrapper<>();
-//                tjCustomerLambdaQueryWrapper.eq(TjCustomer::getCusId,tjOrder.getUserId());
-//                TjCustomer tjCustomer = tjCustomerService.getOne(tjCustomerLambdaQueryWrapper);
+
                 HashMap<String, Object> hisRequestParams = new HashMap<>();
                 // 涓嶅湪闇�瑕佽韩浠借瘉鍙�
-//                hisRequestParams.put("card_no",tjCustomer.getCusIdcard());
                 hisRequestParams.put("patientId",tjOrder.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");
-//                    ArrayList<String> sqdhs = new ArrayList<>();
-//                    ArrayList<String> xmfls = new ArrayList<>();
-                    BigDecimal cateFeeAll = BigDecimal.ZERO;
-                    for (Map<String, String> datum : data) {
-//                        String advId = datum.get("Adv_Id").split("_")[1];
-                        BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
-//                        String cateCode = datum.get("CateCode");
-                        cateFeeAll = cateFeeAll.add(cateFee);
-//                        sqdhs.add(advId);
-//                        xmfls.add(cateCode);
-                    }
-       /*             LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
-                    queryWrapper.in(LtkjJianchajianyanTree::getSqdh, sqdhs)
-                            .in(LtkjJianchajianyanTree::getXmfl, xmfls)
-                            .eq(LtkjJianchajianyanTree::getCardId,tjOrder.getCardId())
-                            .groupBy(LtkjJianchajianyanTree::getType)
-                            .select(LtkjJianchajianyanTree::getFyhj);
-                    List<LtkjJianchajianyanTree> results = ltkjJianchajianyanTreeService.list(queryWrapper);
-                    BigDecimal total = results.stream()
-                            .map(item -> new BigDecimal(item.getFyhj()))
-                            .reduce(BigDecimal.ZERO, BigDecimal::add);*/
-                    BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
-                    if (cateFeeAll.compareTo(fyhj) != 0){
+//                    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){
                         return AjaxResult.error("瀛樺湪鏈即璐归」鐩�");
                     }
 

--
Gitblit v1.8.0