zjh20250530

zjh

2025-05-30 b7d7d80a8a9e9ac145a05b5e1d545b6b61fc0cc4

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -180,7 +180,6 @@
    private TjOrderRemarkMapper remarkMapper;



    @Override
    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        long l = System.currentTimeMillis();
@@ -207,7 +206,7 @@
            redisCache.deleteObject(tjCustomer.getCusIdcard() + "cusId");
        if (null != tbTransitionList && tbTransitionList.size() > 0) {

            tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
            tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());

            //修改每项的原价现价
            for (TbTransition transition : tbTransitionList) {
@@ -260,7 +259,7 @@

        tjAskMedicalHistoryService.updateTjAskMedicalHistoryByCusId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjCustomer.getCusId()));
        boolean b = tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(),
                String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
                String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
        if (!b) {
            List<TjGroupingPro> proList = groupingProService.list(new LambdaQueryWrapper<TjGroupingPro>().eq(TjGroupingPro::getGroupingId, tjOrder.getGroupId()));
            if (null != proList && !proList.isEmpty()) {
@@ -316,13 +315,13 @@
            if (null != tjReservation && tjReservation.getPayType() == 1) {
                tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                        sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
                orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
                orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
            }
        }
        if (tjFlowingWater.getPayStasus() == 1) {
            tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                    sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
            orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(),tjFlowingWater.getTjSerialNumber().toString());
            orderRemarkService.updateTjOrderRemarkSfbzByJxbzisnull(tjOrder.getOrderId().toString(), tjFlowingWater.getTjSerialNumber().toString());
        }
        if (tjFlowingWater.getDiscount() == null) {
            transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), new BigDecimal(10), tjOrder.getTjNumber());
@@ -330,7 +329,7 @@
            transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), BigDecimal.valueOf(Long.parseLong(tjFlowingWater.getDiscount())), tjOrder.getTjNumber());
        }

        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()),tjOrder.getCardId());
        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), tjOrder.getCardId());
