备忘录1

lige

2023-11-22 6ed1b7488cf62d9c35f5fd5fa09cacc896eb520f

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

@@ -15,6 +15,7 @@
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -128,11 +129,14 @@
    @Resource
    private ITjRulesService rulesService;

    @Autowired
    private ITjAskMedicalHistoryService tjAskMedicalHistoryService;


    /**
     * 查询体检记录列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:list')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:list')")
    @GetMapping("/list")
    @ApiOperation(value = "查询体检记录列表(默认)")
    public TableDataInfo list(TjOrder tjOrder) {
@@ -496,7 +500,9 @@
                    order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                    order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                    order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                    if (tjCustomer.getCusIdcard() != null) {
                        order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                    }
                }
                String firmId = order.getFirmId();
                if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
@@ -558,8 +564,10 @@
                            order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                            order.setGrMoBanId(reportService.getGrMoBanIds());
                            order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                            order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                            order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                            if (null != tjCustomer.getCusPhone())
                                order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                            if (null != tjCustomer.getCusIdcard())
                                order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                        }
                        String firmId = order.getFirmId();
                        if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
@@ -609,8 +617,10 @@
                        order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                        order.setGrMoBanId(reportService.getGrMoBanIds());
                        order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                        order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                        order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                        if (null != tjCustomer.getCusPhone())
                            order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                        if (null != tjCustomer.getCusIdcard())
                            order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                    }
                    String firmId = order.getFirmId();
                    if (firmId != null && null != iDictCompService.getById(String.valueOf(order.getFirmId()))) {
@@ -652,43 +662,21 @@

        List<TjOrder> list = Optional.ofNullable(tjOrderService.list(wq)).get();
        if (list.size() > 0) {
            List<TjOrder> list1 = new ArrayList<>();
            for (TjOrder order : list) {
                TjCustomer tjCustomer = tjCustomerService.selectTjCustomerByCusId(order.getUserId());
                if (null != tjCustomer) {
                    order.setTjCustomerSex(tjCustomer.getCusSex());
                    order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                    order.setGrMoBanId(reportService.getGrMoBanIds());
                    order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                    order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
            asyncService.getPrintOrderList(list);
            if (redisCache.hasKey("getPrintOrderList")) {
                if (null != type && type == 0) {
                    List<TjOrder> list1 = redisCache.getCacheMapValue("getPrintOrderList", "0");
                    collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
                }
                String firmId = order.getFirmId();
                if (firmId != null && null != iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId()))) {
                    order.setDictCompName(iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId())).getCnName());
                if (null != type && type == 1) {
                    List<TjOrder> list1 = redisCache.getCacheMapValue("getPrintOrderList", "1");
                    collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
                }
                if (null != order.getPacId()) {
                    if (null != tjPackageService.getById(order.getPacId())) {
                        order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
                    }
                    if (null != dwDeptService.getById(order.getPacId())) {
                        order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
                    }
                }
                //从打印记录查出最新打印时间
                TjPrintOrder one = printOrderService.getTjPrintOrderByTjNum(order.getTjNumber());
                if (null != type && type == 1 && one != null) {
                    order.setPrintTime(one.getCreateTime());
                    order.setPrintName(one.getCreateBy());
                    order.setType(1);
                    list1.add(order);
                }
                if (null != type && type == 0 && one == null) {
                    order.setType(0);
                    list1.add(order);
                }
            } else {
                List<TjOrder> list1 = new ArrayList<>();
                extracted(type, list, list1);
                collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
            }
            collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
        }
        if (null != collect) {
            map.put("total", collect.size());
@@ -699,11 +687,51 @@
        return AjaxResult.success(map);
    }

    private void extracted(Integer type, List<TjOrder> list, List<TjOrder> list1) {
        for (TjOrder order : list) {
            TjCustomer tjCustomer = tjCustomerService.selectTjCustomerByCusId(order.getUserId());
            if (null != tjCustomer) {
                order.setTjCustomerSex(tjCustomer.getCusSex());
                order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                order.setGrMoBanId(reportService.getGrMoBanIds());
                order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                if (null != tjCustomer.getCusPhone())
                    order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                if (null != tjCustomer.getCusIdcard())
                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
            }
            String firmId = order.getFirmId();
            if (firmId != null && null != iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId()))) {
                order.setDictCompName(iDictCompService.selectDictCompByDrugManufacturerId(String.valueOf(order.getFirmId())).getCnName());
            }
            if (null != order.getPacId()) {
                if (null != tjPackageService.getById(order.getPacId())) {
                    order.setPacName(tjPackageService.getById(order.getPacId()).getPacName());
                }
                if (null != dwDeptService.getById(order.getPacId())) {
                    order.setPacName(dwDeptService.getById(order.getPacId()).getDwDeptName());
                }
            }
            //从打印记录查出最新打印时间
            TjPrintOrder one = printOrderService.getTjPrintOrderByTjNum(order.getTjNumber());
            if (null != type && type == 1 && one != null) {
                order.setPrintTime(one.getCreateTime());
                order.setPrintName(one.getCreateBy());
                order.setType(1);
                list1.add(order);
            }
            if (null != type && type == 0 && one == null) {
                order.setType(0);
                list1.add(order);
            }
        }
    }


    /**
     * 导出体检记录列表
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:export')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:export')")
    @Log(title = "体检记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    @ApiOperation(value = "导出体检记录列表")
@@ -717,12 +745,26 @@
    /**
     * 获取体检记录详细信息
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:query')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:query')")
    @GetMapping(value = "/{orderId}")
    @ApiOperation(value = "获取体检记录详细信息")
    public AjaxResult getInfo(@PathVariable("orderId") Long orderId) {
        return success(tjOrderService.selectTjOrderByOrderId(orderId));
    }


    @GetMapping("/getIsRequired")
    @ApiOperation(value = "根据参数配置获取是否必填项（身份证、性别、电话、照片、是否直接下单）")
    public AjaxResult getIsRequired() {
        Map<String, String> res = new HashMap<>();
        res.put("has_idcard", configService.selectConfigByKey("has_idcard"));
        res.put("has_sex", configService.selectConfigByKey("has_sex"));
        res.put("is_phone", configService.selectConfigByKey("is_phone"));
        res.put("mall_hasPhoto", configService.selectConfigByKey("mall_hasPhoto"));
        res.put("has_charge", configService.selectConfigByKey("has_charge"));
        return AjaxResult.success(res);
    }


    /**
     * 体检签到登记接口
@@ -765,8 +807,11 @@
            if (null != tjReservation.getDepartment()) tjOrder.setFirmDeptName(tjReservation.getDepartment());
            if (null != tjReservation.getJobNo()) tjOrder.setFirmWorkId(tjReservation.getJobNo());
            if (null != tjReservation.getPacId()) tjOrder.setPacId(tjReservation.getPacId());
            if (null != tjReservation.getGroupingId()) tjOrder.setGroupId(tjReservation.getGroupingId());
            if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
            if (null != tjReservation.getGroupingId()){
                tjOrder.setGroupId(tjReservation.getGroupingId());
                tjOrder.setFirmDeptId(tjReservation.getPacId());
            }
//            if (null != tjReservation.getDepartmentId()) tjOrder.setFirmDeptId(tjReservation.getDepartmentId());
            tjReservation.setIsExpire(1);
            tjReservationService.updateById(tjReservation);
            if (null != tjReservation.getTeamNo()) {
@@ -814,10 +859,8 @@
            }
            tjFlowingWater.setOrderId(tjOrder.getOrderId());
            Date date1 = new Date(System.currentTimeMillis());
            SimpleDateFormat sdf = new SimpleDateFormat("yyMMddHHmmssSSS");
            String userId1 = SecurityUtils.getUsername();
            String s1 = userId1 + sdf.format(date1);
            tjFlowingWater.setWaterId(s1);
            String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "") + s1);
            if (null != mallOrder) {
                if (mallOrder.getOrderStatus().equals(201L)) {
                    tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
@@ -851,14 +894,15 @@

            //团体
            if ("1".equals(tjOrder.getTjType())) {
                tjOrder.setFirmDeptId(tjOrder.getPacId());
                asyncService.ttextracted(tjOrder, tjCustomer, sysUser, tjReservation, tjFlowingWater);
            }


            //个人
            if ("2".equals(tjOrder.getTjType())) {
                asyncService.extracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);

//                asyncService.newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
            }
            return AjaxResult.success(tjNumber);
        }
@@ -869,7 +913,7 @@
    /**
     * 修改体检记录
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:edit')")
    @Log(title = "体检记录", businessType = BusinessType.UPDATE)
    @PutMapping
    @ApiOperation(value = "修改体检记录")
@@ -880,7 +924,7 @@
    /**
     * 删除体检记录
     */
    @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
