zjh20250218

zjh

2025-02-18 5e4d1aa4b27cfbcf1c4c8beb2ac05f3c7a0cf1bb

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

@@ -1667,6 +1667,7 @@
                List<TjOrderDetail> dels = new ArrayList<>();
                for (TjOrderYcxm ycxm : entry.getValue()) {
                    TjOrderDetail detail=new TjOrderDetail();
                    detail.setOrderDetailId(Long.valueOf(ycxm.getId()));
                    detail.setProName(ycxm.getJcxm());
                    detail.setProResult(ycxm.getJcjg());
                    detail.setStanId(ycxm.getCkfw());
@@ -1711,15 +1712,24 @@
           return AjaxResult.success(maps);
        }else {
            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
            if(mapList.isEmpty()){
                return AjaxResult.error("暂无数据");
            }
//            if(mapList.isEmpty()){
//                return AjaxResult.success("暂无数据");
//            }
            return AjaxResult.success(mapList);
        }

//            return zongjianyishengchakanyichangxiangmu(tjNum);
        }
        return AjaxResult.error();
    }



    @GetMapping ("/delzongjianyishengchakanyichangxiangmu")
    @ApiOperation (value = "总检删除异常项目接口")
    public AjaxResult delzongjianyishengchakanyichangxiangmu(@RequestParam String id) {
        ycxmService.removeById(id);
        return AjaxResult.success();
    }

    private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
@@ -1738,13 +1748,17 @@
                            if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
                                if(!tjOrderDetail.getDeptId().equals("2")){
                                    List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                            ,"",tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
                                            ,tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]","")
                                                    .replaceAll("[ 测定检测]","").replaceAll("\\[.*?\\]", ""),tjOrderDetail.getYcbz().replaceAll(" ", ""),tjNumber
                                            ,tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]","").replaceAll("\\[.*?\\]", "")
                                            ,tjOrderDetail.getProResult());


                                    if(null !=maps && !maps.isEmpty()){
                                        tjOrderDetail.setAdvices(maps);
                                    }

                                }else {
                                    String[] split = tjOrderDetail.getProResult().split("。|,|，");
                                    List<Map<String,Object>> mapList=new ArrayList<>();
@@ -1810,7 +1824,7 @@
                return AjaxResult.success();
            }
        }
        return AjaxResult.error();
        return AjaxResult.success();
    }