1

lige

2023-12-04 77b51f625a13a8254eb2e8a9aa53bacf575f7274

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

@@ -25,6 +25,7 @@
import com.ltkj.common.core.redis.RedisCache;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.config.UserHoder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.vodomain.BingZhongVO;
@@ -93,8 +94,6 @@
    @Resource
    private ITjOrderRemarkService remarkService;
    @Resource
    private ITjTeamSelectRecordService selectRecordService;
    @Resource
    private TjAsyncService asyncService;
    @Resource
    private ISysUserService userService;
@@ -131,6 +130,9 @@

    @Autowired
    private ITjAskMedicalHistoryService tjAskMedicalHistoryService;

    @Autowired
    private ITjReportGetAddressService tjReportGetAddressService;


    /**
@@ -432,6 +434,7 @@
                    LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
                    wq.isNotNull(TjOrder::getReportTime);
                    wq.eq(TjOrder::getUserId, customer.getCusId());
                    wq.eq(TjOrder::getHeshouStatus, 1); //核收状态为1才能打印
                    list.addAll(tjOrderService.list(wq));
                }
                List<TjOrder> collect = null;
@@ -483,6 +486,7 @@
        Page<TjOrder> page1 = new Page<>(pageNum, pageSize);
        LambdaQueryWrapper<TjOrder> wq = new LambdaQueryWrapper<>();
        wq.isNotNull(TjOrder::getReportTime);
        wq.eq(TjOrder::getHeshouStatus, 1);  //核收状态为1才能打印
        if (null != bgbeginTime && null != bgendTime) {
            wq.between(TjOrder::getCreateTime, DateUtil.beginOfDay(bgbeginTime), DateUtil.endOfDay(bgendTime));
        }
@@ -500,7 +504,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()))) {
@@ -562,8 +568,10 @@
                            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()));
                            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()))) {
@@ -613,8 +621,10 @@
                        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()));
                        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()))) {
@@ -657,16 +667,16 @@
        List<TjOrder> list = Optional.ofNullable(tjOrderService.list(wq)).get();
        if (list.size() > 0) {
            asyncService.getPrintOrderList(list);
            if(redisCache.hasKey("getPrintOrderList")){
                if(null !=type && type==0){
            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());
                }
                if(null !=type && type==1){
                    List<TjOrder> list1 = redisCache.getCacheMapValue("getPrintOrderList","1");
                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());
                }
            }else {
            } else {
                List<TjOrder> list1 = new ArrayList<>();
                extracted(type, list, list1);
                collect = list1.stream().skip((long) (pageNum - 1) * pageSize).limit(pageSize).collect(Collectors.toList());
@@ -689,8 +699,10 @@
                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()));
                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()))) {
@@ -744,6 +756,20 @@
        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);
    }


    /**
     * 体检签到登记接口
     */
@@ -785,8 +811,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()) {
@@ -816,11 +845,18 @@
        if (null == tjOrder.getPacId() && null != transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId()))) {
            tjOrder.setPacId(transitionService.getTbTransitionPacIdByCusIdAndPac(String.valueOf(tjOrder.getUserId())));
        }

        //判断小程序上预约是否付钱
        if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
        tjOrder.setStatus(TjConstants.TJ_BEGIN);
        if (tjOrderService.save(tjOrder)) {
            //保存收货地址
            if ("2".equals(tjOrder.getGetType())){
                final TjReportGetAddress address = tjOrder.getAddAddress();
                if (address!=null){
                    address.setTjNumber(tjNumber);
                    tjReportGetAddressService.save(address);
                }
            }
            Long cusNumber = tjCustomer.getCusNumber();
            cusNumber += 1;
            tjCustomer.setCusNumber(cusNumber);
@@ -835,7 +871,7 @@
            tjFlowingWater.setOrderId(tjOrder.getOrderId());
            Date date1 = new Date(System.currentTimeMillis());
            String s1 = SecurityUtils.getUsername() + new SimpleDateFormat("yyMMddHHmmssSSS").format(date1);
            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(),"")+s1);
            tjFlowingWater.setWaterId(PinyinUtil.getFirstLetter(tjCustomer.getCusName(), "") + s1);
            if (null != mallOrder) {
                if (mallOrder.getOrderStatus().equals(201L)) {
                    tjFlowingWater.setCopeWith(mallOrder.getActualPrice());
@@ -869,7 +905,6 @@

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

@@ -969,7 +1004,7 @@
                if (null != ppList && ppList.size() > 0) {
                    //异步保存数据库
//                    asyncService.addRedisTransitionPac(cusId, pacId, ppList);
                    asyncService.saveRedisTransitionByPacId(cusId, pacId,proIds);
                    asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
                    for (TjPackageProject tjPackageProject : ppList) {
                        TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
                        if (null != project) {
@@ -1008,42 +1043,47 @@
        //单项
        if (null != proIds && proIds.size() > 0) {
            //异步保存数据库表
//            asyncService.addRedisTransitionPro(cusId, proIds);
            asyncService.saveRedisTransitionByPacId(cusId,null,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);
//                        }
//                    }
                }
            }
        }
@@ -1409,19 +1449,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) {
@@ -1430,17 +1470,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);
        }
@@ -1457,24 +1497,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);
                //放进集合
@@ -1487,21 +1527,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);
@@ -1518,33 +1558,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);
@@ -1558,32 +1598,49 @@
    @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()));
        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);
        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount);
        //添加remark表数据
        remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(),sysUser.getNickName(),String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
        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()));
                        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()));
                    sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
        }
        System.out.println("这段代码时间"+(System.currentTimeMillis()-l));
        System.out.println("这段代码时间" + (System.currentTimeMillis() - l));
    }


    @PostMapping("/heXiaoByIds/{orderIds}")
    @ApiOperation(value = "核收报告——————总检审核通过后可以核销，核收后才能打印")
    @Transactional
    public AjaxResult heXiaoByIds(@PathVariable String[] orderIds) {
        for (String orderId : orderIds) {
            final TjOrder byId = tjOrderService.getById(orderId);
            byId.setHeshouStatus(1);
            byId.setHeshouDoctor(UserHoder.getLoginUser().getUserId());
            byId.setHeshouTime(new DateTime());
            final boolean b = tjOrderService.updateById(byId);
            if (!b){
                return AjaxResult.error("核收失败");
            }
        }
        return AjaxResult.success("核收成功");
    }
}