//    @PreAuthorize("@ss.hasPermi('hosp:order:remove')")
    @Log(title = "体检记录", businessType = BusinessType.DELETE)
    @DeleteMapping("/{orderIds}")
    @ApiOperation(value = "删除体检记录")
@@ -934,6 +978,7 @@
        } else {
            tbTransitionList = redisCache.getCacheList(cusId);
        }
        //套餐
        if (null != packId && !packId.equals("")) {
            Long pacId = Long.valueOf(packId.toString());
            List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
@@ -947,11 +992,12 @@
                List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
                if (null != ppList && ppList.size() > 0) {
                    //异步保存数据库
                    asyncService.addRedisTransitionPac(cusId, pacId, ppList);
//                    asyncService.addRedisTransitionPac(cusId, pacId, ppList);
                    asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
                    for (TjPackageProject tjPackageProject : ppList) {
                        TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
                        if (null != project) {
                            BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.DOWN);
                            BigDecimal divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
                            List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
                            if (null != tjProSonList && tjProSonList.size() > 0) {
                                //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
@@ -959,11 +1005,6 @@
                                    TbTransition tbTransition = new TbTransition();
                                    tbTransition.setCusId(cusId);
                                    tbTransition.setPacId(pacId);
//                                    if (null != tjProject.getProPrice()) {
//                                        tbTransition.setOrdPrice(tjProject.getProPrice());
//                                    } else {
//                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
//                                    }
                                    if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
                                        tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
                                        tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
@@ -987,42 +1028,51 @@
                }
            }
        }

        //单项
        if (null != proIds && proIds.size() > 0) {
            asyncService.addRedisTransitionPro(cusId, proIds);
            //异步保存数据库表
            asyncService.saveRedisTransitionByPacId(cusId, null, proIds);
            for (Long proId : proIds) {
                List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
                if (null != transitions && transitions.size() > 0) {
                    continue;
                }
                TjProject project = projectService.getTjProjectById(String.valueOf(proId));
                if (null != project) {
                    List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
                    if (null != tjProSonList && tjProSonList.size() > 0) {
                        //异步保存数据库表
                        for (TjProject tjProject : tjProSonList) {
                            List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId()));
                            if (null != transitionss && transitionss.size() > 0) {
                                continue;
                            }
                            TbTransition tbTransition = new TbTransition();
                            tbTransition.setCusId(cusId);
                            tbTransition.setPacId(null);
                            if (null != tjProject.getProPrice()) {
                                tbTransition.setOrdPrice(tjProject.getProPrice());
                                tbTransition.setNowPrice(tjProject.getProPrice());
                            } else {
                                tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                                tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
                            }
                            tbTransition.setParentProId(proId);
                            tbTransition.setParentProName(project.getProName());
                            tbTransition.setProId(tjProject.getProId());
                            tbTransition.setProName(tjProject.getProName());
                            tbTransition.setProType(tjProject.getProType());
                            tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
                            tbTransitionList.add(tbTransition);
                TjProject tjProject = projectService.getTjProjectById(String.valueOf(proId));
                if (null != tjProject) {
//                    List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
//                    if (null != tjProSonList && tjProSonList.size() > 0) {
//                        for (TjProject tjProject : tjProSonList) {
//                    List<TbTransition> transitionss = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(tjProject.getProId()));
//                    if (null != transitionss && transitionss.size() > 0) {
//                        continue;
//                    }
                    TbTransition tbTransition = new TbTransition();
                    tbTransition.setCusId(cusId);
                    tbTransition.setPacId(null);
                    if (null != tjProject.getProPrice()) {
                        tbTransition.setOrdPrice(tjProject.getProPrice());
                        tbTransition.setNowPrice(tjProject.getProPrice());
                    } else {
                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                        tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
                    }
                    tbTransition.setParentProId(tjProject.getProParentId());
                    if (tjProject.getProParentId() != null) {
                        TjProject byId = projectService.getById(tjProject.getProParentId());
                        if(null !=byId){
                            tbTransition.setParentProName(byId.getProName());
                        }
                    }
                    tbTransition.setParentProName("");

                    tbTransition.setProId(tjProject.getProId());
                    tbTransition.setProName(tjProject.getProName());
                    tbTransition.setProType(tjProject.getProType());
                    tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
                    tbTransitionList.add(tbTransition);
//                        }
//                    }
                }
            }
        }
@@ -1294,9 +1344,6 @@
        List<Map<String, Object>> list = new ArrayList<>();
        for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
            Map<String, Object> map = new HashMap<>();
            LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
            wq.eq(TbTransition::getCusId, cusId);
            wq.eq(TbTransition::getParentProId, entry.getKey());
            Long pacId = entry.getValue().get(0).getPacId();
            if (null != pacId) {
                TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
@@ -1313,20 +1360,22 @@
                for (TbTransition tbTransition : tbTransitionList) {
                    money1 = money1.add(tbTransition.getOrdPrice());
                    money2 = money2.add(tbTransition.getNowPrice());
                    if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
                        tbTransition.setDiscount("0");
                    } else {
                        tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
                    }
                    if (null != tbTransition.getPacId()) {
                        tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
                    }
                    if (null != tbTransition.getParentProId()) {
                        tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
                    }
//                    if (tbTransition.getOrdPrice().compareTo(BigDecimal.valueOf(0)) == 0 || tbTransition.getNowPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
//                        tbTransition.setDiscount("0");
//                    } else {
//                        tbTransition.setDiscount((tbTransition.getNowPrice()).divide(tbTransition.getOrdPrice(), BigDecimal.ROUND_CEILING).toString());
//                    }
//                    if (null != tbTransition.getPacId()) {
//                        tbTransition.setPacPrice(tjPackageService.getById(tbTransition.getPacId()).getPrice());
//                    }
//                    if (null != tbTransition.getParentProId()) {
//                        tbTransition.setPacPrice(projectService.getTjProjectById(String.valueOf(tbTransition.getParentProId())).getProPrice());
//                    }
                }
                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                map.put("ordPrice", money1.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
//                map.put("nowPrice", money2.setScale(Integer.parseInt(configService.selectConfigByKey("sys.price.save")), Integer.parseInt(configService.selectConfigByKey("sys.price"))));
                map.put("ordPrice", money1);
                map.put("nowPrice", money2);
            }
            list.add(map);
        }
@@ -1389,19 +1438,19 @@
            for (TjReservation tjReservation : list) {

                final TjDwGrouping byId = dwGroupingService.getById(tjReservation.getGroupingId());
                if (byId!=null){
                if (byId != null) {
                    tjReservation.setGroupingName(byId.getGroupingName());
                }
                if (tjReservation.getIsExpire()==1){
                    LambdaQueryWrapper<TjCustomer> wq1=new LambdaQueryWrapper<>();
                    wq1.eq(TjCustomer::getCusIdcard,tjReservation.getIdCard());
                if (tjReservation.getIsExpire() == 1) {
                    LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
                    wq1.eq(TjCustomer::getCusIdcard, tjReservation.getIdCard());
                    final TjCustomer one1 = tjCustomerService.getOne(wq1);

                    LambdaQueryWrapper<TjOrder> wq2=new LambdaQueryWrapper<>();
                    wq2.eq(TjOrder::getUserId,one1.getCusId());
                    wq2.eq(TjOrder::getTeamNo,tjReservation.getTeamNo());
                    LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
                    wq2.eq(TjOrder::getUserId, one1.getCusId());
                    wq2.eq(TjOrder::getTeamNo, tjReservation.getTeamNo());
                    final TjOrder one = tjOrderService.getOne(wq2);
                    if (one!=null){
                    if (one != null) {
                        tjReservation.setTjNumber(one.getTjNumber());
                        tjReservation.setTjStatus(one.getStatus());
                        if (one.getStatus() == 201) {
@@ -1410,17 +1459,17 @@
                            c += 1;
                        }
                    }
                }else if (tjReservation.getIsExpire()==2){
                } else if (tjReservation.getIsExpire() == 2) {
                    tjReservation.setTjStatus(0);
                    tjReservation.setTjNumber("无");
                    a+=1;
                    a += 1;
                }
            }
            map.put("list",list);
            map.put("all",list.size());
            map.put("weijian",a);
            map.put("jianzhong",b);
            map.put("yijian",c);
            map.put("list", list);
            map.put("all", list.size());
            map.put("weijian", a);
            map.put("jianzhong", b);
            map.put("yijian", c);

            return AjaxResult.success(map);
        }
@@ -1437,24 +1486,24 @@
    public AjaxResult tuanTiBingById(@ApiParam(value = "单位") @RequestParam String firmId,
                                     @ApiParam(value = "部门") @RequestParam String firmDeptId,
                                     @ApiParam(value = "病种") @RequestParam(required = false) String bingZhong) {
        List<TjOrderDetailRules> res1=new ArrayList<>();
        List<BingZhongVO> res=new ArrayList<>();
        List<TjOrderDetailRules> res1 = new ArrayList<>();
        List<BingZhongVO> res = new ArrayList<>();

        LambdaQueryWrapper<TjDwGrouping> wqqq=new LambdaQueryWrapper<>();
        wqqq.eq(TjDwGrouping::getDwDeptId,firmDeptId);
        LambdaQueryWrapper<TjDwGrouping> wqqq = new LambdaQueryWrapper<>();
        wqqq.eq(TjDwGrouping::getDwDeptId, firmDeptId);
        final List<TjDwGrouping> list2 = dwGroupingService.list(wqqq);


        for (TjDwGrouping tjDwGrouping : list2) {
            LambdaQueryWrapper<TjOrder> wq2=new LambdaQueryWrapper<>();
            wq2.eq(TjOrder::getFirmId,firmId);
            wq2.eq(TjOrder::getGroupId,tjDwGrouping.getId());
            LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
            wq2.eq(TjOrder::getFirmId, firmId);
            wq2.eq(TjOrder::getGroupId, tjDwGrouping.getId());
            final List<TjOrder> list = tjOrderService.list(wq2);
            for (TjOrder tjOrder : list) {
                LambdaQueryWrapper<TjOrderDetailRules> wq1=new LambdaQueryWrapper<>();
                wq1.eq(TjOrderDetailRules::getTjNumber,tjOrder.getTjNumber());
                if (bingZhong!=null){
                    wq1.like(TjOrderDetailRules::getBingzhong,bingZhong);
                LambdaQueryWrapper<TjOrderDetailRules> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjOrderDetailRules::getTjNumber, tjOrder.getTjNumber());
                if (bingZhong != null) {
                    wq1.like(TjOrderDetailRules::getBingzhong, bingZhong);
                }
                final List<TjOrderDetailRules> list1 = orderDetailRulesService.list(wq1);
                //放进集合
@@ -1467,21 +1516,21 @@
//        List<String> distinctIds = idStream.collect(Collectors.toList());

        Map<String, Long> columnCountMap = res1.stream().collect(Collectors.groupingBy(TjOrderDetailRules::getAid, Collectors.counting()));
        for(Map.Entry<String, Long> entry:columnCountMap.entrySet()){
        for (Map.Entry<String, Long> entry : columnCountMap.entrySet()) {

            BingZhongVO bingZhongVO=new BingZhongVO();
            BingZhongVO bingZhongVO = new BingZhongVO();
            bingZhongVO.setRules(rulesService.getById(entry.getKey()));
            bingZhongVO.setNum(entry.getValue());

            List<TjOrderDetailRules> aa=new ArrayList<>();
            List<TjOrderDetailRules> aa = new ArrayList<>();
            for (TjOrderDetailRules orderDetailRules : res1) {
                if (orderDetailRules.getAid().equals(entry.getKey())){
                if (orderDetailRules.getAid().equals(entry.getKey())) {
                    orderDetailRules.setDwName(dwDeptService.getById(firmDeptId).getDwName());
                    orderDetailRules.setDwDeptName(dwDeptService.getById(firmDeptId).getDwDeptName());

                    LambdaQueryWrapper<TjOrder> wq22=new LambdaQueryWrapper<>();
                    wq22.eq(TjOrder::getFirmId,firmId);
                    wq22.eq(TjOrder::getTjNumber,orderDetailRules.getTjNumber());
                    LambdaQueryWrapper<TjOrder> wq22 = new LambdaQueryWrapper<>();
                    wq22.eq(TjOrder::getFirmId, firmId);
                    wq22.eq(TjOrder::getTjNumber, orderDetailRules.getTjNumber());
                    final TjOrder one = tjOrderService.getOne(wq22);
                    orderDetailRules.setGroupName(dwGroupingService.getById(one.getGroupId()).getGroupingName());
                    aa.add(orderDetailRules);
@@ -1498,33 +1547,33 @@
    @PostMapping("/tuanTiBingChart")
    @ApiOperation(value = "查询团体体检病种统计图")
    public AjaxResult tuanTiBingChart(@RequestBody BingZhongVO bingZhongVO) {
        List<TjOrderDetailRules> res1=new ArrayList<>();
        List<TjOrderDetailRules> res1 = new ArrayList<>();

        LambdaQueryWrapper<TjDwGrouping> wqqq=new LambdaQueryWrapper<>();
        wqqq.eq(TjDwGrouping::getDwDeptId,bingZhongVO.getFirmDeptId());
        LambdaQueryWrapper<TjDwGrouping> wqqq = new LambdaQueryWrapper<>();
        wqqq.eq(TjDwGrouping::getDwDeptId, bingZhongVO.getFirmDeptId());
        final List<TjDwGrouping> list2 = dwGroupingService.list(wqqq);

        for (TjDwGrouping tjDwGrouping : list2) {
            LambdaQueryWrapper<TjOrder> wq2=new LambdaQueryWrapper<>();
            wq2.eq(TjOrder::getFirmId,bingZhongVO.getFirmId());
            wq2.eq(TjOrder::getGroupId,tjDwGrouping.getId());
            LambdaQueryWrapper<TjOrder> wq2 = new LambdaQueryWrapper<>();
            wq2.eq(TjOrder::getFirmId, bingZhongVO.getFirmId());
            wq2.eq(TjOrder::getGroupId, tjDwGrouping.getId());
            final List<TjOrder> list = tjOrderService.list(wq2);
            for (TjOrder tjOrder : list) {
                LambdaQueryWrapper<TjOrderDetailRules> wq1=new LambdaQueryWrapper<>();
                wq1.eq(TjOrderDetailRules::getTjNumber,tjOrder.getTjNumber());
                wq1.in(TjOrderDetailRules::getAid,bingZhongVO.getAidList());
                LambdaQueryWrapper<TjOrderDetailRules> wq1 = new LambdaQueryWrapper<>();
                wq1.eq(TjOrderDetailRules::getTjNumber, tjOrder.getTjNumber());
                wq1.in(TjOrderDetailRules::getAid, bingZhongVO.getAidList());
                final List<TjOrderDetailRules> list1 = orderDetailRulesService.list(wq1);
                //放进集合
                res1.addAll(list1);
            }
        }
        Map<String, Long> columnCountMap = res1.stream().collect(Collectors.groupingBy(TjOrderDetailRules::getAid, Collectors.counting()));
        List<Map<String, String>> aaa=new ArrayList<>();
        if (columnCountMap!=null){
            for(Map.Entry<String, Long> entry:columnCountMap.entrySet()){
                Map<String, String> resMap=new HashMap<>();
        List<Map<String, String>> aaa = new ArrayList<>();
        if (columnCountMap != null) {
            for (Map.Entry<String, Long> entry : columnCountMap.entrySet()) {
                Map<String, String> resMap = new HashMap<>();
                final TjRules byId = rulesService.getById(entry.getKey());
                if (byId!=null){
                if (byId != null) {
                    resMap.put("name", byId.getBingzhong());
                    resMap.put("value", String.valueOf(entry.getValue()));
                    aaa.add(resMap);
@@ -1538,9 +1587,32 @@
    @PostMapping("/deletedTbTransitionByCusId")
    @ApiOperation(value = "根据身份证号删除临时表数据")
    public AjaxResult deletedTbTransitionByCusId(@RequestParam @ApiParam(value = "身份证号") String cusId) {
        LambdaQueryWrapper<TbTransition> wq=new LambdaQueryWrapper<>();
        wq.between(TbTransition::getCreateTime,transitionService.getTbTransitionCreateTimeByCusId(cusId),new Date());
        wq.eq(TbTransition::getCusId,cusId);
        LambdaQueryWrapper<TbTransition> wq = new LambdaQueryWrapper<>();
        wq.between(TbTransition::getCreateTime, transitionService.getTbTransitionCreateTimeByCusId(cusId), new Date());
        wq.eq(TbTransition::getCusId, cusId);
        return AjaxResult.success(transitionService.remove(wq));
    }

    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        long l = System.currentTimeMillis();
        tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
        tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
        //修改每项的原价现价
        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount);
        //添加remark表数据
        remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
        //判断是否交钱
        if ("1".equals(tjOrder.getTjType())) {
            if (null != tjReservation && tjReservation.getPayType() == 1) {
                tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                        sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
            }
        }
        if (tjFlowingWater.getPayStasus() == 1) {
            tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                    sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
        }
        System.out.println("这段代码时间" + (System.currentTimeMillis() - l));
    }

}