总检看职业病

lige

2023-12-07 eabf890be5718f5e22d03e3ce2b530da0568a8d0

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

@@ -320,6 +320,7 @@
                            customer.setCusPhone(MatchUtils.hidePhoneNum(customer.getCusPhone()));
                            customer.setCusIdcard(MatchUtils.hideIdCardNum(customer.getCusIdcard()));
                            customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
                            customer.setTjCategory(tjOrder.getTjCategory());
                            if (tjOrder.getFirmId().equals("0")) {
                                customer.setTjCompName(null);
                            } else {
@@ -359,7 +360,7 @@
            customers = redisCache.getCacheMapValue("check", "ys");
        }
        if (customers != null && customers.size() > 0) {
            asyncService.addRedis(customers);
//            asyncService.addRedis(customers);
            List<TjCustomer> customerLists = customers.stream().skip((long) (page - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
            map.put("customers", customerLists);
            map.put("total", customers.size());
@@ -413,6 +414,7 @@
                            LambdaQueryWrapper<TbTransition> wqq = new LambdaQueryWrapper<>();
                            wqq.eq(TbTransition::getCusId, customer.getCusIdcard());
                            transitionService.remove(wqq);
                            asyncService.updateCheckType(tjNumber);
                            return AjaxResult.success("操作成功");
                        }
                        return AjaxResult.error("操作失败");
@@ -434,16 +436,17 @@
     */
    @GetMapping("/updateCheckType")
    @ApiOperation(value = "总检点击体检信息详情")
//    @PreAuthorize("@ss.hasPermi('check:check:updateCheckType')")
    public AjaxResult updateCheckType(@ApiParam(value = "客户体检号") @RequestParam String tjNumber) {
        if(redisCache.hasKey("updateCheckType"+tjNumber)) {
            return redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
            List<Map<String, Object>> cacheMapValue = redisCache.getCacheMapValue("updateCheckType" + tjNumber, tjNumber);
            return AjaxResult.success(cacheMapValue);
        }
        return getAjaxResult(tjNumber);
    }

    private AjaxResult getAjaxResult(String tjNumber) {
        final long l = System.currentTimeMillis();

        asyncService.updateCheckType(tjNumber);
        List<Map<String, Object>> list = new ArrayList<>();
        TjOrder one = orderService.getOrderByTjNum(tjNumber);

@@ -467,7 +470,11 @@
                if (null != tjOrderDetails && tjOrderDetails.size() > 0) {
                    for (TjOrderDetail tjOrderDetail : tjOrderDetails) {
                        final TjProject byId = projectService.selectTjProjectByProId(tjOrderDetail.getProId());
                        tjOrderDetail.setProject(byId);
                        if(null==byId){
                            detailService.removeById(tjOrderDetail.getOrderDetailId());
                        }else {
                            tjOrderDetail.setProject(byId);
                        }
                        List<TjStandard> list2 = tjStandardService.getTjStandardListByProId(String.valueOf(tjOrderDetail.getProId()));
                        if (list2.size() == 0) {
                            tjOrderDetail.setStandard(new TjStandard());
@@ -482,7 +489,14 @@
                    String summary = remark.getSummary();
                    if (null != summary) {
                          String[] split = summary.split(";");
                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(Arrays.asList(split)));
                        List<Long> longList = new ArrayList<>();
                        for (String str : split) {
                            if(!"".equals(str)){
                                longList.add(Long.valueOf(str));
                            }
                        }
                        //parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(longList));
                        parent.put("parentAdvice", tjAdviceService.getAdviceStringByIds(split));

                    } else {
                        parent.put("parentAdvice", null);
@@ -498,8 +512,6 @@
                }
//                }
            }
            final long l1 = System.currentTimeMillis();
            System.out.println("++++++++++++++++++++++++++++++++++++++++++==============="+(l1-l));
            return AjaxResult.success(list);
        }
        return AjaxResult.success("该客户没有体检项目数据！");
@@ -553,6 +565,7 @@
                customer.setTjTime(tjOrder.getCreateTime());
                customer.setFinishTime(tjOrder.getFinishTime());
                customer.setConfirmStatus(String.valueOf(tjOrder.getStatus()));
                customer.setTjCategory(tjOrder.getTjCategory());
                if (tjOrder.getFirmId() == null) {
                    customer.setTjCompName("无");
                } else {