zjh 本地 2024/06/26 --2

zjh

2024-06-26 ba180dc2c6f077b5accbb652b53db2577707bc50

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

@@ -113,6 +113,8 @@
    private ITjFlowingWaterService tjFlowingWaterService;
    @Autowired
    private HisApiGetMethodService hisApiGetMethodService;
    @Autowired
    private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;

    /**
     * 该体检科室下客户列表显示接口
@@ -1428,28 +1430,37 @@
                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",tjCustomer.getPationId());
                // 不在需要身份证号
//                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");
                    Date date = new Date();
                    SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                    List<Map<String, String>> list = data.stream().filter(item -> String.valueOf(item.get("PayDate")).equals(dateFormat.format(date))).collect(Collectors.toList());
                    JSONArray jsonArray = JSONUtil.parseArray(list);
                    BigDecimal decimal = new BigDecimal("0");
                    for (Object o : jsonArray) {
                        JSONObject object = (JSONObject) o;
                        JSONArray items = object.getJSONArray("Items");
                        for (Object item : items) {
                            JSONObject jsonObject = (JSONObject) item;
                            BigDecimal fee = jsonObject.getBigDecimal("Fee");
                            decimal.add(fee);
                        }
                    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);
                    }
                    if (decimal.compareTo(new BigDecimal("0")) != 0){
                    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);
                    if (cateFeeAll.compareTo(total) != 0){
                        return AjaxResult.error("存在未缴费项目");
                    }

                    tjFlowingWater.setPayStasus(1L);
                    tjFlowingWater.setPayType(0L);
                    tjFlowingWater.setTollCollectorId("148");
@@ -1595,6 +1606,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) {
@@ -1670,6 +1682,7 @@
                } else {
                    tjOrderDetail.setDoctorName(null);
                }
                tjOrderDetailList.add(tjOrderDetail);
            }
        }
        Map<String, Object> map = new HashMap<>();
@@ -1689,7 +1702,7 @@
        } else {
            map.put("xiaoJieIds", null);
        }
        map.put("sons", tjOrderDetails);
        map.put("sons", tjOrderDetailList);
        map.put("xiaoJie", adviceList);
        map.put("remark", remark.getRemark());