zjh20250305

zjh

2025-03-05 6b73ef6f82fa10747c29bdec04cb43d0f7e91598

zjh20250305

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

@@ -129,6 +129,8 @@
    private ITjProAdvicerulesService tjProAdvicerulesService;
    @Autowired
    private TjOrderYcxmService ycxmService;
    @Autowired
    private SysConfigController configController;


    @GetMapping ("/ceshicc")
@@ -871,7 +873,7 @@
                                        jcbgdService.save(jcbgd);
                                    }
                                    jcsqdService.saveLtkjExamJcsqd(order.getCardId());
//                                    testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
                                    testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
                                }else {
                                    return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!");
                                }
@@ -880,7 +882,7 @@
                        return AjaxResult.success("同步成功");
                    }
                    //化验
//                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
                    testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
                    //检查
                    jcsqdService.saveLtkjExamJcsqd(order.getCardId());
                    return AjaxResult.success("同步成功");
@@ -1752,7 +1754,7 @@
        return AjaxResult.success();
    }

    private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
    /*private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
//        asyncService.updateCheckType(tjNumber);

        List<TjOrderRemark> remarkList = orderRemarkService.getzongjianyishengchakanyichangxiangmu(tjNumber);
@@ -1780,6 +1782,68 @@
                                    List<Map<String,Object>> mapList=new ArrayList<>();
                                    for (String s : split) {
                                                s = s.replaceAll("\n", "");
//                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                                        Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
                                        if(null !=maps && !maps.isEmpty()){
                                            Object bt = maps.get("bt");
                                            Object nr = maps.get("nr");
                                            if(null !=bt || null !=nr) mapList.add(maps);
                                        }
                                    }
                                    tjOrderDetail.setAdvices(mapList);
                                }

                            }

                            dels.add(tjOrderDetail);
                        }
                    }
                    if(!dels.isEmpty()){
                        parent.put("proName",remark.getProName());
                        parent.put("jyjc",remark.getJyjc());
                        parent.put("sone",dels);
                        list.add(parent);
                    }
                }
            }

        }
        return list;
    }*/

    private List<Map<String, Object>> zongjianyishengchakanyichangxiangmu(String tjNumber) {
//        asyncService.updateCheckType(tjNumber);

        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())) {
                            if(null !=tjOrderDetail.getProId()&& null !=tjOrderDetail.getYcbz()){
                                if(!tjOrderDetail.getDeptId().equals("2")){
                                    List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                            ,tjOrderDetail.getProName().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<>();
                                    for (String s : split) {
                                        s = s.replaceAll("\n", "");
//                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                                        Map<String,Object> maps= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(),s,"0");
                                        if(null !=maps && !maps.isEmpty()){
@@ -1845,4 +1909,35 @@




    /**
     * 同步sql server数据到本地数据库数据接口
     */
    @GetMapping ("/newdataSynchronization")
    @ApiOperation (value = "最新公共同步sql server数据到本地数据库数据接口")
    @RepeatSubmit
    public AjaxResult newdataSynchronization(@RequestParam String tjNumber) {
        try {
            //根据配置调取存储过程 将临时表数据存入预约表2023.12.12
            final String sfkqdyhis = configService.selectConfigByKey("sfkqdyhis");
            TjOrder order = orderService.getOrderByTjNum(tjNumber);
            if (null != order) {
                if (null != sfkqdyhis && sfkqdyhis.equals("Y")) {
                    dataSynchronizationApi(tjNumber);
                }else {
                    configController.shoudongtbjyjcwsxmjg("jyjc",tjNumber);
                }
                return AjaxResult.success("同步成功");
            }
            return AjaxResult.error("未查到该人员体检记录");
        } catch (Exception e) {
//            throw new RuntimeException(ex);
            log.error(String.valueOf(e),e.getMessage());
            return AjaxResult.error("该人员数据正在同步中，请稍等");
        }
    }




}