//        List<TjOrderDetail> list = tjOrderDetailService.getTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()));
//        if (list != null) {
//            for (TjOrderDetail tjOrderDetail : list) {
@@ -445,12 +444,12 @@
        }

        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
        addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser,null);
        addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser, null);
        List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(order.getTjNumber());
        xdPictureService.saveBatch(xdPictureList);
    }

    public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
    public void addCaiYangDengJi(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
        try {
            String lis_tmh_prefix = sysConfigService.selectConfigByKey("make_lis_tmh_prefix");
            String config = configService.selectConfigByKey("sfkqdyhis");
@@ -459,7 +458,7 @@
                String format = DateUtil.format(new Date(), "yyMMddHHmmssSSS");
                for (TjOrderDetail detail : detailList) {
                    int i = samplingService.isExistProId(order.getTjNumber(), String.valueOf(detail.getProId()));
                    if(i>0) continue;
                    if (i > 0) continue;
                    TjSampling sampling = new TjSampling();
                    if (null == projectService.getById(detail.getProId())) continue;
                    TjProject project = projectService.getById(detail.getProId());
@@ -467,19 +466,19 @@
                    String dictLabel = sysDictDataService.selectDictLabel("sys_dict_specimen", project.getSpecimenType());
                    if (null != proParentId && proParentId == 0) {
                        sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
    //                    LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project);
    //                    if (jyxmzd != null) {
                        //                    LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project);
                        //                    if (jyxmzd != null) {
                        if (config.equals("Y") && lisAndPacsRegister)
                            sampling.setJyxmdm(project.getLisXmbm());
                        else sampling.setJyxmdm(String.valueOf(project.getProId()));
                        sampling.setSpecimenTypeCode(project.getSpecimenType());
                        sampling.setSpecimenType(dictLabel);
    //                        LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
    //                        wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
    //                        LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
    //                        sampling.setSpecimenType(jybbzd.getJybbmc());
    //                        sampling.setJyxmdm(jyxmzd.getJyxmdm());
    //                    }
                        //                        LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
                        //                        wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
                        //                        LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
                        //                        sampling.setSpecimenType(jybbzd.getJybbmc());
                        //                        sampling.setJyxmdm(jyxmzd.getJyxmdm());
                        //                    }
                    } else {
                        TjProject project1 = projectService.getById(proParentId);
                        sampling.setJyxh(idUtils.generateLisID(lis_tmh_prefix));
@@ -488,15 +487,15 @@
                        if (config.equals("Y") && lisAndPacsRegister)
                            sampling.setJyxmdm(project1.getLisXmbm());
                        else sampling.setJyxmdm(String.valueOf(project1.getProId()));
    //                    LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project1);
    //                    if (jyxmzd != null) {
    //                        sampling.setSpecimenTypeCode(jyxmzd.getJybbdm());
    //                        LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
    //                        wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
    //                        LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
    //                        sampling.setSpecimenType(jybbzd.getJybbmc());
    //                        sampling.setJyxmdm(jyxmzd.getJyxmdm());
    //                    }
                        //                    LtkjJyxmzd jyxmzd = lisApiMethod.getJyxmzd(project1);
                        //                    if (jyxmzd != null) {
                        //                        sampling.setSpecimenTypeCode(jyxmzd.getJybbdm());
                        //                        LambdaQueryWrapper<LtkjJybbzd> wrapper = new LambdaQueryWrapper<>();
                        //                        wrapper.eq(LtkjJybbzd::getJybbdm,jyxmzd.getJybbdm());
                        //                        LtkjJybbzd jybbzd = jybbzdService.getOne(wrapper);
                        //                        sampling.setSpecimenType(jybbzd.getJybbmc());
                        //                        sampling.setJyxmdm(jyxmzd.getJyxmdm());
                        //                    }
                    }
                    sampling.setSamplingNumber(format);
                    sampling.setTjNum(order.getTjNumber());
@@ -518,9 +517,9 @@
                    samplingService.save(sampling);
                }
            }
            if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
            if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) {
                AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
                if (ajaxResult.get("code").toString().equals("200")){
                if (ajaxResult.get("code").toString().equals("200")) {
                    String str = ajaxResult.get("data").toString();
                    str = str.replace("=", ":");
                    JSONArray array = JSONUtil.parseArray(str);
@@ -532,12 +531,12 @@
                        lisJyflhb.setMc(object.getStr("mc"));
                        lisJyflhb.setFlbm(object.getStr("flbm"));
                        LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
                        wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm());
                        LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
                        if (jyflhb == null) {
                            lisJyflhb.setId(IdUtil.getSnowflake().nextId());
                            lisJyflhbService.save(lisJyflhb);
                        }else {
                        } else {
                            lisJyflhb.setId(jyflhb.getId());
                            lisJyflhbService.updateById(lisJyflhb);
                        }
@@ -545,10 +544,10 @@
                }

            }
            if (StrUtil.isNotBlank(jxbz)){
                tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz);
            }else {
                tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
            if (StrUtil.isNotBlank(jxbz)) {
                tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), jxbz);
            } else {
                tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
            }
        } catch (Exception e) {
            log.error(e.getMessage());
@@ -597,69 +596,157 @@
    }

    @Override
    @Async("async")
    public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order,TjOrderRemark orderRemark) {
        String deptname="";
        TjProject tjProject = projectService.getById(orderRemark.getProId());
        if(null !=tjProject){
            SysDept dept = deptService.getById(tjProject.getDeptId());
            if(dept.getParentId()!=100L){
                deptname= deptService.getprentks(dept.getParentId().toString());
            }else {
                deptname=dept.getDeptName();
            }
            String xb= tjCustomerService.getSexByTjh(order.getTjNumber());
    //@Async("async")
    public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order, TjOrderRemark orderRemark) {

            for (TjOrderDetail detail : tjOrderDetailList) {
                detail.setTjStatus(1L);
                LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
                wq0.eq(TjStandard::getProId, detail.getProId());
                detail.setUpdateBy(sysUser.getNickName());
                detail.setUpdateTime(new Date());
                detail.setCreateId(String.valueOf(sysUser.getUserId()));
                detail.setUpdateId(String.valueOf(sysUser.getUserId()));
                tjOrderDetailService.updateById(detail);
                try {
                    LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
                    wq.eq(TjOrderYcxm::getTjh,order.getTjNumber());
                    wq.eq(TjOrderYcxm::getJcxm,detail.getProName());
                    TjOrderYcxm ycxm = ycxmService.getOne(wq);
                    if(null !=ycxm){
                        ycxm.setJcjg(detail.getProResult());
                        String replacedAll = detail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");
                        List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
                                ,replacedAll,"",order.getTjNumber()
                                ,replacedAll
                                ,detail.getProResult());
        try {
            String deptname = "";
            TjProject tjProject = projectService.getById(orderRemark.getProId());
            if (null != tjProject) {
                SysDept dept = deptService.getById(tjProject.getDeptId());
                if (dept.getParentId() != 100L) {
                    deptname = deptService.getprentks(dept.getParentId().toString());
                } else {
                    deptname = dept.getDeptName();
                }
                String xb = tjCustomerService.getSexByTjh(order.getTjNumber());

                        String[] split = detail.getProResult().split("。|,|，");
                        List<Map<String,Object>> mapList=new ArrayList<>();
                        for (String s : split) {
                            s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");
//                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                            Map<String,Object> mapss= tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname,s,"0",xb);
                            if(null !=mapss && !mapss.isEmpty()){
                                Object bt = mapss.get("bt");
                                Object nr = mapss.get("nr");
                                if(null !=bt || null !=nr){
                StringBuilder ssyszys = new StringBuilder();
                StringBuilder ssyszyjgs = new StringBuilder();
                List<Map<String, Object>> jianyilis = new ArrayList<>();
                for (TjOrderDetail detail : tjOrderDetailList) {
                    detail.setTjStatus(1L);
                    LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
                    wq0.eq(TjStandard::getProId, detail.getProId());
                    detail.setUpdateBy(sysUser.getNickName());
                    detail.setUpdateTime(new Date());
                    detail.setCreateId(String.valueOf(sysUser.getUserId()));
                    detail.setUpdateId(String.valueOf(sysUser.getUserId()));
                    tjOrderDetailService.updateById(detail);

                                } mapList.add(mapss);
                    LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjOrderYcxm::getTjh, order.getTjNumber());
                    wq.eq(TjOrderYcxm::getJcxm, detail.getProName());
                    ycxmService.remove(wq);
                    if (detail.getExceptionDesc() == 1) {
                        if (tjProject.getSfcyyc() == 0) {
                            String replacedAll = detail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");

                            if (!detail.getProName().contains("舒张压") && !detail.getProName().contains("收缩压")) {

                                List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString(), replacedAll, "", order.getTjNumber()
                                        , replacedAll, detail.getProResult());


                                String[] split = detail.getProResult().split("[。,，:：.\\s]+");
                                List<Map<String, Object>> mapList = new ArrayList<>();
                                for (String s : split) {
                                    s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "").replaceAll(" ", "")
                                            .replaceAll("症", "").replaceAll("[0-9]", "");
                                    Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0", xb);
                                    if (null != mapss && !mapss.isEmpty()) {
                                        Object bt = mapss.get("bt");
                                        Object nr = mapss.get("nr");
                                        if (null != bt || null != nr) {

                                        }
                                        mapList.add(mapss);
                                    }
                                }
                                TjOrderYcxm ycxm = ycxmService.getOne(wq);
                                if (null != ycxm) {
                                    ycxm.setJcjg(detail.getProResult());
                                    if (null != maps && !maps.isEmpty()) {
                                        ycxm.setJynr(JSONUtil.toJsonStr(maps));
                                    }
                                    if (!mapList.isEmpty()) {
                                        ycxm.setJynr(JSONUtil.toJsonStr(mapList));
                                    }
                                    ycxmService.updateById(ycxm);
                                } else {
                                    TjOrderYcxm orderYcxm = new TjOrderYcxm();
                                    orderYcxm.setTjh(order.getTjNumber());
                                    orderYcxm.setParentName(tjProject.getProName());
                                    orderYcxm.setJcxm(detail.getProName());
                                    orderYcxm.setJcjg(detail.getProResult());
                                    if (null != maps && !maps.isEmpty()) {
                                        orderYcxm.setJynr(JSONUtil.toJsonStr(maps));
                                    }
                                    if (!mapList.isEmpty()) {
                                        orderYcxm.setJynr(JSONUtil.toJsonStr(mapList));
                                    }
                                    orderYcxm.setJyjc("0");
                                    ycxmService.save(orderYcxm);
                                }
                            } else {

                                List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
                                        , replacedAll, "", order.getTjNumber(), replacedAll, detail.getProResult());


                                String[] split = detail.getProResult().split("[。,，:：.\\s]+");
                                List<Map<String, Object>> mapList = new ArrayList<>();
                                for (String s : split) {
                                    s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "").replaceAll(" ", "")
                                            .replaceAll("症", "").replaceAll("[0-9]", "");
                                    Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0", xb);
                                    if (null != mapss && !mapss.isEmpty()) {
                                        Object bt = mapss.get("bt");
                                        Object nr = mapss.get("nr");
                                        if (null != bt || null != nr) {

                                        }
                                        mapList.add(mapss);
                                    }
                                }

                                if (null != maps && !maps.isEmpty()) {
                                    jianyilis.addAll(maps);
                                }
                                if (!mapList.isEmpty()) {
                                    jianyilis.addAll(mapList);
                                }
                                ssyszys.append(detail.getProName()).append("/");
                                ssyszyjgs.append(detail.getProResult()).append("/");
                            }
                        }
                    } else {
                        if (detail.getProName().contains("舒张压") || detail.getProName().contains("收缩压")) {
                            ssyszys.append(detail.getProName()).append("/");
                            ssyszyjgs.append(detail.getProResult()).append("/");

                        if(null != maps && !maps.isEmpty()){
                            ycxm.setJynr(JSONUtil.toJsonStr(maps));
                        }
                        if( !mapList.isEmpty()){
                            ycxm.setJynr(JSONUtil.toJsonStr(mapList));
                        }
                        ycxmService.updateById(ycxm);
                        if(detail.getExceptionDesc()==0)ycxmService.remove(wq);

                    }
                } catch (Exception e) {
                }

                // 使用 stream 过滤出 proName 为 "舒张压" 或 "收缩压" 的元素
                List<TjOrderDetail> filteredList = tjOrderDetailList.stream()
                        .filter(a -> ("舒张压".equals(a.getProName()) || "收缩压".equals(a.getProName())) && a.getExceptionDesc() == 1)
                        .collect(Collectors.toList());
                if (StrUtil.isNotBlank(ssyszys.toString())) {

                    LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjOrderYcxm::getTjh, order.getTjNumber());
                    wq.like(TjOrderYcxm::getJcxm, "舒张压");
                    ycxmService.remove(wq);

                    if (!filteredList.isEmpty()) {
                        TjOrderYcxm orderYcxm = new TjOrderYcxm();
                        orderYcxm.setTjh(order.getTjNumber());
                        orderYcxm.setParentName(tjProject.getProName());
                        orderYcxm.setJcxm(ssyszys.toString().replaceFirst("/$", ""));
                        orderYcxm.setJcjg(ssyszyjgs.toString().replaceFirst("/$", ""));
                        orderYcxm.setJynr(JSONUtil.toJsonStr(jianyilis));
                        orderYcxm.setJyjc("0");
                        ycxmService.save(orderYcxm);
                    }
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e));
        }

    }
