zjh20250415

zjh

2025-04-15 971162978842f8cf87d34f99da8c529e2e945da8

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

@@ -964,92 +964,94 @@
    @ApiOperation("提交该科室下客户体检结果接口")
    @Transactional
    public AjaxResult addRemark(@ApiParam(value = "体检父项目备注集合") @RequestBody List<TjOrderRemark> remarklList) {
        Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
        SysUser sysUser = userService.getById(userId);
        if (remarklList == null || remarklList.isEmpty()) {
            return AjaxResult.success("操作失败");
        }
        for (TjOrderRemark orderRemark : remarklList) {
            List<String> summaryList = orderRemark.getSummaryList();
            if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
                orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
            } else {
                orderRemark.setSummary(null);
        try {
            Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
            SysUser sysUser = userService.getById(userId);
            if (remarklList == null || remarklList.isEmpty()) {
                return AjaxResult.success("操作失败");
            }
            if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
            LambdaQueryWrapper<TjOrder> qw = new LambdaQueryWrapper<>();
            qw.eq(TjOrder::getTjNumber, orderRemark.getTjNumber());
            TjOrder order = orderService.getOne(qw);
            orderRemark.setDeptId(sysUser.getDeptId());
            if (orderRemark.getDoctorName() == null) {
                orderRemark.setDoctorName(String.valueOf(sysUser.getUserId()));
            }
            List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();

//            final TjCustomer byId1 = customerService.getById(order.getUserId());
            if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
                //----------------------------------start
//                for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
//                    final TjProject byId = projectService.getById(tjOrderDetail.getProId());
//                    //给病种记录表存 方便统计病种和客户信息之间的关系
//                    if (tjOrderDetail.getRulesList()!=null){
//                        for (TjRules tjRules : tjOrderDetail.getRulesList()) {
//                            TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
//                            orderDetailRules.setAid(tjRules.getAid());
//                            if (byId1!=null){
//                                orderDetailRules.setCusName(byId1.getCusName());
//                                orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
//                                orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
//                                orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
//                            }
//                            orderDetailRules.setBingzhong(tjRules.getBingzhong());
//                            orderDetailRules.setDoctorName(sysUser.getNickName());
//                            orderDetailRules.setTjNumber(order.getTjNumber());
//                            if (byId!=null){
//                                orderDetailRules.setProId(String.valueOf(byId.getProId()));
//                                orderDetailRules.setProName(byId.getProName());
//                            }
//                            orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
//                            tjOrderDetailRulesService.save(orderDetailRules);
//                        }
//                    }
//                }
                asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
                LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
                qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
                TjOrderDetail detail = detailService.getOne(qww);
                detail.setTjStatus(1L);
                detailService.updateById(detail);
                orderRemark.setType(1);
                LambdaQueryWrapper<TjOrderRemark> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjOrderRemark::getTjNumber, orderRemark.getTjNumber());
                wq1.eq(TjOrderRemark::getProId, orderRemark.getProId());
                TjOrderRemark one = remarkService.getOne(wq1);
                if (one == null) {
                    TjOrderRemark remark = new TjOrderRemark();
                    BeanUtils.copyBeanProp(orderRemark, remark);
                    remarkService.save(remark);
            for (TjOrderRemark orderRemark : remarklList) {
                List<String> summaryList = orderRemark.getSummaryList();
                if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
                    orderRemark.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                } else {
                    one.setRemark(orderRemark.getRemark());
                    if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
                        one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                    } else {
                        one.setSummary(null);
                    }
                    one.setDoctorName(orderRemark.getDoctorName());
                    one.setType(1);
                    remarkService.updateById(one);
                    orderRemark.setSummary(null);
                }
                asyncService.updateCheckType(orderRemark.getTjNumber());
                asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
                return AjaxResult.success("操作成功");
                if (StringUtils.isBlank(orderRemark.getRemark())) orderRemark.setRemark(null);
                TjOrder order = orderService.getOrderByTjNum(orderRemark.getTjNumber());
                if(null !=order && null !=order.getReportTime())return AjaxResult.error("该人员报告已出 不可修改");
                orderRemark.setDeptId(sysUser.getDeptId());
                if (orderRemark.getDoctorName() == null) {
                    orderRemark.setDoctorName(String.valueOf(sysUser.getUserId()));
                }
                List<TjOrderDetail> tjOrderDetailList = orderRemark.getTjOrderDetailList();

    //            final TjCustomer byId1 = customerService.getById(order.getUserId());
                if (null != tjOrderDetailList && !tjOrderDetailList.isEmpty()) {
                    //----------------------------------start
    //                for (TjOrderDetail tjOrderDetail : tjOrderDetailList) {
    //                    final TjProject byId = projectService.getById(tjOrderDetail.getProId());
    //                    //给病种记录表存 方便统计病种和客户信息之间的关系
    //                    if (tjOrderDetail.getRulesList()!=null){
    //                        for (TjRules tjRules : tjOrderDetail.getRulesList()) {
    //                            TjOrderDetailRules orderDetailRules=new TjOrderDetailRules();
    //                            orderDetailRules.setAid(tjRules.getAid());
    //                            if (byId1!=null){
    //                                orderDetailRules.setCusName(byId1.getCusName());
    //                                orderDetailRules.setCusSex(String.valueOf(byId1.getCusSex()));
    //                                orderDetailRules.setCusAge(String.valueOf(MatchUtils.getAgeByIdCard(byId1.getCusIdcard())));
    //                                orderDetailRules.setCusId(String.valueOf(byId1.getCusId()));
    //                            }
    //                            orderDetailRules.setBingzhong(tjRules.getBingzhong());
    //                            orderDetailRules.setDoctorName(sysUser.getNickName());
    //                            orderDetailRules.setTjNumber(order.getTjNumber());
    //                            if (byId!=null){
    //                                orderDetailRules.setProId(String.valueOf(byId.getProId()));
    //                                orderDetailRules.setProName(byId.getProName());
    //                            }
    //                            orderDetailRules.setDoctorId(String.valueOf(sysUser.getUserId()));
    //                            tjOrderDetailRulesService.save(orderDetailRules);
    //                        }
    //                    }
    //                }
                    asyncService.updateOrdeltile(tjOrderDetailList, sysUser, order,orderRemark);
                    LambdaQueryWrapper<TjOrderDetail> qww = new LambdaQueryWrapper<>();
                    qww.eq(TjOrderDetail::getOrderId, order.getOrderId());
                    qww.eq(TjOrderDetail::getProId, orderRemark.getProId());
                    TjOrderDetail detail = detailService.getOne(qww);
                    detail.setTjStatus(1L);
                    detailService.updateById(detail);
                    orderRemark.setType(1);
                    LambdaQueryWrapper<TjOrderRemark> wq1 = new LambdaQueryWrapper<>();
                    wq1.eq(TjOrderRemark::getTjNumber, orderRemark.getTjNumber());
                    wq1.eq(TjOrderRemark::getProId, orderRemark.getProId());
                    TjOrderRemark one = remarkService.getOne(wq1);
                    if (one == null) {
                        TjOrderRemark remark = new TjOrderRemark();
                        BeanUtils.copyBeanProp(orderRemark, remark);
                        remarkService.save(remark);
                    } else {
                        one.setRemark(orderRemark.getRemark());
                        if (null != summaryList && !summaryList.isEmpty() && !summaryList.contains(null)) {
                            one.setSummary(Joiner.on(";").join(orderRemark.getSummaryList()));
                        } else {
                            one.setSummary(null);
                        }
                        one.setDoctorName(orderRemark.getDoctorName());
                        one.setType(1);
                        remarkService.updateById(one);
                    }
                    asyncService.updateCheckType(orderRemark.getTjNumber());
                    asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(), null, String.valueOf(orderRemark.getProId()));
                    return AjaxResult.success("操作成功");
                }
            }
//            asyncService.updateCheckType(orderRemark.getTjNumber());
//            asyncService.getOrderDetailByProParentId(orderRemark.getTjNumber(),null, String.valueOf(orderRemark.getProId()));
            remarkService.tjYishengjianchajianyi(null, null, null, null);
            return AjaxResult.success("操作成功");
        } catch (NumberFormatException e) {
            log.error(e.getMessage());
            throw new RuntimeException(e);
        }
        remarkService.tjYishengjianchajianyi(null, null, null, null);
        return AjaxResult.success("操作成功");
    }

    /**