zjh202412017

zjh

2024-12-17 3dec90c4e5b1b71a1af2bdd855fda1591b53bc88

zjh202412017

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

@@ -1212,7 +1212,7 @@
            int num = orderRemarkService.getTjYqOrderRemarkByTjNum(tjNumber);
            if (num > 0) return AjaxResult.error("存在未检或延期项目暂不能生成报告!!!");
        }

        Date date = new Date();
        if (null != tjNumber) {
            Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
            SysUser sysUser = userService.getById(userId);
@@ -1224,17 +1224,14 @@
                tjOrder.setCheckStatus(checkStatus);
                tjOrder.setStatus(TjConstants.TJ_CHECK);
                tjOrder.setCheckDoctor(sysUser.getNickName());
                tjOrder.setCheckTime(new Date());
                tjOrder.setCheckTime(date);
                tjOrder.setStatus(401);
                tjOrder.setFinishTime(date);
                if (orderService.updateById(tjOrder)) {
                    TjCustomer customer = customerService.getById(tjOrder.getUserId());
                    if (null != customer) {
                        customer.setCusNumber(customer.getCusNumber() + 1);
                        if (customerService.updateById(customer)) {
//                            LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
//                            wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
//                            wqq.eq(TbTransition::getCardId, customer.getCardId());
//                            transitionService.remove(wqq);
                            asyncService.updateCheckType(tjNumber);
                            return AjaxResult.success("操作成功");
                        }

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

@@ -471,7 +471,7 @@
                        order.setZt("在检");
                        orders.add(order);
                    }
                    if (zt==2 && sfwc == 0) {
                    if (zt==2 && sfwc == 0 && order.getCheckStatus()==0 && order.getCheckTime()==null && order.getHeshouStatus()==0 && order.getPrintLastTime()==null) {
                        //已完成2
                        order.setZt("已完成");
                        orders.add(order);
@@ -520,15 +520,29 @@

        if(null !=zt){
            if(zt==3){
                //已审核
                wq.isNotNull(TjOrder::getCheckTime);
                wq.eq(TjOrder::getCheckStatus,1);
                wq.isNull(TjOrder::getHeshouTime);
                wq.isNull(TjOrder::getPrintLastTime);
                wq.eq(TjOrder::getHeshouStatus,0);
            }
            if(zt==4){
                //生成报告
                wq.isNotNull(TjOrder::getReportTime);
                wq.isNull(TjOrder::getHeshouTime);
                wq.isNull(TjOrder::getPrintLastTime);
                wq.eq(TjOrder::getHeshouStatus,0);
            }
            if(zt==5){
                //报告核收
                wq.eq(TjOrder::getHeshouStatus,1);
                wq.isNull(TjOrder::getPrintLastTime);
            }
            if(zt==6){
                //已出报告
                wq.isNotNull(TjOrder::getPrintLastTime);
                wq.eq(TjOrder::getHeshouStatus,1);
                wq.isNotNull(TjOrder::getPrintLastTime);
            }
        }

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

@@ -229,7 +229,7 @@
        wq.eq(TjRules::getProId, proId);
        wq.lt(TjRules::getAgeLt, MatchUtils.getAgeByIdCard(byId.getCusIdcard()));
        wq.gt(TjRules::getAgeGt, MatchUtils.getAgeByIdCard(byId.getCusIdcard()));
        wq.in(TjRules::getSex, 0, byId.getCusSex());
//        wq.in(TjRules::getSex, 0, byId.getCusSex());
        final List<TjRules> list = tjRulesService.list(wq);
        if (list==null){
            return AjaxResult.success(res);
@@ -256,7 +256,7 @@

            }
        }
        if (res!=null && res.size() > 0) {
        if (!res.isEmpty()) {
            //建议赋值
            for (TjRules re : res) {
                LambdaQueryWrapper<TjRuleAdvice> wq1 = new LambdaQueryWrapper<>();