zjh 2024/07/3-1

zjh

2024-07-03 8aea3ecc955f5c55024686375bc6b2fc3a989a35

 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysDeptController.java

@@ -1436,18 +1436,18 @@
                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<>();
//                    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];
//                        String advId = datum.get("Adv_Id").split("_")[1];
                        BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
                        String cateCode = datum.get("CateCode");
//                        String cateCode = datum.get("CateCode");
                        cateFeeAll = cateFeeAll.add(cateFee);
                        sqdhs.add(advId);
                        xmfls.add(cateCode);
//                        sqdhs.add(advId);
//                        xmfls.add(cateCode);
                    }
                    LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
       /*             LambdaQueryWrapper<LtkjJianchajianyanTree> queryWrapper = new LambdaQueryWrapper<>();
                    queryWrapper.in(LtkjJianchajianyanTree::getSqdh, sqdhs)
                            .in(LtkjJianchajianyanTree::getXmfl, xmfls)
                            .eq(LtkjJianchajianyanTree::getCardId,tjOrder.getCardId())
@@ -1456,8 +1456,9 @@
                    List<LtkjJianchajianyanTree> results = ltkjJianchajianyanTreeService.list(queryWrapper);
                    BigDecimal total = results.stream()
                            .map(item -> new BigDecimal(item.getFyhj()))
                            .reduce(BigDecimal.ZERO, BigDecimal::add);
                    if (cateFeeAll.compareTo(total) != 0){
                            .reduce(BigDecimal.ZERO, BigDecimal::add);*/
                    BigDecimal fyhj = ltkjJianchajianyanTreeService.getLtkjJianchajianyanTreeFyhjByCardId(tjOrder.getCardId());
                    if (cateFeeAll.compareTo(fyhj) != 0){
                        return AjaxResult.error("存在未缴费项目");
                    }

@@ -1606,6 +1607,7 @@
            return AjaxResult.success("该用户暂时没有体检数据");
        }
        List<TjOrderDetail> tjOrderDetails = detailService.getTjOrderDetailListInProParentIdList(String.valueOf(one.getOrderId()), proParentIdList);
        List<TjOrderDetail> tjOrderDetailList=new ArrayList<>();
        TjCustomer customer = tjCustomerService.getById(one.getUserId());
        if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
            for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
@@ -1681,6 +1683,7 @@
                } else {
                    tjOrderDetail.setDoctorName(null);
                }
                tjOrderDetailList.add(tjOrderDetail);
            }
        }
        Map<String, Object> map = new HashMap<>();
@@ -1700,7 +1703,7 @@
        } else {
            map.put("xiaoJieIds", null);
        }
        map.put("sons", tjOrderDetails);
        map.put("sons", tjOrderDetailList);
        map.put("xiaoJie", adviceList);
        map.put("remark", remark.getRemark());