@@ -682,14 +769,14 @@
    @Override
//    @Async("async")
//    @Transactional
    public Boolean iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser,String jxbz) {
    public Boolean iundividualCharges(TjFlowingWater tjFlowingWater, TjOrder order, TjCustomer customer, SysUser sysUser, String jxbz) {
        Date dates = new Date();
        final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");

        tjFlowingWater.setJxbz(jxbz);
        tjFlowingWaterService.updateById(tjFlowingWater);

        TjProBl proBl=new TjProBl();
        TjProBl proBl = new TjProBl();
        proBl.setTjh(order.getTjNumber());
        proBl.setBldh(jxbz);
        proBl.setBlsj(date);
@@ -702,7 +789,7 @@

        String config = configService.selectConfigByKey("sfkqdyhis");

        List<TjProject>  projectList=new ArrayList<>();
        List<TjProject> projectList = new ArrayList<>();

//        ArrayList<TjOrderDetail> tjOrderDetails = new ArrayList<>();
        for (String tjProId : tjProIds) {
@@ -760,14 +847,14 @@

                TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), tjProId);
//                if(null !=orderDetail) continue;
                if(null !=orderDetail) {
                if (null != orderDetail) {
                    detailMapper.updateTjOrderDetailDel(orderDetail.getOrderDetailId().toString());
                }

                TjProject projects = projectService.selectTjProjectByProId(Long.valueOf(tjProId));
                if (null != projects) {
                    TjProject projectss = projectService.getById(projects.getProParentId());
                    if (null != projectss && projectss.getProParentId()==0L) {
                    if (null != projectss && projectss.getProParentId() == 0L) {
                        projectList.add(projectss);
                    }
                }
@@ -788,10 +875,10 @@

            }

            List<TbTransition> tbTransitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(customer.getCusIdcard(),tjProId);
            List<TbTransition> tbTransitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(customer.getCusIdcard(), tjProId);
            if (null != tbTransitionList && !tbTransitionList.isEmpty()) {
                for (TbTransition transition : tbTransitionList) {
                    transitionService.updateTbTransitionById(transition.getId().toString(),jxbz,order.getTjNumber(),order.getCardId(),
                    transitionService.updateTbTransitionById(transition.getId().toString(), jxbz, order.getTjNumber(), order.getCardId(),
                            transition.getOrdPrice().multiply(BigDecimal.valueOf(Double.parseDouble(tjFlowingWater.getDiscount())).divide(BigDecimal.valueOf(10))));
                }
            }
@@ -802,12 +889,12 @@

        ArrayList<TjProject> jianChaProjects = new ArrayList<>();

        if(!projectList.isEmpty()){
        if (!projectList.isEmpty()) {
            List<TjProject> list = projectList.stream().distinct().collect(Collectors.toList());
            for (TjProject project : list) {

                TjOrderRemark orderRemark = orderRemarkService.getTjOrderRemarkByTjNumAndProParentId(order.getTjNumber(), String.valueOf(project.getProId()));
                if(null !=orderRemark){
                if (null != orderRemark) {
                    remarkMapper.updateTjOrderRemarkdel(orderRemark.getRemarkId().toString());
                }

@@ -827,7 +914,7 @@


                TjOrderDetail orderDetail = tjOrderDetailService.getTjOrderDetailByOrderId(String.valueOf(tjFlowingWater.getOrderId()), project.getProId().toString());
                if(null !=orderDetail) {
                if (null != orderDetail) {
                    detailMapper.updateTjOrderDetailDel(orderDetail.getOrderDetailId().toString());
                }

@@ -845,26 +932,25 @@
                detail1.setJxbz(jxbz);
                tjOrderDetailService.save(detail1);
//                tjOrderDetails.add(detail1);
                        if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) {
                        if (null != project.getHisXmbm()) {
                            jianChaProjects.add(project);
                        }
                if (project.getProPrice().compareTo(BigDecimal.ZERO) != 0 && deptService.getJcDeptIds().contains(project.getDeptId().toString())) {
                    if (null != project.getHisXmbm()) {
                        jianChaProjects.add(project);
                    }
                }
            }

            // TODO 和签到登记一样 只有配置中的以及收费类型为体检票时才增加到采样管理表
            if(config.equalsIgnoreCase("Y")){
//                if (lisApiMethod.isUseLisAndPacsRegister(order) && tjFlowingWater.getPayType() == 6L) {
                    List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
                    addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
//                }
            if (config.equalsIgnoreCase("Y")) {
                List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
                addCaiYangDengJi(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
                String isUseMx = configService.selectConfigByKey("jcxhis_is_use_mx");
                AjaxResult result;
                if (isUseMx.equalsIgnoreCase("Y"))
                    result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L);
                else result = tijianbulushenqingJinchuanNew (customer, date, order.getCardId(), jxbz, jianChaProjects, tjFlowingWater.getPayType() == 6L);
                    result = tijianbulushenqing(customer, date, order.getCardId(), jxbz, jianChaProjects, (tjFlowingWater.getPayType() == 6L || tjFlowingWater.getPayStasus() == 1L));
                else
                    result = tijianbulushenqingJinchuanNew(customer, date, order.getCardId(), jxbz, jianChaProjects,(tjFlowingWater.getPayType() == 6L || tjFlowingWater.getPayStasus() == 1L));
                return result.get("code").toString().equals("200");
            }else {
            } else {
                List<TjOrderDetail> detailLists = tjOrderDetailService.getCaiYangDengJiJxbz(order.getOrderId(), jxbz);
                addCaiYangDengJiByDiaoYongShiTu(detailLists, !detailLists.isEmpty(), order, sysUser, jxbz);
            }
@@ -873,7 +959,7 @@
        return true;
    }

    public void addCaiYangDengJiByDiaoYongShiTu(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser,String jxbz) {
    public void addCaiYangDengJiByDiaoYongShiTu(List<TjOrderDetail> detailList, boolean detailList1, TjOrder order, SysUser sysUser, String jxbz) {
        try {
            String lis_tmh_prefix = sysConfigService.selectConfigByKey("make_lis_tmh_prefix");
            if (null != detailList && detailList1) {
@@ -881,7 +967,7 @@
                String format = DateUtil.format(date, "yyMMddHHmmssSSS");
                for (TjOrderDetail detail : detailList) {
                    int i = samplingService.isExistProId(order.getTjNumber(), String.valueOf(detail.getProId()));
                    if(i>0) continue;
                    if (i > 0) continue;

                    TjSampling sampling = new TjSampling();
                    if (null == projectService.getById(detail.getProId())) continue;
@@ -923,9 +1009,9 @@
                }
            }
            String config = configService.selectConfigByKey("sfkqdyhis");
            if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))){
            if (lisApiMethod.isUseLisAndPacsRegister(order) && (null != config && config.equals("Y"))) {
                AjaxResult ajaxResult = lisApiMethod.getJyFlHb();
                if (ajaxResult.get("code").toString().equals("200")){
                if (ajaxResult.get("code").toString().equals("200")) {
                    String str = ajaxResult.get("data").toString();
                    str = str.replace("=", ":");
                    JSONArray array = JSONUtil.parseArray(str);
@@ -937,12 +1023,12 @@
                        lisJyflhb.setMc(object.getStr("mc"));
                        lisJyflhb.setFlbm(object.getStr("flbm"));
                        LambdaQueryWrapper<LisJyflhb> wrapper = new LambdaQueryWrapper<>();
                        wrapper.eq(LisJyflhb::getFlbm,lisJyflhb.getFlbm());
                        wrapper.eq(LisJyflhb::getFlbm, lisJyflhb.getFlbm());
                        LisJyflhb jyflhb = lisJyflhbService.getOne(wrapper);
                        if (jyflhb == null) {
                            lisJyflhb.setId(IdUtil.getSnowflake().nextId());
                            lisJyflhbService.save(lisJyflhb);
                        }else {
                        } else {
                            lisJyflhb.setId(jyflhb.getId());
                            lisJyflhbService.updateById(lisJyflhb);
                        }
@@ -950,53 +1036,58 @@
                }

            }
            if (StrUtil.isNotBlank(jxbz)){
                tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()),jxbz);
            }else {
                tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(),sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
            if (StrUtil.isNotBlank(jxbz)) {
                tjSamplingMapper.updateUserIdByTjNumAndJxbz(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), jxbz);
            } else {
                tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
            }
        } catch (Exception e) {
            log.error(e.getMessage());
        }
    }

    private static List<String> mapJinchuan=null;
    public AjaxResult tijianbulushenqingJinchuanNew(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
        mapJinchuan=new ArrayList<>();
        tijianbulushenqingOld( customer,date, cardId, jxbz, jianChaProjects, isTuanTiPiao);
    private static List<String> mapJinchuan = null;

        tijianbulushenqingJinchuan( customer,date, cardId, jxbz, jianChaProjects, isTuanTiPiao);
    private static ArrayList<String> ids = null;

    public AjaxResult tijianbulushenqingJinchuanNew(TjCustomer customer, String date, String cardId, String jxbz, ArrayList<TjProject> jianChaProjects, Boolean isTuanTiPiao) {
        mapJinchuan = new ArrayList<>();
        ids = new ArrayList<>();
        tijianbulushenqingOld(customer, date, cardId, jxbz, jianChaProjects, isTuanTiPiao);

        tijianbulushenqingJinchuan(customer, date, cardId, jxbz, jianChaProjects, isTuanTiPiao);
        return AjaxResult.success();
        //return AjaxResult.success();
    }
    public AjaxResult tijianbulushenqingJinchuan(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {

    public AjaxResult tijianbulushenqingJinchuan(TjCustomer customer, String date, String cardId, String jxbz, ArrayList<TjProject> jianChaProjects, Boolean isTuanTiPiao) {
        TjOrder order = orderService.getOrderByCardId(cardId);
        if(null !=order){
        if (null != order) {
            String dept = configService.selectConfigByKey("request_default_dept");
            String ysbm = configService.selectConfigByKey("request_default_ysbm");
            String ysmc = configService.selectConfigByKey("request_default_ysmc");
            String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
            List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz);
            List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), cardId, jxbz);
            Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
            List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
            List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos = new ArrayList<>();
            if (useLisAndPacsRegister && isTuanTiPiao) {
                // 检查申请
                pacsReg(order, customer, jianChaProjects);
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,order.getTjNumber());
                wrapper.eq(TjSampling::getJxbz,jxbz);
                wrapper.eq(TjSampling::getTjNum, order.getTjNumber());
                wrapper.eq(TjSampling::getJxbz, jxbz);
                List<TjSampling> list = tjSamplingService.list(wrapper);
                log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
                if (!list.isEmpty()){
                log.info("采样数据 ->{}", JSONUtil.toJsonStr(list));
                if (!list.isEmpty()) {
                    Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
                    log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                    ArrayList<String> ids = new ArrayList<>();
                    log.info("分组后 ->{}", JSONUtil.toJsonStr(listMap));
//                    ArrayList<String> ids = new ArrayList<>();
                    for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
                        log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
                        log.info("key ->{},val ->{}", entry.getKey(), entry.getValue());
                        // Lis标本代码
                        String specimenTypeCode = entry.getKey();
                        List<TjSampling> samplings = entry.getValue();
                        if (samplings.size() >= 2){
                        if (samplings.size() >= 2) {
                            // 进行合并
                            List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
//                            log.info("提取id ->{}",stringList);
@@ -1008,20 +1099,21 @@
                                }
                            }
                            if (stringList.size() > 1) {
                                String id = tjSamplingService.mergeCaiYangApi(stringList,lis_tmh_prefix);
                                String id = tjSamplingService.mergeCaiYangApi(stringList, lis_tmh_prefix);
                                ids.add(id);
                            }else {
                            } else {
                                ids.add(stringList.get(0));
                            }
                        }else {
                        } else {
                            ids.add(samplings.get(0).getId());
                        }
                    }
                    Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids, "Y", "N");

                    Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids.stream().distinct().collect(Collectors.toList()), "Y", "N");
                    if (!confirmed)
                        return AjaxResult.error("处理失败");
                }
            }else {
            } else {
                List<TjOutpinmedicXm> outpinmedicXms = tjOutpinmedicXmService.list();
                //检验申请
                if (null != detailList && !detailList.isEmpty()) {
@@ -1029,14 +1121,14 @@
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
//            wq.groupBy(TjProject::getHisXmbm);
//            wq.in(TjProject::getDeptId, "241", "317");
                    wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getJyDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    if (null != projects && !projects.isEmpty()) {
                        List<TjProject> notNull = projects.stream().filter(i -> i.getSpecimenType() != null).collect(Collectors.toList());
                        List<TjProject> isNull = projects.stream().filter(i -> i.getSpecimenType() == null).collect(Collectors.toList());
                        Map<String, List<TjProject>> listMap = notNull.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
                        if (!isNull.isEmpty())
                            listMap.put("",isNull);
                            listMap.put("", isNull);
                        for (Map.Entry<String, List<TjProject>> entry : listMap.entrySet()) {
                            OutpintestapplyDto dto = new OutpintestapplyDto();
                            dto.setHisRegistrationId(cardId);
@@ -1051,7 +1143,7 @@
                            List<TjProject> value = entry.getValue();
                            for (TjProject project : value) {
                                LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
                                wrapper.eq(TjProject::getProParentId,project.getProId());
                                wrapper.eq(TjProject::getProParentId, project.getProId());
                                if (!mapJinchuan.isEmpty()) {
                                    wrapper.notIn(TjProject::getProId, mapJinchuan);
                                    wrapper.notIn(TjProject::getProParentId, mapJinchuan);
@@ -1073,7 +1165,7 @@
                                }
                                if (!outpinmedicXms.isEmpty()) {
                                    outpinmedicXms.stream().filter(i -> i.getProId().equals(project.getProId())).forEach(i -> {
                                        OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                        OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                        detilsDto.setYpbm(i.getYpbm());
                                        detilsDto.setPcbm(i.getPcbm());
                                        detilsDto.setSl(i.getSl());
@@ -1156,15 +1248,15 @@
                if (null != detailList && !detailList.isEmpty()) {
                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                    wq.in(TjProject::getDeptId,deptService.getJcDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getJcDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    List<Long> proIds = projects.stream().map(TjProject::getProId).collect(Collectors.toList());
                    if (!proIds.isEmpty()){
                    if (!proIds.isEmpty()) {
                        QueryWrapper<TjProject> wrapper4 = new QueryWrapper<>();
                        wrapper4.select("sum(sl) as sl","pro_id"
                                ,"pro_parent_id","pro_name","his_xmbm","his_xmmc"
                                ,"pro_price");
                        wrapper4.in("pro_parent_id",proIds);
                        wrapper4.select("sum(sl) as sl", "pro_id"
                                , "pro_parent_id", "pro_name", "his_xmbm", "his_xmmc"
                                , "pro_price");
                        wrapper4.in("pro_parent_id", proIds);
                        wrapper4.groupBy("his_xmbm");
                        if (!mapJinchuan.isEmpty()) {
                            wrapper4.notIn("pro_id", mapJinchuan);
@@ -1188,7 +1280,7 @@
                            List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
                            if (!outpinmedicXms.isEmpty()) {
                                outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
                                    OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                    OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                    detilsDto.setYpbm(i.getYpbm());
                                    detilsDto.setPcbm(i.getPcbm());
                                    detilsDto.setSl(i.getSl());
@@ -1281,15 +1373,15 @@
                if (null != detailList && !detailList.isEmpty()) {
                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                    wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getCzDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    List<Long> proIds = projects.stream().map(TjProject::getProId).collect(Collectors.toList());
                    if (!proIds.isEmpty()){
                    if (!proIds.isEmpty()) {
                        QueryWrapper<TjProject> wrapper4 = new QueryWrapper<>();
                        wrapper4.select("sum(sl) as sl","pro_id"
                                ,"pro_parent_id","pro_name","his_xmbm","his_xmmc"
                                ,"pro_price");
                        wrapper4.in("pro_parent_id",proIds);
                        wrapper4.select("sum(sl) as sl", "pro_id"
                                , "pro_parent_id", "pro_name", "his_xmbm", "his_xmmc"
                                , "pro_price");
                        wrapper4.in("pro_parent_id", proIds);
                        wrapper4.groupBy("his_xmbm");
                        if (!mapJinchuan.isEmpty()) {
                            wrapper4.notIn("pro_id", mapJinchuan);
@@ -1311,7 +1403,7 @@
                            List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
                            if (!outpinmedicXms.isEmpty()) {
                                outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
                                    OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                    OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                    detilsDto.setYpbm(i.getYpbm());
                                    detilsDto.setPcbm(i.getPcbm());
                                    detilsDto.setSl(i.getSl());
@@ -1382,8 +1474,8 @@
                }

                //药品申请
                if(!outpinmedicapplyDetilsDtos.isEmpty()){
                    OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
                if (!outpinmedicapplyDetilsDtos.isEmpty()) {
                    OutpinmedicapplyDto dto1 = new OutpinmedicapplyDto();
                    dto1.setHisRegistrationId(cardId);
                    dto1.setSfzh(customer.getCusIdcard());
                    dto1.setSqysbm(ysbm);
@@ -1413,13 +1505,13 @@
                    String result1 = getAjaxResult(result);
                    JSONObject object = getJSONObject(result1);
                    String code = object.getStr("ResultCode");
                    if(null !=code && code.equals("0")){
                    if (null != code && code.equals("0")) {
                        JSONObject resultData = object.getJSONObject("ResultData");
//                Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
                        String cfh = resultData.getStr("cfh");
                        log.info("药品申请后的处方号是: "+cfh+"  outpinmedicapplyDetilsDtos 里面的值为: "+outpinmedicapplyDetilsDtos.toString());
                        log.info("药品申请后的处方号是: " + cfh + "  outpinmedicapplyDetilsDtos 里面的值为: " + outpinmedicapplyDetilsDtos.toString());
                        for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
                            TjCf cf=new TjCf();
                            TjCf cf = new TjCf();
                            cf.setJxbz(jxbz);
                            cf.setCardId(cardId);
                            cf.setSfzh(customer.getCusIdcard());
@@ -1446,38 +1538,38 @@
        return AjaxResult.success();
    }

//    体检对his申请单调用方法
    public AjaxResult tijianbulushenqingOld(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
    //    体检对his申请单调用方法
    public AjaxResult tijianbulushenqingOld(TjCustomer customer, String date, String cardId, String jxbz, ArrayList<TjProject> jianChaProjects, Boolean isTuanTiPiao) {
        TjOrder order = orderService.getOrderByCardId(cardId);
        if(null !=order){
        if (null != order) {
            String dept = configService.selectConfigByKey("request_default_dept");
            String ysbm = configService.selectConfigByKey("request_default_ysbm");
            String ysmc = configService.selectConfigByKey("request_default_ysmc");
            String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
            List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz);
            List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), cardId, jxbz);
            Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
            List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
            List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos = new ArrayList<>();
            if (useLisAndPacsRegister && isTuanTiPiao) {
                // 检查申请
                pacsReg(order, customer, jianChaProjects);
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,order.getTjNumber());
                wrapper.eq(TjSampling::getJxbz,jxbz);
                wrapper.eq(TjSampling::getTjNum, order.getTjNumber());
                wrapper.eq(TjSampling::getJxbz, jxbz);
                List<TjSampling> list = tjSamplingService.list(wrapper);
                log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
                if (!list.isEmpty()){
                log.info("采样数据 ->{}", JSONUtil.toJsonStr(list));
                if (!list.isEmpty()) {
                    Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
                    log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                    log.info("分组后 ->{}", JSONUtil.toJsonStr(listMap));
                    ArrayList<String> ids = new ArrayList<>();
                    for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
                        log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
                        log.info("key ->{},val ->{}", entry.getKey(), entry.getValue());
                        // Lis标本代码
                        String specimenTypeCode = entry.getKey();
                        List<TjSampling> samplings = entry.getValue();
                        if (samplings.size() >= 2){
                        if (samplings.size() >= 2) {
                            // 进行合并
                            List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
                            log.info("提取id ->{}",stringList);
                            log.info("提取id ->{}", stringList);
                            for (int i = 0; i < stringList.size(); i++) {
                                String s = stringList.get(i);
                                if (tjSamplingService.isMergeItem(s) != 0) {
@@ -1486,20 +1578,20 @@
                                }
                            }
                            if (stringList.size() > 1) {
                                String id = tjSamplingService.mergeCaiYangApi(stringList,lis_tmh_prefix);
                                String id = tjSamplingService.mergeCaiYangApi(stringList, lis_tmh_prefix);
                                ids.add(id);
                            }else {
                            } else {
                                ids.add(stringList.get(0));
                            }
                        }else {
                        } else {
                            ids.add(samplings.get(0).getId());
                        }
                    }
                    Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids, "Y", "N");
                    if (!confirmed)
                        return AjaxResult.error("处理失败");
//                    Boolean confirmed = samplingServiceApi.confirmSamplingApi(ids, "Y", "N");
//                    if (!confirmed)
//                        return AjaxResult.error("处理失败");
                }
            }else {
            } else {
                List<TjOutpinmedicXm> outpinmedicXms = tjOutpinmedicXmService.list();
                //检验申请
                OutpintestapplyDto dto = new OutpintestapplyDto();
@@ -1518,7 +1610,7 @@
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
//            wq.groupBy(TjProject::getHisXmbm);
//            wq.in(TjProject::getDeptId, "241", "317");
                    wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getJyDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    if (null != projects && !projects.isEmpty()) {
                        for (TjProject project : projects) {
@@ -1540,7 +1632,7 @@
                                }
                                if (!outpinmedicXms.isEmpty()) {
                                    outpinmedicXms.stream().filter(i -> i.getProId().equals(project.getProId())).forEach(i -> {
                                        OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                        OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                        detilsDto.setYpbm(i.getYpbm());
                                        detilsDto.setPcbm(i.getPcbm());
                                        detilsDto.setSl(i.getSl());
@@ -1626,7 +1718,7 @@
                if (null != detailList && !detailList.isEmpty()) {
                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                    wq.in(TjProject::getDeptId,deptService.getJcDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getJcDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    if (null != projects && !projects.isEmpty()) {
                        for (TjProject project : projects) {
@@ -1649,7 +1741,7 @@
                                List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
                                if (!outpinmedicXms.isEmpty()) {
                                    outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
                                        OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                        OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                        detilsDto.setYpbm(i.getYpbm());
                                        detilsDto.setPcbm(i.getPcbm());
                                        detilsDto.setSl(i.getSl());
@@ -1736,7 +1828,7 @@
                if (null != detailList && !detailList.isEmpty()) {
                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                    wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getCzDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    if (null != projects && !projects.isEmpty()) {
                        for (TjProject project : projects) {
@@ -1774,7 +1866,7 @@
                                List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
                                if (!outpinmedicXms.isEmpty()) {
                                    outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
                                        OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                        OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                        detilsDto.setYpbm(i.getYpbm());
                                        detilsDto.setPcbm(i.getPcbm());
                                        detilsDto.setSl(i.getSl());
@@ -2339,34 +2431,34 @@
//        return AjaxResult.success();
//    }

    public AjaxResult tijianbulushenqing(TjCustomer customer, String date,String cardId,String jxbz,ArrayList<TjProject> jianChaProjects,Boolean isTuanTiPiao) {
    public AjaxResult tijianbulushenqing(TjCustomer customer, String date, String cardId, String jxbz, ArrayList<TjProject> jianChaProjects, Boolean isTuanTiPiao) {
        TjOrder order = orderService.getOrderByCardId(cardId);
        if(null !=order){
        if (null != order) {
            String dept = configService.selectConfigByKey("request_default_dept");
            String ysbm = configService.selectConfigByKey("request_default_ysbm");
            String ysmc = configService.selectConfigByKey("request_default_ysmc");
            String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
            List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(),cardId,jxbz);
            List<TbTransition> detailList = transitionService.getBlTbTransitionListByCusId(customer.getCusIdcard(), cardId, jxbz);
            Boolean useLisAndPacsRegister = lisApiMethod.isUseLisAndPacsRegister(order);
            List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
            List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos = new ArrayList<>();
            if (useLisAndPacsRegister && isTuanTiPiao) {
                // 检查申请
                pacsReg(order, customer, jianChaProjects);
                LambdaQueryWrapper<TjSampling> wrapper = new LambdaQueryWrapper<>();
                wrapper.eq(TjSampling::getTjNum,order.getTjNumber());
                wrapper.eq(TjSampling::getJxbz,jxbz);
                wrapper.eq(TjSampling::getTjNum, order.getTjNumber());
                wrapper.eq(TjSampling::getJxbz, jxbz);
                List<TjSampling> list = tjSamplingService.list(wrapper);
                log.info("采样数据 ->{}",JSONUtil.toJsonStr(list));
                if (!list.isEmpty()){
                log.info("采样数据 ->{}", JSONUtil.toJsonStr(list));
                if (!list.isEmpty()) {
                    Map<String, List<TjSampling>> listMap = list.stream().collect(Collectors.groupingBy(TjSampling::getSpecimenTypeCode));
                    log.info("分组后 ->{}",JSONUtil.toJsonStr(listMap));
                    log.info("分组后 ->{}", JSONUtil.toJsonStr(listMap));
                    ArrayList<String> ids = new ArrayList<>();
                    for (Map.Entry<String, List<TjSampling>> entry : listMap.entrySet()) {
                        log.info("key ->{},val ->{}",entry.getKey(),entry.getValue());
                        log.info("key ->{},val ->{}", entry.getKey(), entry.getValue());
                        // Lis标本代码
                        String specimenTypeCode = entry.getKey();
                        List<TjSampling> samplings = entry.getValue();
                        if (samplings.size() >= 2){
                        if (samplings.size() >= 2) {
                            // 进行合并
                            List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
//                            log.info("提取id ->{}",stringList);
@@ -2378,12 +2470,12 @@
                                }
                            }
                            if (stringList.size() > 1) {
                                String id = tjSamplingService.mergeCaiYangApi(stringList,lis_tmh_prefix);
                                String id = tjSamplingService.mergeCaiYangApi(stringList, lis_tmh_prefix);
                                ids.add(id);
                            }else {
                            } else {
                                ids.add(stringList.get(0));
                            }
                        }else {
                        } else {
                            ids.add(samplings.get(0).getId());
                        }
                    }
@@ -2391,7 +2483,7 @@
                    if (!confirmed)
                        return AjaxResult.error("处理失败");
                }
            }else {
            } else {
                List<TjOutpinmedicXm> outpinmedicXms = tjOutpinmedicXmService.list();
                //检验申请
                if (null != detailList && !detailList.isEmpty()) {
@@ -2399,14 +2491,14 @@
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
//            wq.groupBy(TjProject::getHisXmbm);
//            wq.in(TjProject::getDeptId, "241", "317");
                    wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getJyDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    if (null != projects && !projects.isEmpty()) {
                        List<TjProject> notNull = projects.stream().filter(i -> i.getSpecimenType() != null).collect(Collectors.toList());
                        List<TjProject> isNull = projects.stream().filter(i -> i.getSpecimenType() == null).collect(Collectors.toList());
                        Map<String, List<TjProject>> listMap = notNull.stream().collect(Collectors.groupingBy(TjProject::getSpecimenType));
                        if (!isNull.isEmpty())
                            listMap.put("",isNull);
                            listMap.put("", isNull);
                        for (Map.Entry<String, List<TjProject>> entry : listMap.entrySet()) {
                            OutpintestapplyDto dto = new OutpintestapplyDto();
                            dto.setHisRegistrationId(cardId);
@@ -2421,7 +2513,7 @@
                            List<TjProject> value = entry.getValue();
                            for (TjProject project : value) {
                                LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
                                wrapper.eq(TjProject::getProParentId,project.getProId());
                                wrapper.eq(TjProject::getProParentId, project.getProId());
                                List<TjProject> list = projectService.list(wrapper);
                                for (TjProject tjProject : list) {
                                    if (StrUtil.isNotBlank(tjProject.getHisXmbm()) && tjProject.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
@@ -2439,7 +2531,7 @@
                                }
                                if (!outpinmedicXms.isEmpty()) {
                                    outpinmedicXms.stream().filter(i -> i.getProId().equals(project.getProId())).forEach(i -> {
                                        OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                        OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                        detilsDto.setYpbm(i.getYpbm());
                                        detilsDto.setPcbm(i.getPcbm());
                                        detilsDto.setSl(i.getSl());
@@ -2523,15 +2615,15 @@
                if (null != detailList && !detailList.isEmpty()) {
                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                    wq.in(TjProject::getDeptId,deptService.getJcDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getJcDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    List<Long> proIds = projects.stream().map(TjProject::getProId).collect(Collectors.toList());
                    if (!proIds.isEmpty()){
                    if (!proIds.isEmpty()) {
                        QueryWrapper<TjProject> wrapper4 = new QueryWrapper<>();
                        wrapper4.select("sum(sl) as sl","pro_id"
                                ,"pro_parent_id","pro_name","his_xmbm","his_xmmc"
                                ,"pro_price");
                        wrapper4.in("pro_parent_id",proIds);
                        wrapper4.select("sum(sl) as sl", "pro_id"
                                , "pro_parent_id", "pro_name", "his_xmbm", "his_xmmc"
                                , "pro_price");
                        wrapper4.in("pro_parent_id", proIds);
                        wrapper4.groupBy("his_xmbm");
                        projects = projectService.list(wrapper4);
                        if (null != projects && !projects.isEmpty()) {
@@ -2551,7 +2643,7 @@
                            List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
                            if (!outpinmedicXms.isEmpty()) {
                                outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
                                    OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                    OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                    detilsDto.setYpbm(i.getYpbm());
                                    detilsDto.setPcbm(i.getPcbm());
                                    detilsDto.setSl(i.getSl());
@@ -2645,15 +2737,15 @@
                if (null != detailList && !detailList.isEmpty()) {
                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                    wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
                    wq.in(TjProject::getDeptId, deptService.getCzDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    List<Long> proIds = projects.stream().map(TjProject::getProId).collect(Collectors.toList());
                    if (!proIds.isEmpty()){
                    if (!proIds.isEmpty()) {
                        QueryWrapper<TjProject> wrapper4 = new QueryWrapper<>();
                        wrapper4.select("sum(sl) as sl","pro_id"
                                ,"pro_parent_id","pro_name","his_xmbm","his_xmmc"
                                ,"pro_price");
                        wrapper4.in("pro_parent_id",proIds);
                        wrapper4.select("sum(sl) as sl", "pro_id"
                                , "pro_parent_id", "pro_name", "his_xmbm", "his_xmmc"
                                , "pro_price");
                        wrapper4.in("pro_parent_id", proIds);
                        wrapper4.groupBy("his_xmbm");
                        projects = projectService.list(wrapper4);
                        if (null != projects && !projects.isEmpty()) {
@@ -2671,7 +2763,7 @@
                            List<Long> proParentIds = projects.stream().map(TjProject::getProParentId).distinct().collect(Collectors.toList());
                            if (!outpinmedicXms.isEmpty()) {
                                outpinmedicXms.stream().filter(i -> proParentIds.contains(i.getProId())).forEach(i -> {
                                    OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                    OutpinmedicapplyDetilsDto detilsDto = new OutpinmedicapplyDetilsDto();
                                    detilsDto.setYpbm(i.getYpbm());
                                    detilsDto.setPcbm(i.getPcbm());
                                    detilsDto.setSl(i.getSl());
@@ -2807,7 +2899,7 @@
                /**
                 * 药品申请 处方类型维护在药品表
                 */
                if(!outpinmedicapplyDetilsDtos.isEmpty()){
                if (!outpinmedicapplyDetilsDtos.isEmpty()) {
                    String yfbm = configService.selectConfigByKey("chufang_yfbm");
                    String mzzd = configService.selectConfigByKey("chufang_mzzd");
                    String czybm = configService.selectConfigByKey("chufang_czybm");
@@ -3151,12 +3243,12 @@

    @Override
    @Async("async")
    public void saveRedisTransitionByPacId(String cusId,String cardId, Long pacId, List<Long> proIds) {
    public void saveRedisTransitionByPacId(String cusId, String cardId, Long pacId, List<Long> proIds) {
        if (null != pacId) {
            transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId);
            transitionService.saveRedisTransitionByPacId(cusId, cardId, pacId);
        }
        if (null != proIds && proIds.size() > 0) {
            saveRedisTransitionByProId(cusId,cardId, proIds);
            saveRedisTransitionByProId(cusId, cardId, proIds);
        }
    }

@@ -3266,7 +3358,7 @@
                    public void run() {
                        try {
//                            transitionService.saveTemoTransitionByGroupingId(reservation.getIdCard(), reservation.getGroupingId());
                            transitionService.ttsaveTemoTransitionByGroupingId(reservation.getIdCard(),"0",reservation.getGroupingId());
                            transitionService.ttsaveTemoTransitionByGroupingId(reservation.getIdCard(), "0", reservation.getGroupingId());

                            threadPool.shutdown();
                        } catch (Exception e) {
@@ -3391,20 +3483,19 @@
        }

        List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId());
        addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser,null);
        addCaiYangDengJi(detailList, detailList.size() > 0, order, sysUser, null);
    }



    //首页饼状图登记人数接口
    private AjaxResult getPieCharts() {
        Map<String, Object> map = new HashMap<>();

        Date date=new Date();
        Date date = new Date();

        //获取体检登记数
        LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
        wq0.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
        wq0.between(TjOrder::getCreateTime, DateUtil.offsetMonth(date, -1), date);
        List<TjOrder> orderCountList = orderService.list(wq0);
        if (null != orderCountList && !orderCountList.isEmpty()) {
            List<PieChartVo> pieChartVoList = getTjorderCountMap(orderCountList);
@@ -3414,11 +3505,11 @@
        }
        //获取体检异常数
        LambdaQueryWrapper<TjOrder> wq1 = new LambdaQueryWrapper<>();
        wq1.between(TjOrder::getCreateTime,DateUtil.offsetMonth(date,-1),date);
        wq1.between(TjOrder::getCreateTime, DateUtil.offsetMonth(date, -1), date);
//        wq1.isNotNull(TjOrder::getFinishTime);
//        wq1.eq(TjOrder::getCheckStatus, 1);
        List<TjOrder> orderList = orderService.list(wq1);
        if (null !=orderList && !orderList.isEmpty()) {
        if (null != orderList && !orderList.isEmpty()) {
//            List<TjOrder> orderList = orderAbnormalCountList.stream().distinct().collect(Collectors.toList());
            List<PieChartVo> pieChartVoList = getTjorderAbnormalCountMap(orderList);
            map.put("tjyc", pieChartVoList);
@@ -3494,7 +3585,7 @@
            wq.eq(TjOrderDetail::getExceptionDesc, 1);
            List<TjOrderDetail> list = tjOrderDetailService.list(wq);
            int count = hysqdService.getHyYcXmCount(tjOrder.getCardId());
            if ((null != list && !list.isEmpty()) || (count>0)) {
            if ((null != list && !list.isEmpty()) || (count > 0)) {
                TjCustomer customer = tjCustomerService.getById(tjOrder.getUserId());
                if (null != customer) {
                    int age = DateUtil.ageOfNow(customer.getCusBrithday());
@@ -4266,13 +4357,13 @@
    }

    //临时表添加单项
    public void saveRedisTransitionByProId(String cusId,String cardId, List<Long> proIds) {
    public void saveRedisTransitionByProId(String cusId, String cardId, List<Long> proIds) {
        for (Long proId : proIds) {
            TjProject project = projectService.selectTjProjectByProId(proId);
            if(null !=project){ //&& (!project.getProName().contains("静脉采血")|| !project.getProName().contains("费"))
            if (null != project) { //&& (!project.getProName().contains("静脉采血")|| !project.getProName().contains("费"))
                List<TbTransition> transitionList = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
                if (null == transitionList || transitionList.size() == 0) {
                    transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
                    transitionService.saveRedisTransitionByProId(cusId, cardId, proId);
                }
            }
//            if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);