zjh20250326

zjh

2025-03-26 0a75e2c280214f33741128781ea11defccc3621a

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

@@ -152,7 +152,6 @@
    }



//    @GetMapping ("/ceshi")
//    @ApiOperation (value = "测试调用lis视图数据接口")
//    @RepeatSubmit
@@ -179,8 +178,6 @@
//
//        return AjaxResult.success(ccXZxYyPacsJgSt);
//    }




    @GetMapping ("/getOperationPermissionsByTjNum")
@@ -656,8 +653,7 @@
                            }
                        }
                        return AjaxResult.success("同步成功");
                    }
                    else if(null !=sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")){
                    } else if (null != sfkqdshitulianjie && sfkqdshitulianjie.equalsIgnoreCase("Y")) {
                        List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(order.getTjNumber(),hospId);
                        if(null != hysqdList && !hysqdList.isEmpty()){
                            for (LtkjHysqd hysqd : hysqdList) {
@@ -706,7 +702,6 @@
            lock.unlock();
        }
    }



    /**
@@ -1108,7 +1103,6 @@
    }



    @GetMapping ("/getBghsList")
    @ApiOperation (value = "报告核收页面查询接口")//0待1已
//    @PreAuthorize("@ss.hasPermi('check:check:getList')")
@@ -1217,7 +1211,6 @@
        if (endTime == null) endTime = "";
        return AjaxResult.success(orderService.getgetBghsList(tjNumber, page, pageSize, value, beginTime, endTime, name));
    }



    /**
@@ -1538,9 +1531,11 @@
                                        tjOrderDetail.setYcbz("");
                                    }
                                    }else {
                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴")) tjOrderDetail.setYcbz("");
                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阴"))
                                            tjOrderDetail.setYcbz("");

                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳")) tjOrderDetail.setYcbz("↑");
                                        if (tjOrderDetail.getProResult() != null && tjOrderDetail.getProResult().contains("阳"))
                                            tjOrderDetail.setYcbz("↑");
                                    }
                                } catch (NumberFormatException ignored) {
                                }
@@ -1654,7 +1649,6 @@
    }



    @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
    @ApiOperation (value = "总检查看异常项目接口")
    public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
@@ -1670,6 +1664,15 @@
        List<TjOrderYcxm> list = ycxmService.list(wq);
        if(null !=list && !list.isEmpty()){
            Collections.reverse(list);
                return getOrderYcxmList(list);
            } else {
                return zongjianyishengchakanyichangxiangmu(tjNum);
            }
        }
        return AjaxResult.error();
    }

    private static AjaxResult getOrderYcxmList(List<TjOrderYcxm> list) {
            Map<String, List<TjOrderYcxm>> map = list.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName));
            List<Map<String, Object>> maps = new ArrayList<>();
            for (Map.Entry<String, List<TjOrderYcxm>> entry : map.entrySet()) {
@@ -1703,19 +1706,18 @@
                    parent.put("sone",dels);
                    maps.add(parent);
            }
            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
        //            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);


            List<Map<String, Object>> collect = mapList.stream()
                    .filter(b -> maps.stream()
                            .noneMatch(a -> a.get("proName").equals(b.get("proName"))))  // 过滤掉在 maps 中存在的相同元素
                    .collect(Collectors.toList());
//            List<Map<String, Object>> collect = mapList.stream()
//                    .filter(b -> maps.stream()
//                            .noneMatch(a -> a.get("proName").equals(b.get("proName"))))  // 过滤掉在 maps 中存在的相同元素
//                    .collect(Collectors.toList());



            if(!collect.isEmpty()){
                maps.addAll(collect);
            }
//            if(!collect.isEmpty()){
//                maps.addAll(collect);
//            }
            if(!maps.isEmpty()){
                List<Map<String, Object>> collect1 = maps.stream()
                        .sorted((map1, map2) -> map2.get("proName").toString().compareTo(map1.get("proName").toString()))
@@ -1723,19 +1725,7 @@
                return AjaxResult.success(collect1);
            }
           return AjaxResult.success(maps);
        }else {
            List<Map<String, Object>> mapList = zongjianyishengchakanyichangxiangmu(tjNum);
//            if(mapList.isEmpty()){
//                return AjaxResult.success("暂无数据");
//            }
            return AjaxResult.success(mapList);
        }

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



    @GetMapping ("/delzongjianyishengchakanyichangxiangmu")
@@ -1745,9 +1735,9 @@
        return AjaxResult.success();
    }

    private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
//        asyncService.updateCheckType(tjNumber);
    private AjaxResult zongjianyishengchakanyichangxiangmu(String tjNumber) {
        List<Map<String, Object>> list = new ArrayList<>();
        List<TjOrderYcxm> tjOrderYcxms = new ArrayList<>();
        TjOrder order = orderService.getOrderByTjNum(tjNumber);
        if(null !=order){
            List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
@@ -1803,11 +1793,16 @@
                                    ycxm.setDw(tjOrderDetail.getProAdvice());
                                    ycxm.setJynr(JSONUtil.toJsonStr(tjOrderDetail.getAdvices()));
                                    ycxm.setJyjc(remark.getJyjc());
                                    ycxmService.save(ycxm);
                                    if (ycxmService.save(ycxm)) {
                                        tjOrderYcxms.add(ycxm);
                                }

                                }
                                dels.add(tjOrderDetail);
                            }
                        }
                        if (!tjOrderYcxms.isEmpty()) {
                            Collections.reverse(tjOrderYcxms);
                            return getOrderYcxmList(tjOrderYcxms);
                        }
                        if(!dels.isEmpty()){
                            parent.put("proName",remark.getProName());
@@ -1820,7 +1815,7 @@

            }
        }
        return list;
        return AjaxResult.success(list);
    }

    @GetMapping ("/chushenyemianchakanxiangmujieguo")
@@ -1863,16 +1858,14 @@
    }



    @PostMapping ("/newaddOrderYcXmJyByTjh")
    @ApiOperation (value = "总检医生页面新增异常项目建议(单个)")
    public AjaxResult newaddOrderYcXmJyByTjh(@RequestBody TjOrderYcxm ycxm) {

                ycxm.setJynr(JSONUtil.toJsonStr(ycxm.getMap()));
                ycxmService.save(ycxm);
        ycxmService.saveOrUpdate(ycxm);
                return AjaxResult.success();
    }



}