zjh202412013

zjh

2024-12-13 bf81174e8446b6057fe6fcfd3a752cd983e6f8eb

zjh202412013

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

@@ -420,7 +420,7 @@
                                   @ApiParam(value = "报告结束时间") @RequestParam(required = false) Date bgendTime,
                                   @ApiParam(value = "单位") @RequestParam(required = false) String dw) {
        Map<String, Object> map = new HashMap<>();
        List<Long> cusIds =null;
        List<Long> cusIds = null;
        if (null != name) {
//            List<TjCustomer> customerList;
            LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
@@ -579,10 +579,10 @@
        }

        if (StrUtil.isNotBlank(dw)) {
            wq.like(TjOrder::getFirmName,dw);
            wq.like(TjOrder::getFirmName, dw);
        }

        if(null !=cusIds && !cusIds.isEmpty()){
        if (null != cusIds && !cusIds.isEmpty()) {
            wq.in(TjOrder::getUserId, cusIds);
        }

@@ -627,36 +627,40 @@
                    TjDjdDyjl dycs = djdDyjlService.getDjdDyCsByTjNum(order.getTjNumber());
                    if (null != dycs) order.setDycs(Math.toIntExact(dycs.getDycs()));
                }
                    int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
                    int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
                    Date checkTime = order.getCheckTime();
                    Date reportTime = order.getReportTime();
                    Integer heshouStatus = order.getHeshouStatus();
                    Date lastTime = order.getPrintLastTime();
                    if (czwj == 0) {
                        //未检
                        order.setZt("未检");
                    } else if (czwj > 0) {
                        //在检
                        order.setZt("在检");
                    } else if (sfwc == 0) {
                        //已完成
                        order.setZt("已完成");
                    } else if (null != checkTime) {
                        //已审核
                        order.setZt("已审核");
                    } else if (null != reportTime) {
                        //生成报告
                        order.setZt("生成报告");
                    } else if (null != heshouStatus) {
                        //报告核收
                        order.setZt("报告核收");
                    } else if (null != lastTime) {
                        //已出报告
                        order.setZt("已出报告");
                    } else {
                        order.setZt("未检");
                    }
                int czwj = remarkService.panduaniscunzaiweijian(order.getTjNumber());
                int sfwc = remarkService.panduaniswancheng(order.getTjNumber());
                Date checkTime = order.getCheckTime();
                Date reportTime = order.getReportTime();
                Integer heshouStatus = order.getHeshouStatus();
                Date lastTime = order.getPrintLastTime();
                if (czwj == 0) {
                    //未检
                    order.setZt("未检");
                }
                if (czwj > 0) {
                    //在检
                    order.setZt("在检");
                }
                if (sfwc == 0) {
                    //已完成
                    order.setZt("已完成");
                }
                if (null != checkTime) {
                    //已审核
                    order.setZt("已审核");
                }
                if (null != reportTime) {
                    //生成报告
                    order.setZt("生成报告");
                }
                if (1== heshouStatus) {
                    //报告核收
                    order.setZt("报告核收");
                }
                if (null != lastTime) {
                    //已出报告
                    order.setZt("已出报告");
                }

            }
        }
@@ -677,7 +681,7 @@
                                     @ApiParam(value = "报告开始时间") @RequestParam(required = false) String djbeginTime,
                                     @ApiParam(value = "报告结束时间") @RequestParam(required = false) String djendTime) {
        Map<String, Object> map = new HashMap<>();
        List<Long> cusIds =null;
        List<Long> cusIds = null;
        if (StringUtil.isNotBlank(name)) {
            LambdaQueryWrapper<TjCustomer> wqq = new LambdaQueryWrapper<>();
            wqq.like(TjCustomer::getCusName, name);
@@ -826,10 +830,10 @@
        if (null != tjNum) {
            wq.like(TjOrder::getTjNumber, tjNum);
        }
        if (StringUtil.isNotBlank(dw)){
        if (StringUtil.isNotBlank(dw)) {
            wq.like(TjOrder::getFirmName, dw);
        }
        if(null !=cusIds && !cusIds.isEmpty()){
        if (null != cusIds && !cusIds.isEmpty()) {
            wq.in(TjOrder::getUserId, cusIds);
        }
        wq.orderByDesc(TjOrder::getCreateTime);
@@ -3399,30 +3403,30 @@
            Date reportTime = order.getReportTime();
            Integer heshouStatus = order.getHeshouStatus();
            Date lastTime = order.getPrintLastTime();
            int a=0;
            if (czwj == 0) {
                //未检
                return AjaxResult.success(0);
                a=0;
            } else if (czwj > 0) {
                //在检
                return AjaxResult.success(1);
                a=1;
            } else if (sfwc == 0) {
                //已完成
                return AjaxResult.success(2);
                a=2;
            } else if (null != checkTime) {
                //已审核
                return AjaxResult.success(3);
                a=3;
            } else if (null != reportTime) {
                //生成报告
                return AjaxResult.success(4);
                a=4;
            } else if (null != heshouStatus) {
                //报告核收
                return AjaxResult.success(5);
                a=5;
            } else if (null != lastTime) {
                //已出报告
                return AjaxResult.success(6);
            } else {
                return AjaxResult.error();
                a=6;
            }
            return AjaxResult.success(a);
        }
        return AjaxResult.error();
    }

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TjOrderRemarkServiceImpl.java

@@ -153,7 +153,7 @@

    @Override
    public int panduaniswancheng(String tjNum) {
        return 0;
        return mapper.panduaniswancheng(tjNum);
    }

}