zjh 2024/07/15-1

zjh

2024-07-15 a9e42bd044e835f49a08b9d5852ef10e669cd153

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

@@ -4,7 +4,9 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
import java.time.OffsetTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -21,6 +23,9 @@
import cn.hutool.core.date.DateUtil;
import cn.hutool.crypto.symmetric.DES;
import cn.hutool.extra.pinyin.PinyinUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -41,6 +46,9 @@
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.*;
import com.ltkj.hosp.dto.QianDaoDto;
import com.ltkj.hosp.dto.TjProBlDto;
import com.ltkj.hosp.hisDto.OutpinimpapplyDto;
import com.ltkj.hosp.hisDto.OutpinmedicapplyDto;
import com.ltkj.hosp.mapper.TestMapper;
import com.ltkj.hosp.service.*;
import com.ltkj.hosp.sqlDomain.LtkjMiddleDetail;
@@ -59,6 +67,10 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethod;
import com.ltkj.web.controller.his.HisApiMethodService;
import com.ltkj.web.controller.his.HisMzJysqController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -70,6 +82,7 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
@@ -170,6 +183,35 @@
    @Autowired
    private ThreadPoolConfig threadPoolConfig;

    @Autowired
    private HisApiMethod hisApiMethod;

    @Autowired
    private HisMzJysqController hisMzJysqController;
    @Autowired
    private HisApiGetMethodService hisApiGetMethodService;
    @Autowired
    private ISysDeptService sysDeptService;
    @Autowired
    private HisApiMethodService controller;
    @Autowired
    private TjProBlService blService;
    @Autowired
    private LtkjJianchajianyanTreeService ltkjJianchajianyanTreeService;

    @Autowired
    private TjCfService cfService;

    //将方法返回值解析成json格式
    public JSONObject getJSONObject(String builder) {
        String Response = JSONUtil.parseObj(builder).getStr("Response");
        return JSONUtil.parseObj(Response);
    }

    //获取方法返回值信息
    public String getAjaxResult(AjaxResult result) {
        return result.get("data").toString();
    }

    /**
     * 查询体检记录列表
@@ -426,9 +468,8 @@
                if (null != tjCustomer) {
                    order.setTjCustomerSex(tjCustomer.getCusSex());
                    order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                    order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                    order.setTjCustomerName(tjCustomer.getCusName());
                    order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
                    order.setTjCustomerPhone(tjCustomer.getCusPhone());
//                    order.setTjCusIdCard(MatchUtils.hideIdCardNum(tjCustomer.getCusIdcard()));
                    order.setTjCusIdCard(tjCustomer.getCusIdcard());
                    order.setCareer(tjCustomer.getCareer());
@@ -831,20 +872,22 @@
        LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
        wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
        TjCustomer tjCustomer = tjCustomerService.getOne(wq);
        if (tjCustomer == null) return AjaxResult.error("该客户未登记或不存在");
        if (tjCustomer == null) return AjaxResult.error("该客户未登记");

        LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
        wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
        wqq.eq(TjOrder::getCheckStatus, 0);
        wqq.isNull(TjOrder::getFinishTime);
        if (!tjCustomer.getCardId().equals("0")) {
            wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
        }
//        if (!tjCustomer.getCardId().equals("0")) {
        wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
//        }
        TjOrder order = tjOrderService.getOne(wqq);
        if (null != order) {
            transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
            return AjaxResult.error("不可重复登记");
        }


        LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
        wq1.eq(TjReservation::getIsExpire, 2);
@@ -853,9 +896,9 @@
        if (null != tjReservation) {
            tjOrder.setReservationId(tjReservation.getId());
            mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
            if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
                return AjaxResult.error("未到预约时间");
            }
//            if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
//                return AjaxResult.error("未到预约时间");
//            }
            if (DateUtil.endOfDay(tjReservation.getReservationTime()).before(new Date())) {
                tjReservation.setIsExpire(1);
                tjReservationService.updateById(tjReservation);
@@ -905,7 +948,13 @@
        if (null != mallOrder) tjOrder.setMallOrderId(String.valueOf(mallOrder.getId()));
        tjOrder.setStatus(TjConstants.TJ_BEGIN);
        tjOrder.setCardId(tjCustomer.getCardId());
        if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
            tjOrder.setFinishTime(new Date());
            tjOrder.setCheckStatus(1);
            tjOrder.setStatus(TjConstants.TJ_WAIT);
        }
        if (tjOrderService.save(tjOrder)) {

            //保存收货地址
            if ("2".equals(tjOrder.getGetType())) {
                final TjReportGetAddress address = tjOrder.getAddAddress();
@@ -1013,8 +1062,23 @@
//
//                }
//            }
            tjCustomer.setCardId("0");
            tjCustomerService.updateById(tjCustomer);


            /*调用his接口*/
            String config = configService.selectConfigByKey("sfkqdyhis");
            if (null != config && config.equals("Y")) {
                AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
                if (!result.get("code").toString().equals("200")) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("挂号失败!" + result.get("msg").toString());
                }
            } else {
                tjCustomer.setCardId(tjOrder.getTjNumber());
                tjCustomerService.updateById(tjCustomer);
                transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), tjOrder.getTjNumber());
                tjOrder.setCardId(tjOrder.getTjNumber());
                tjOrderService.updateById(tjOrder);
            }
            return AjaxResult.success(tjNumber);
        }
        return AjaxResult.error();
