zjh20250728-1

zjh

5 天以前 da7dd957342aa96b31f17e3d61792896e006d6e2

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

@@ -51,6 +51,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
@@ -136,6 +137,8 @@
    private ITjProAdvicerulesService tjProAdvicerulesService;
    @Autowired
    private TjOrderYcxmService ycxmService;
    @Autowired
    private  TjReportController reportController;
    @Autowired
    private ISysDictDataService sysDictDataService;

@@ -1137,9 +1140,6 @@
    /**
     * 根据体检订单号获取体检详情信息接口
     *
     * @param tjNumber
     * @param advice
     * @param checkStatus
     * @return
     */
    @PostMapping("/getTjdetailList")
@@ -1170,7 +1170,12 @@
                if (StrUtil.isNotBlank(dto.getZhiyeJg()))
                    tjOrder.setZhiyeJg(dto.getZhiyeJg());
                if (orderService.updateById(tjOrder)) {
                    return AjaxResult.success("操作成功");
                    AjaxResult pdf = reportController.toPdf(dto.getTjNumber());
                    if (!pdf.get("code").toString().equals("200") ) {
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return AjaxResult.error("操作失败!");
                    }
                    return AjaxResult.success("审核并生成报告成功!");
                }
                return AjaxResult.error("操作失败");
            }
@@ -1601,19 +1606,25 @@
    public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
        try {
            if (StrUtil.isNotBlank(tjNum)) {
                List<Map<String, Object>> maps = new ArrayList<>();
                TjOrder one = orderService.getOrderByTjNum(tjNum);

                if (one == null) {
                    return AjaxResult.error("暂无数据！！");
                }
                yichangxiangmu(tjNum);
                LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                wq.eq(TjOrderYcxm::getTjh, tjNum);
                List<TjOrderYcxm> list = ycxmService.list(wq);
                if (null != list && !list.isEmpty()) {
                    Collections.reverse(list);
                    return getOrderYcxmList(list);
                } else {
                List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNum);
                if(null!=tjOrderYcxmList&&!tjOrderYcxmList.isEmpty()){
                    LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjOrderYcxm::getTjh, tjNum);
                    List<TjOrderYcxm> list = ycxmService.list(wq);
                    if (null != list && !list.isEmpty()) {
                        Collections.reverse(list);
                        return getOrderYcxmList(list);
                    } else {
                        return AjaxResult.success(maps);
                    }
                }else {
                    return zongjianyishengchakanyichangxiangmu(tjNum);
                }
            }