2024-12-11

zhaowenxuan

2024-12-11 b7398498c803b88de13d6f905023911312b3fc45

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

@@ -120,6 +120,8 @@
    private HisApiConfigService hisApiConfigService;
    @Autowired
    private RedissonClient redissonClient;
    @Autowired
    private ITjRulesService rulesService;


//    public void  csdsrw() throws InterruptedException {
@@ -667,6 +669,7 @@
                        testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), UserHoder.getLoginUser().getUserId());
                    }
                  //检查
                    orderService.tjLispacstongbujianyi(null,null,null,null);
                    return AjaxResult.success("同步成功");
                }
                return AjaxResult.error("未查到该人员体检记录");
@@ -1611,11 +1614,6 @@



    /**
     * 总检修改备注
     *
     * @return
     */
    @GetMapping ("/getzongjianyishengchakanyichangxiangmu")
    @ApiOperation (value = "总检查看异常项目接口")
    public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) {
@@ -1626,7 +1624,7 @@
    }

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

        if (one == null) {
@@ -1642,6 +1640,13 @@
                    List<TjOrderDetail> dels = new ArrayList<>();
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                            if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
                                List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),null,tjOrderDetail.getYcbz());
                                if(null !=maps && !maps.isEmpty()){
                                    tjOrderDetail.setAdvices(maps);
                                }
                            }

                            dels.add(tjOrderDetail);
                        }
                    }
@@ -1659,4 +1664,14 @@
        return AjaxResult.success("该人员没有体检项目数据！");
    }

    @GetMapping ("/getyichangxiangmujianyiguize")
    @ApiOperation (value = "总检查看异常项目建议规则接口")
    public AjaxResult getyichangxiangmujianyiguize(@RequestParam String proId,@RequestParam String ycbz) {
        if (StrUtil.isNotBlank(proId) && StrUtil.isNotBlank(ycbz)) {
            List<Map<String,Object>> map= rulesService.getyichangxiangmujianyiguize(proId,null,ycbz);
            return AjaxResult.success(map);
        }
        return AjaxResult.error();
    }

}