@@ -1024,7 +1088,7 @@
    @PostMapping("/addPlOrderAndDetail")
    @ApiOperation(value = "体检批量签到登记接口")
    @Transactional  //(切换数据库出错，所以注释)
    public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto,HttpServletResponse response) {
    public AjaxResult addPlOrderAndDetail(@RequestBody QianDaoDto daoDto, HttpServletResponse response) {
        SysUser sysUser = UserHoder.getLoginUser().getUser();
        List<String> cusIds = daoDto.getCusIds();
        ArrayList<String> tjNumbers = new ArrayList<>();
@@ -1409,7 +1473,7 @@

                tjCustomer.setCardId("0");
                tjCustomerService.updateById(tjCustomer);
                return AjaxResult.success().put("tjNumber",tjNumber);
                return AjaxResult.success().put("tjNumber", tjNumber);
            }
        }
        return AjaxResult.error();
@@ -1486,66 +1550,68 @@
                redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
            }
        }
        List<TbTransition> tbTransitionList = null;
        if (!redisCache.hasKey(cardId + cusId)) {
            tbTransitionList = new ArrayList<>();
        } else {
            tbTransitionList = redisCache.getCacheList(cardId + cusId);
        }
//        List<TbTransition> tbTransitionList = null;
//        if (!redisCache.hasKey(cardId + cusId)) {
//            tbTransitionList = new ArrayList<>();
//        } else {
//            tbTransitionList = redisCache.getCacheList(cardId + cusId);
//        }
        //套餐
        /*套餐*/
        if (null != packId && !packId.equals("")) {
            Long pacId = Long.valueOf(packId.toString());
            List<TbTransition> list = transitionService.getTbTransitionListByCusIdAndPac(cusId, String.valueOf(pacId));
            if (null == list || list.size() == 0) {
                transitionService.deletedTbTransitionListByCusIdAndPac(cusId, cardId);
                if (redisCache.hasKey(cardId + cusId + "cusId"))
                    redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
                if (redisCache.hasKey(cardId + cusId)) {
                    tbTransitionList = new ArrayList<>();
                    redisCache.deleteObject(cardId + cusId);
                }
//                if (redisCache.hasKey(cardId + cusId + "cusId"))
//                    redisCache.deleteCacheMapValue(cardId + cusId + "cusId", cardId + cusId);
//                if (redisCache.hasKey(cardId + cusId)) {
//                    tbTransitionList = new ArrayList<>();
//                    redisCache.deleteObject(cardId + cusId);
//                }
                List<TjPackageProject> ppList = tjPackageProjectService.getTjPackageProjectListByPacId(String.valueOf(pacId));
                if (null != ppList && ppList.size() > 0) {
                    transitionService.saveRedisTransitionByPacId(cusId,cardId ,pacId);
                    //异步保存数据库
//                    asyncService.addRedisTransitionPac(cusId, pacId, ppList);
                    asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
                    for (TjPackageProject tjPackageProject : ppList) {
                        TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
                        if (null != project) {

                            BigDecimal divide = BigDecimal.valueOf(0);
                            if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
                                divide = BigDecimal.valueOf(0);
                            } else {
                                divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
                            }
                            List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
                            if (null != tjProSonList && tjProSonList.size() > 0) {
                                //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
                                for (TjProject tjProject : tjProSonList) {
                                    TbTransition tbTransition = new TbTransition();
                                    tbTransition.setCusId(cusId);
                                    tbTransition.setPacId(pacId);
                                    if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
                                        tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
                                        tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
                                    } else {
                                        tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
                                    }
                                    tbTransition.setParentProId(project.getProId());
                                    tbTransition.setParentProName(project.getProName());
                                    tbTransition.setProId(tjProject.getProId());
                                    tbTransition.setProName(tjProject.getProName());
                                    tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName());
                                    tbTransition.setProType(tjProject.getProType());
                                    tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
                                    tbTransitionList.add(tbTransition);
                                }

                            }
                        }
                    }
