zjh20241209

zjh

2024-12-09 345f5654fee547c2f06f74c9eb4855c8bd1f8712

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

@@ -1460,7 +1460,7 @@
        List<TjOrderDetail> tjOrderDetails = detailService.addHuaYanAndCgTable(tjNumber);


        if (null != remarkList && remarkList.size() > 0) {
        if (null != remarkList && !remarkList.isEmpty()) {
            for (TjOrderRemark remark : remarkList) {
                Map<String, Object> parent = new HashMap<>();
                parent.put("checkAdvice", one.getCheckAdvice());
@@ -1469,7 +1469,7 @@
                parent.put("xmlb", remark.getXmlb());
                parent.put("", remark.getXmlb());
                List<TjOrderDetail> dels = new ArrayList<>();
                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                            String ckfw = tjOrderDetail.getStanId();
@@ -1495,7 +1495,7 @@
                                        }else {
                                            tjOrderDetail.setYcbz("");
                                        }
                                        if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().equals("")) {
                                        if (null != tjOrderDetail.getYcbz() && !tjOrderDetail.getYcbz().isEmpty()) {
                                            tjOrderDetail.setProResult(tjOrderDetail.getProResult() + " [" + tjOrderDetail.getYcbz() + "]");
                                        }
                                    }else {
@@ -1523,7 +1523,7 @@
                    } else {
                        parent.put("parentAdvice", null);
                    }
                    if (dels.size() == 0) {
                    if (dels.isEmpty()) {
                        continue;
                    }
                    parent.put("sons", dels);
@@ -1609,4 +1609,54 @@
        return AjaxResult.success(map);
    }



    /**
     * 总检修改备注
     *
     * @return
     */
    @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
    @ApiOperation (value = "总检查看异常项目接口")
    public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
        if (StrUtil.isNotBlank(tjNum)) {
            return zongjianyishengchakanyichangxiangmu(tjNum);
        }
        return AjaxResult.error();
    }

    private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
        asyncService.updateCheckType(tjNumber);
        TjOrder one = orderService.getOrderByTjNum(tjNumber);

        if (one == null) {
            return AjaxResult.error("暂无数据！！");
        }
        List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
        List<TjOrderDetail> tjOrderDetails = detailService.getzongjianyishengchakanyichangxiangmu(tjNumber);
        List<Map<String, Object>> list = new ArrayList<>();
        if (null != remarkList && !remarkList.isEmpty()) {
            for (TjOrderRemark remark : remarkList) {
                Map<String, Object> parent = new HashMap<>();
                if (null != tjOrderDetails && !tjOrderDetails.isEmpty()) {
                    List<TjOrderDetail> dels = new ArrayList<>();
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                            dels.add(tjOrderDetail);
                        }
                    }
                    if(!dels.isEmpty()){
                        parent.put("proName",remark.getProName());
                        parent.put("sone",dels);
                        list.add(parent);
                    }
                } else {
                    return AjaxResult.success("该人员无异常项目");
                }
            }
            return AjaxResult.success(list);
        }
        return AjaxResult.success("该人员没有体检项目数据！");
    }

}