zjh
2023-12-26 c4415aad8cb271bb19024607002d5596218e3a94
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -270,13 +270,11 @@
        if (null != tjNumber) {
            Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
            SysUser sysUser = userService.getById(userId);
            LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
            wq1.eq(TjOrder::getTjNumber, tjNumber);
            TjOrder tjOrder = orderService.getOne(wq1);
            TjOrder tjOrder = orderService.getOrderByTjNum(tjNumber);
            if (null != tjOrder) {
                tjOrder.setConfirmTime(new DateTime());
                tjOrder.setConfirmDoctor(sysUser.getNickName());
                tjOrder.setConfirmStatus(remark);
                tjOrder.setConfirmStatus(String.valueOf(status));
                if (status == 0) {
                    tjOrder.setStatus(TjConstants.TJ_CHECK);
                    asyncService.updateCheckType(tjNumber);
@@ -494,6 +492,7 @@
                        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("操作成功");
@@ -543,6 +542,10 @@
                Map<String, Object> parent = new HashMap<>();
                parent.put("checkAdvice", one.getCheckAdvice());
                TjProject project = projectService.selectTjProjectByProId(remark.getProId());
                //判断该项目是否需要打印报告
                if ("N".equals(project.getNeedReport())){
                    continue;
                }
                if (null != project) {
                    parent.put("parent", project.getProName());
                    parent.put("parentId", project.getProId().toString());
@@ -590,7 +593,6 @@
                } else {
                    return AjaxResult.success("该客户没有体检项目数据");
                }
//                }
            }
            return AjaxResult.success(list);
        }