//                    asyncService.saveRedisTransitionByPacId(cusId, cardId, pacId, null);
//                    for (TjPackageProject tjPackageProject : ppList) {
//                        TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
//                        if (null != project) {
//
//                            BigDecimal divide = BigDecimal.valueOf(0);
//                            if (tjPackageProject.getPriceNow().compareTo(BigDecimal.valueOf(0)) == 0 || project.getProPrice().compareTo(BigDecimal.valueOf(0)) == 0) {
//                                divide = BigDecimal.valueOf(0);
//                            } else {
//                                divide = tjPackageProject.getPriceNow().divide(project.getProPrice(), 5, RoundingMode.HALF_DOWN);
//                            }
//                            List<TjProject> tjProSonList = projectService.getTjProjectListBySoneId(String.valueOf(project.getProId()));
//                            if (null != tjProSonList && tjProSonList.size() > 0) {
//                                //addRedisTransitionPac(cusId, tbTransitionList, pacId, tjPackageProject, project, divide, tjProSonList);
//                                for (TjProject tjProject : tjProSonList) {
//                                    TbTransition tbTransition = new TbTransition();
//                                    tbTransition.setCusId(cusId);
//                                    tbTransition.setPacId(pacId);
//                                    if (null != tjPackageProject.getPriceNow() && divide.compareTo(BigDecimal.valueOf(0)) > 0) {
//                                        tbTransition.setNowPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
//                                        tbTransition.setOrdPrice(tjProject.getProPrice().multiply(divide).setScale(2, RoundingMode.HALF_DOWN));
//                                    } else {
//                                        tbTransition.setNowPrice(BigDecimal.valueOf(0.00));
//                                        tbTransition.setOrdPrice(BigDecimal.valueOf(0.00));
//                                    }
//                                    tbTransition.setParentProId(project.getProId());
//                                    tbTransition.setParentProName(project.getProName());
//                                    tbTransition.setProId(tjProject.getProId());
//                                    tbTransition.setProName(tjProject.getProName());
//                                    tbTransition.setPacName(tjPackageService.getById(tbTransition.getPacId()).getPacName());
//                                    tbTransition.setProType(tjProject.getProType());
//                                    tbTransition.setProCheckMethod(tjProject.getProCheckMethod());
//                                    tbTransitionList.add(tbTransition);
//                                }
//
//                            }
//                        }
//                    }
                }
            }
        }
@@ -1553,62 +1619,74 @@
        //单项
        if (null != proIds && proIds.size() > 0) {
            //异步保存数据库表
            asyncService.saveRedisTransitionByPacId(cusId, null, proIds);
//            asyncService.saveRedisTransitionByPacId(cusId, cardId, 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.selectTjProjectByProId(proId);
                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);
                    }
                }
                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;
//            if(null !=project) transitionService.saveRedisTransitionByProId(cusId,cardId, proId);
            }
//            for (Long proId : proIds) {
//                List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
//                if (null != transitions && transitions.size() > 0) {
//                    continue;
//                }
//                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 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);
//                    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);
////                        }
////                    }
//                }
//            }
        }


        if (null != tbTransitionList && tbTransitionList.size() > 0) {
            if (redisCache.hasKey(cardId + cusId)) {
                redisCache.deleteObject(cardId + cusId);
                redisCache.setCacheList(cardId + cusId, tbTransitionList);
                redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
            } else {
                redisCache.setCacheList(cardId + cusId, tbTransitionList);
                redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
            }
        }
