zjh202412013

zjh

2024-12-13 bf81174e8446b6057fe6fcfd3a752cd983e6f8eb

zjh202412013

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

@@ -636,26 +636,30 @@
                    if (czwj == 0) {
                        //未检
                        order.setZt("未检");
                    } else if (czwj > 0) {
                }
                if (czwj > 0) {
                        //在检
                        order.setZt("在检");
                    } else if (sfwc == 0) {
                }
                if (sfwc == 0) {
                        //已完成
                        order.setZt("已完成");
                    } else if (null != checkTime) {
                }
                if (null != checkTime) {
                        //已审核
                        order.setZt("已审核");
                    } else if (null != reportTime) {
                }
                if (null != reportTime) {
                        //生成报告
                        order.setZt("生成报告");
                    } else if (null != heshouStatus) {
                }
                if (1== heshouStatus) {
                        //报告核收
                        order.setZt("报告核收");
                    } else if (null != lastTime) {
                }
                if (null != lastTime) {
                        //已出报告
                        order.setZt("已出报告");
                    } else {
                        order.setZt("未检");
                    }

            }
@@ -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);
    }

}