zjh20250703

zjh

2 天以前 99d28bddd6ad5bd7c87babf7dcab670215993cb6

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

@@ -181,7 +181,7 @@
            ksproList = projectService.getKsTjProjectIdList();
        }

        if (ksproList == null || ksproList.size() == 0) {
        if (ksproList == null || ksproList.isEmpty()) {
            return AjaxResult.error("请完善科室项目信息");
        }
        List<TjCustomer> customerLis = new ArrayList<>();
@@ -545,7 +545,7 @@
        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjOrder::getUserId, cusId);
        List<TjOrder> orderList = orderService.list(wq1);
        if (null != orderList && orderList.size() > 0) {
        if (null != orderList && !orderList.isEmpty()) {
            List<TjOrder> orderList0 = new ArrayList<>();
            for (TjOrder tjOrder : orderList) {
                LambdaQueryWrapper<TjOrderDetail> wq2 = new LambdaQueryWrapper<>();
@@ -825,6 +825,7 @@
                                    @ApiParam(value = "已检未检状态 0 未检 1已检") @RequestParam(required = false) Integer type) {
        if(type == null)type= 0;
        String userId = SecurityUtils.getLoginUser().getUserId();
        log.info("当前登录用户ID ->{}",userId);
        Integer ksId = null;
        SysUser sysUser = null;
        if (null != userId) {
@@ -854,12 +855,14 @@
                        if (configByKey.equals("Y")) {
                            HashMap<String, Object> hisRequestParams = new HashMap<>();
                            // 不在需要身份证号
                            hisRequestParams.put("patientId", tjOrder.getCardId());
                                hisRequestParams.put("patientId", tjOrder.getCardId());
                            log.info("ltkj--- " + DateUtil.date() + "操作人id: " + 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) {
                                int sfsf1 = ltkjJianchajianyanTreeService.getCallSfsfByCardId(tjOrder.getCardId());
                                log.info("存储过程返回的是:  " + sfsf1 + " 代码返回的是  " + sfsf);
                                if (sfsf1 > 0) {
                                    log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就单数  " + sfsf);
                                    log.error("路泰科技---  " + DateUtil.date() + " 存在未缴费项目的 就诊号  " + tjOrder.getCardId() + " 体检号 " + tjOrder.getTjNumber());
                                    return AjaxResult.error("存在未缴费项目");
@@ -897,6 +900,7 @@
                }
            }
        }
        log.info("type ->{},查询关联科室集合 ->{}",type,split);
            List<TjOrderRemark> list;
            if(null != sysUser && sysUser.getUserName().equals("10001")){
                if(type !=1){
@@ -912,6 +916,7 @@
                }
            }
            if (null ==list || list.isEmpty()) {
                log.info("触发该科室下无项目");
                return AjaxResult.error("该科室下无项目！");
            }
            for (TjOrderRemark tjOrderRemark : list) {