//        if (null != tbTransitionList && tbTransitionList.size() > 0) {
//            if (redisCache.hasKey(cardId + cusId)) {
//                redisCache.deleteObject(cardId + cusId);
//                redisCache.setCacheList(cardId + cusId, tbTransitionList);
//                redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
//            } else {
//                redisCache.setCacheList(cardId + cusId, tbTransitionList);
//                redisCache.setCacheMapValue(cardId + cusId + "cusId", cardId + cusId, getMaps(cusId, cardId));
//            }
//            List<Map<String, Object>> map1 = getMap(cusId, cardId, tbTransitionList);
//            return AjaxResult.success();
//        }
        return AjaxResult.success();
    }

@@ -1661,7 +1739,7 @@
                    for (TjOrder order : list) {
                        TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
                        if (null != tjCustomer) {
                            order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                            order.setTjCustomerName(tjCustomer.getCusName());
                            order.setTjCustomerSex(tjCustomer.getCusSex());
                            order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                            order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1715,7 +1793,7 @@
            for (TjOrder order : list) {
                TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
                if (null != tjCustomer) {
                    order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
                    order.setTjCustomerName(tjCustomer.getCusName());
                    order.setTjCustomerSex(tjCustomer.getCusSex());
                    order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
                    order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1777,6 +1855,7 @@
     */
    @PostMapping("/tjGoOut")
    @ApiOperation(value = "体检签离")
    @Transactional
    public AjaxResult tjGoOut(@RequestBody Map<String, Object> map) {
        Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
        SysUser sysUser = userService.getById(userId);
@@ -1784,6 +1863,7 @@
        String jsonString = com.alibaba.fastjson.JSON.toJSONString(domainVos1);
        List<QjDomainVo> domainVos = com.alibaba.fastjson.JSON.parseArray(jsonString, QjDomainVo.class);
        String tjNumber = map.get("tjNumber").toString();
        TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
        if (null != domainVos && domainVos.size() > 0) {
            Set<String> list = new HashSet<>();
            for (QjDomainVo domainVo : domainVos) {
@@ -1797,7 +1877,6 @@
                    if (domainVo.getType() == 3) {
                        list.add(String.valueOf(domainVo.getTjNumber()));
                    } else {
                        TjOrder tjOrder = tjOrderService.getOrderByTjNum(remark.getTjNumber());
                        if (null != tjOrder) {
                            tjOrder.setFinishTime(new Date());
                            tjOrder.setStatus(TjConstants.TJ_CONFIRM);
@@ -1807,6 +1886,40 @@
                }
            }
            asyncService.tjGoutAsync(domainVos, sysUser, list);

            TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
            customer.setCardId("0");
            tjCustomerService.updateById(customer);
          /*  String config = configService.selectConfigByKey("sfkqdyhis");
            if(null !=config && config.equals("Y")){
                final String date = DateUtil.format(tjOrder.getCreateTime(), "yyyy-MM-dd HH:mm:ss");
                OutpinimpapplyDto dto=new OutpinimpapplyDto();
                dto.setHisRegistrationId(tjOrder.getCardId());
                dto.setMzzdid(1);
                dto.setSqysbm("00029");
                dto.setMzksbm("0101");
                dto.setFbrq(date);
                dto.setZdrq(date);
                dto.setCzybm("00029");
                dto.setCzyksbm("0101");
                dto.setZs("健康查体");
                dto.setBs("不详");
                dto.setClyz("");
                dto.setJws("");
                dto.setTgjc("");
                dto.setGms("");
                dto.setJbbm("Z00.001");
                dto.setJbbm1("");
                dto.setJbbm2("");
                dto.setFzbz("1");
                dto.setHzqx("6");
                dto.setSfqc("0");
                dto.setQchs("");
                dto.setSfqj("0");
                dto.setJzqk(9);
                controller.Outpinimpapply(dto);
            }*/

            return AjaxResult.success("签离成功！");
        } else {
            return getAjaxResult(tjNumber);
@@ -1819,6 +1932,7 @@
     */
    @GetMapping("/goOut")
    @ApiOperation(value = "签离")
    @Transactional
    public AjaxResult goOut(@RequestParam @ApiParam(value = "体检号") String tjNumber) {
        return getAjaxResult(tjNumber);
    }
@@ -1877,8 +1991,10 @@
        for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
            Map<String, Object> map = new HashMap<>();
            Long pacId = entry.getValue().get(0).getPacId();
            map.put("proPrantId", entry.getKey().toString());
            if (null != pacId) {
                TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
                map.put("tjCategory",aPackage.getTjCategory());
                map.put("pacName", aPackage.getPacName());
                TjProject tjProject = projectService.getById(entry.getKey());
//                TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
@@ -1891,6 +2007,59 @@
//                }
                map.put("nowPrice", transitionService.getTbTransitionDxPriceByPac(cusId, entry.getKey(), cardId, pacId));
            } else {
                map.put("tjCategory",null);
                map.put("pacName", "单项");
                List<TbTransition> tbTransitionList = entry.getValue();
                if (null != tbTransitionList && tbTransitionList.size() > 0) {
                    BigDecimal money1 = new BigDecimal("0.00");
                    BigDecimal money2 = new BigDecimal("0.00");
                    for (TbTransition tbTransition : tbTransitionList) {
                        money1 = money1.add(tbTransition.getOrdPrice());
                        money2 = money2.add(tbTransition.getNowPrice());
                    }
                    map.put("ordPrice", money1);
                    map.put("nowPrice", money2);
                }
            }
            map.put("parentName", projectService.getById(entry.getKey()).getProName());
            map.put("list", entry.getValue());
            list.add(map);
        }
        return list;
    }


    private List<Map<String, Object>> getMap(String cusId, String cardId, List<TbTransition> transitionList) {

//        List<TbTransition> transitionList = null;
//        if (redisCache.hasKey(cardId + cusId)) {
//            transitionList = redisCache.getCacheList(cardId + cusId);
//        } else {
//        transitionList = transitionService.getTbTransitionListByCusId(cusId, cardId);
//        }
        if (null == transitionList) return null;
        Map<Long, List<TbTransition>> collect = transitionList.stream().collect(Collectors.groupingBy(TbTransition::getParentProId));
        List<Map<String, Object>> list = new ArrayList<>();
        for (Map.Entry<Long, List<TbTransition>> entry : collect.entrySet()) {
            Map<String, Object> map = new HashMap<>();
            Long pacId = entry.getValue().get(0).getPacId();
            map.put("proPrantId", entry.getKey().toString());
            if (null != pacId) {
                TjPackage aPackage = tjPackageService.getById(entry.getValue().get(0).getPacId());
                map.put("tjCategory",aPackage.getTjCategory());
                map.put("pacName", aPackage.getPacName());
                TjProject tjProject = projectService.getById(entry.getKey());
//                TjPackageProject project = tjPackageProjectService.getOne(new LambdaQueryWrapper<TjPackageProject>().eq(TjPackageProject::getPacId, pacId)
//                        .eq(TjPackageProject::getProId, entry.getKey()));
                map.put("ordPrice", tjProject.getProPrice());
//                if (null != project) {
//                    map.put("nowPrice", project.getPriceNow());
//                } else {
//                    map.put("nowPrice", tjProject.getProPrice());
//                }
                map.put("nowPrice",tjProject.getProPrice());
            } else {
                map.put("tjCategory",null);
                map.put("pacName", "单项");
                List<TbTransition> tbTransitionList = entry.getValue();
                if (null != tbTransitionList && tbTransitionList.size() > 0) {
@@ -1915,13 +2084,17 @@
        LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
        wq0.eq(TjOrder::getTjNumber, tjNumber);
        TjOrder tjOrder = tjOrderService.getOne(wq0);

        if (null != tjOrder) {
            TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
            customer.setCardId("0");
            tjCustomerService.updateById(customer);

            LambdaQueryWrapper<TjOrderDetail> wq11 = new LambdaQueryWrapper<>();
            wq11.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
            wq11.eq(TjOrderDetail::getTjStatus, 0);
            wq11.isNotNull(TjOrderDetail::getFlowingWaterId);
            List<TjOrderDetail> list = tjOrderDetailService.list(wq11);

            if (list != null) {
                Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
                SysUser sysUser = userService.getById(userId);
@@ -2122,14 +2295,84 @@
        return AjaxResult.success(transitionService.remove(wq));
    }

    @GetMapping("/getTransitionInfo")
    @ApiOperation(value = "根据体检号获取汇总和明细的数据")
    public AjaxResult getTransitionInfo(@RequestParam("tjNumber")String tjNumber){
        QueryWrapper<TbTransition> wrapper = new QueryWrapper<>();
        wrapper.select("parent_pro_id","parent_pro_name","sum(ord_price) as ord_price")
                .eq("tj_num",tjNumber)
                .groupBy("parent_pro_name");
        List<TbTransition> list = transitionService.list(wrapper);
        List<Long> parentProIds = list.stream().map(item -> item.getParentProId()).collect(Collectors.toList());
        LambdaQueryWrapper<TjProject> projectQueryWrapper = new LambdaQueryWrapper<>();
        projectQueryWrapper.in(TjProject::getProId,parentProIds);
        List<TjProject> projects = projectService.list(projectQueryWrapper);
        JSONArray huiZong = JSONUtil.createArray();
        int index = 1;
        for (TjProject project : projects) {
            LambdaQueryWrapper<SysDept> queryWrapper = new LambdaQueryWrapper<>();
            queryWrapper.eq(SysDept::getDeptId,project.getDeptId());
            SysDept dept = sysDeptService.getOne(queryWrapper);
            for (TbTransition tbTransition : list) {
                if (tbTransition.getParentProId().toString().equals(project.getProId().toString())){
                    JSONObject obj = JSONUtil.createObj();
                    obj.putOpt("index",index++);
                    obj.putOpt("parent_pro_name",tbTransition.getParentProName());
                    obj.putOpt("price",tbTransition.getOrdPrice());
                    obj.putOpt("ks",dept.getDeptName());
                    huiZong.add(obj);
                }
            }
        }
        wrapper = new QueryWrapper<>();
        wrapper.eq("tj_num",tjNumber);
        list = transitionService.list(wrapper);
        JSONArray info = JSONUtil.createArray();
        index = 1;
        for (TbTransition tbTransition : list) {
            JSONObject obj = JSONUtil.createObj();
            obj.putOpt("index",index++);
            obj.putOpt("parent_pro_name",tbTransition.getParentProName());
            obj.putOpt("pro_name",tbTransition.getProName());
            BigDecimal ordPrice = tbTransition.getOrdPrice();
            obj.putOpt("zongjia",ordPrice);
            QueryWrapper<TjProject> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("pro_id",tbTransition.getProId());
            TjProject tjProject = projectService.getOne(queryWrapper);
            Integer num = tjProject.getSl();
            obj.putOpt("num",num);
            BigDecimal price = ordPrice.divide(new BigDecimal(num));
            obj.putOpt("danjia",price);
            Date createTime = tbTransition.getCreateTime();
            SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            obj.putOpt("time",dateFormat.format(createTime));
            info.put(obj);
        }
        HashMap<String, Object> map = new HashMap<>();
        map.put("huizong",huiZong);
        map.put("info",info);
        return AjaxResult.success().put("data",map);
    }

    public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
        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()));
         if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
             tjOrderDetailService.saveJSYTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
         }else {
             tjOrderDetailService.saveTjOrderDetailsByCusId(tjCustomer.getCusIdcard(), String.valueOf(tjOrder.getOrderId()), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
         }

        tjOrderDetailService.saveTjPureToneTesByCusId(tjCustomer.getCusIdcard(), tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()));
        //修改每项的原价现价 //修改临时表体检号
        transitionService.updateTbTransitionPriceByCusId(tjCustomer.getCusIdcard(), discount, tjOrder.getTjNumber());
        //添加remark表数据
        remarkService.saveTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));
        if(null !=tjOrder.getTjCategory() && tjOrder.getTjCategory().equals("13")){
            remarkService.saveJSYTjOrderRemarkByOrderId(tjOrder.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjOrder.getOrderId()));

        }else {
            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) {
@@ -2290,16 +2533,50 @@

        TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
        if (null != order) {
            String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
            if (null != payByTjNum) {
                return AjaxResult.success("该用户已收费不可撤销签到!");
            }
//            String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
//            if (null != payByTjNum) {
//                return AjaxResult.error("该用户已收费不可撤销签到!");
//            }
            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
            tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
            remarkService.deletedOrderRemarkByTjNum(tjNum);
            tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
            transitionService.deletedTbTransitionByTjNum(tjNum);
            transitionService.updateTbTransitionByTjNum(tjNum);

            TjCustomer customer = tjCustomerService.getById(order.getUserId());
            if (null != customer) {
                customer.setCardId("0");
                tjCustomerService.updateById(customer);
            }
            String configByKey = configService.selectConfigByKey("sfkqdyhis");
            if (configByKey.equals("Y")) {
                HashMap<String, Object> map = new HashMap<>();
                map.put("cardtype", "4");
                map.put("input", order.getCardId());
                LocalDate currentDate = LocalDate.now();
                LocalDateTime startOfDay = currentDate.atStartOfDay();
                LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                String ksrq = startOfDay.format(formatter);
                String jsrq = nineteenOClock.format(formatter);
                map.put("ksrq", ksrq);
                map.put("jsrq", jsrq);
                AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
                if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("撤销失败,门诊患者费用清单信息不为空");
                } else {
                    boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
                    if (zfHisApiMethods) {
                        return AjaxResult.success("撤销成功", map);
                    } else {
                        TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                        return AjaxResult.error("撤销失败,调用作废出现失败");
                    }
                }
            }

//            transitionService.updateTbTransitionByTjNum(tjNum);
            return AjaxResult.success("撤销成功!!!");
        }
        return AjaxResult.success("签到记录不存在!");
@@ -2380,7 +2657,7 @@
    @ApiOperation(value = "批量生成PDF")
    public AjaxResult makeTjPDF(@RequestBody List<String> reservations) {
        QueryWrapper<TjOrder> queryWrapper = new QueryWrapper<>();
        queryWrapper.in("reservation_id",reservations);
        queryWrapper.in("reservation_id", reservations);
        List<TjOrder> tjNumbers = tjOrderService.list(queryWrapper);
        Map<String, Object> map = null;
        try {
@@ -2417,5 +2694,179 @@
            return AjaxResult.error(e.getMessage());
        }
    }


    @GetMapping("/delTbBycusCardIdAndProId")
    @ApiOperation(value = "根据客户身份证号和项目父项id删除临时表数据")
    @Transactional
    public AjaxResult delTbBycusCardIdAndProId(@RequestParam @ApiParam(value = "身份证号") String cusCardId,
                                               @RequestParam @ApiParam(value = "父项id") String proId) {

        if (transitionService.delTbBycusCardIdAndProId(cusCardId, proId)) {
            return AjaxResult.success();
        }
        return AjaxResult.error("记录不存在!");
    }


    @GetMapping("/revokeTjOrderByTjCardId")
    @ApiOperation(value = "根据就诊号撤销申请记录")
    @Transactional
    public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "就诊号") String cardId) {

        TjOrder order = new TjOrder();
        order.setCardId(cardId);
        String configByKey = configService.selectConfigByKey("sfkqdyhis");
        if (configByKey.equals("Y")) {
            HashMap<String, Object> map = new HashMap<>();
            map.put("cardtype", "4");
            map.put("input", order.getCardId());
            LocalDate currentDate = LocalDate.now();
            LocalDateTime startOfDay = currentDate.atStartOfDay();
            LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
            String ksrq = startOfDay.format(formatter);
            String jsrq = nineteenOClock.format(formatter);
            map.put("ksrq", ksrq);
            map.put("jsrq", jsrq);
            AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
            if (Integer.parseInt(String.valueOf(result.get("code"))) == 200) {
                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                return AjaxResult.error("撤销失败,门诊患者费用清单信息不为空");
            } else {
                boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
                if (zfHisApiMethods) {
                    return AjaxResult.success("撤销成功", map);
                } else {
                    TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
                    return AjaxResult.error("撤销失败,调用作废出现失败");
                }
            }
        }
        return AjaxResult.success();
    }


    @GetMapping("/revokeTjOrderByTjh")
    @ApiOperation(value = "根据就体检号删除记录")
    @Transactional
    public AjaxResult revokeTjOrderByTjh(@RequestParam @ApiParam(value = "体检号") String tjNum) {

        TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
        if (null != order) {
//            String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
//            if (null != payByTjNum) {
//                return AjaxResult.error("该用户已收费不可撤销签到!");
//            }
            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
            tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
            remarkService.deletedOrderRemarkByTjNum(tjNum);
            tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
            transitionService.deletedTbTransitionByTjNum(tjNum);
        }
        return AjaxResult.success();
    }


    @GetMapping("/getBlproByTjh")
    @ApiOperation(value = "根据体检号获取补录项目记录")
    @Transactional
    public AjaxResult getBlproByTjh(@RequestParam @ApiParam(value = "体检号") String tjNum) {

        TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
        if (null != order) {
            LambdaQueryWrapper<TjProBl> wq=new LambdaQueryWrapper<>();
            wq.eq(TjProBl::getTjh,tjNum);
            List<TjProBl> blList = blService.list(wq);
            if(null !=blList && blList.size()>0){
                for (TjProBl bl : blList) {
                    LambdaQueryWrapper<TjOrderRemark>wqr=new LambdaQueryWrapper<>();
                    wqr.eq(TjOrderRemark::getJxbz,bl.getBldh());
                    List<TjOrderRemark> remarkList = remarkService.list(wqr);
                    if(null !=remarkList && remarkList.size()>0){
                        List<Long> collect = remarkList.stream().map(TjOrderRemark::getProId).collect(Collectors.toList());
                        LambdaQueryWrapper<TjProject> wqp=new LambdaQueryWrapper<>();
                        wqp.in(TjProject::getProId,collect);
                        List<TjProject> projectList = projectService.list(wqp);
                        for (TjProject project : projectList) {
                            project.setChildren(projectService.getTjProjectListBySoneId(String.valueOf(project.getProId())));
                        }
                        bl.setProjectList(projectList);
                    }
                }
                return AjaxResult.success(blList);
            }
            return AjaxResult.success(null);
        }
        return AjaxResult.error("暂无体检记录");
    }



    @PostMapping("/revokeBlProByBldhAndTjh")
    @ApiOperation(value = "根据补录单号和体检号删除记录")
    @Transactional
    public AjaxResult revokeBlProByBldhAndTjh(@RequestBody TjProBlDto dto) {

        if(null ==dto.getBldhs() || dto.getBldhs().size()==0){
            return AjaxResult.error("请选择要撤销的补录项目");
        }

        TjOrder order = tjOrderService.getOrderByTjNum(dto.getTjh());
        if (null != order) {
            String configByKey = configService.selectConfigByKey("sfkqdyhis");
            if(null !=configByKey && configByKey.equals("Y")){
                HashMap<String, Object> hisRequestParams = new HashMap<>();
                hisRequestParams.put("patientId",order.getCardId());
                AjaxResult queryPay = hisApiGetMethodService.getHISDataNew("QueryPay", hisRequestParams);
                if (Integer.parseInt(queryPay.get("code").toString()) == 200) {
                    List<Map<String, String>> data = (List<Map<String, String>>) queryPay.get("data");
                    BigDecimal cateFeeAll = BigDecimal.ZERO;
                    List<String> advIds=new ArrayList<>();
                    for (Map<String, String> datum : data) {
                        String advId = datum.get("Adv_Id").split("_")[1];
                        BigDecimal cateFee = new BigDecimal(datum.get("CateFee"));
                        cateFeeAll = cateFeeAll.add(cateFee);
                        advIds.add(advId);
                    }
                    if (advIds.containsAll(dto.getBldhs()) && cateFeeAll.compareTo(BigDecimal.ZERO)!=0 ){
                        return AjaxResult.error("改项目已缴费不可撤销!!!");
                    }
                }
            }
            for (String bldh : dto.getBldhs()) {
               remarkService.deleteTjOrderDetailByjxbz(bldh);
                tjOrderDetailService.deleteTjOrderDetailByjxbz(bldh);
                tjFlowingWaterService.deleteTjOrderDetailByjxbz(bldh);
                transitionService.deleteTjOrderDetailByjxbz(bldh);
                blService.remove(new LambdaQueryWrapper<TjProBl>().eq(TjProBl::getTjh,dto.getTjh()).eq(TjProBl::getBldh,bldh));
            }
            return AjaxResult.success();
        }
        return AjaxResult.error();
    }


    @PostMapping("/addYaoPinShenQing")
    @ApiOperation(value = "药品信息申请")
    @Transactional
    public AjaxResult addYaoPinShenQing(@RequestBody OutpinmedicapplyDto dto){
        AjaxResult result = controller.Outpinmedicapply(dto);
        String result1 = getAjaxResult(result);
        JSONObject object = getJSONObject(result1);
        String code = object.getStr("ResultCode");
        if(null !=code && code.equals("200")){

        }
        return AjaxResult.success();
    }








}