zjh
2024-06-14 d71460e89b4e556aa9f396100004fcdabe98a0ff
zjh 本地 2024/06/14 --2
6个文件已修改
418 ■■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java 373 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -49,6 +49,8 @@
    private HisApiGetMethodService hisApiGetMethodService;
    @Resource
    private ISysConfigService configService;
    @Resource
    private ITbTransitionService transitionService;
    //将方法返回值解析成json格式
    public JSONObject getJSONObject(String builder) {
@@ -65,6 +67,7 @@
    @Transactional
    public AjaxResult HisApiMethods(TjCustomer customer, Long orderId) {
        TjOrder tjOrder = orderService.getById(orderId);
        Date dates = new Date();
        final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
        AjaxResult result = controller.Outpincreateapply(customer);
@@ -77,174 +80,41 @@
            if (null != resultData && resultData.size() > 0) {
                String pationid = resultData.get("PationId").toString();
                if (null != pationid) {
                    customer.setPationId(pationid);
                    customerService.updateById(customer);
                    //检验申请
                    OutpintestapplyDto dto = new OutpintestapplyDto();
                    dto.setHisRegistrationId(customer.getCardId());
                    dto.setSfjz(customer.getCusIdcard());
                    dto.setSqysbm(SecurityUtils.getUsername());
                    dto.setMzksbm("0101");
                    dto.setSjrq(date);
                    dto.setCzybm("00029");
                    dto.setCzyksbm("0101");
                    dto.setSfjz("1");
                    List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
                    List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
                    if (null != detailList && detailList.size() > 0) {
                        LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                        wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                        wq.groupBy(TjProject::getHisXmbm);
                        wq.in(TjProject::getDeptId, "241","317");
                        List<TjProject> projects = projectService.list(wq);
                        if (null != projects && projects.size() > 0) {
                            for (TjProject project : projects) {
                                if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                                    if (null != project.getHisXmbm()) {
                                        OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                                        detailsDto.setMxfyxmbm(project.getHisXmbm());
                                        if(project.getSfzhfy().equals("Y")){
                                        detailsDto.setSfzhfy("1");
                                        }else {
                                            detailsDto.setSfzhfy("0");
                                        }
                                        detailsDto.setSl(1);
                                        detailsDtos.add(detailsDto);
                                    }
                                }
                            }
                customer.setPationId(pationid);
//                customerService.updateById(customer);
   /*             OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
                outpinregapplyDto.setPationid(pationid);
                outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
                outpinregapplyDto.setMzksbm("0101");
                outpinregapplyDto.setCzybm("00029");
                outpinregapplyDto.setSfjz("0");
                outpinregapplyDto.setGhzlbm("01");
                outpinregapplyDto.setYwckbm("0001");
                outpinregapplyDto.setSflstd("0");
                outpinregapplyDto.setGhrq(date);
                //门诊挂号
                AjaxResult ajaxResult = controller.Outpinregapply(outpinregapplyDto);
                String result2 = getAjaxResult(ajaxResult);
                JSONObject object1 = getJSONObject(result2);
                String code1 = object1.getStr("ResultCode");
                if (code1.equals("0")) {
                    JSONArray resultDatas = object1.getJSONArray("ResultData");
                    if (null != resultDatas && resultDatas.size() > 0) {
                        Map<String, Object> resultDatasss = (Map<String, Object>) resultDatas.get(0);
                        String hisRegistrationId = resultDatasss.get("his_registration_id").toString();
                        //门诊医生接诊
                        controller.Outpinconapply(hisRegistrationId, date, SecurityUtils.getUsername());
                        customer.setCardId(hisRegistrationId);
                        customerService.updateById(customer);
                        transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(),hisRegistrationId);
                        if(null !=tjOrder){
                            tjOrder.setCardId(hisRegistrationId);
                            orderService.updateById(tjOrder);
                        }
                    }
                    if (detailsDtos.size()>0) {
                        dto.setDetails(detailsDtos);
                        AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
                        String result5 = getAjaxResult(ajaxResult1);
                        JSONObject object3 = getJSONObject(result5);
                        String code3 = object3.getStr("ResultCode");
                        if (code3.equals("0")) {
                            Map<String, Object> datas = object3.getJSONObject("ResultData");
                            datas.put("cardId", customer.getCardId());
                            JSONObject object4 = JSONUtil.parseObj(datas);
                            LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                            lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintestapply");
                            HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                            hisApiGetMethodService.save(object4, "Outpintestapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dto)));
                        }else {
                            return AjaxResult.error();
                        }
                    }
                    //门诊检查申请
                    OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
                    outpinexamapplyDto.setHisRegistrationId(customer.getCardId());
                    outpinexamapplyDto.setSfzh(customer.getCusIdcard());
                    outpinexamapplyDto.setSqysbm(SecurityUtils.getUsername());
                    outpinexamapplyDto.setMzksbm("0101");
                    outpinexamapplyDto.setCzybm("00029");
                    outpinexamapplyDto.setCzyksbm("0101");
                    List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
                    List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
                    if (null != detailLists && detailLists.size() > 0) {
                        LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                        wq.in(TjProject::getProId, detailLists.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                        wq.groupBy(TjProject::getHisXmbm);
                        wq.in(TjProject::getDeptId, "247", "248", "249", "250", "251", "252", "271", "273", "274", "275","298");
                        List<TjProject> projects = projectService.list(wq);
                        if (null != projects && projects.size() > 0) {
                            for (TjProject project : projects) {
                                if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                                    if (null != project.getHisXmbm()) {
                                        OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                                        detailsDto.setMxfyxmbm(project.getHisXmbm());
                                        if(project.getSfzhfy().equals("Y")){
                                        detailsDto.setSfzhfy("1");
                                        }else {
                                            detailsDto.setSfzhfy("0");
                                        }
                                        detailsDto.setSl(1);
                                        detailsDtoss.add(detailsDto);
                                    }
                                }
                            }
                        }
                    }
                    if (detailsDtoss.size()>0) {
                        outpinexamapplyDto.setDetails(detailsDtoss);
                        AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
                        String result6 = getAjaxResult(ajaxResult2);
                        JSONObject object5 = getJSONObject(result6);
                        String code4 = object5.getStr("ResultCode");
                        if (code4.equals("0")) {
                            Map<String, Object> map = object5.getJSONObject("ResultData");
                            map.put("cardId", customer.getCardId());
                            JSONObject jsonObject = JSONUtil.parseObj(map);
                            LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                            lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinexamapply");
                            HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                            hisApiGetMethodService.save(jsonObject, "Outpinexamapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinexamapplyDto)));
                        }else {
                            return AjaxResult.error();
                        }
                    }
                    //门诊治疗处置申请
                    OutpintreatapplyDto dao = new OutpintreatapplyDto();
                    dao.setHisRegistrationId(customer.getCardId());
                    dao.setSfzh(customer.getCusIdcard());
                    dao.setSqysbm(SecurityUtils.getUsername());
                    dao.setMzksbm("0101");
                    dao.setSjrq(date);
                    dao.setCzybm("00029");
                    dao.setCzyksbm("0101");
                    List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
                    List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
                    if (null != details && details.size() > 0) {
                        LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                        wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                        wq.groupBy(TjProject::getHisXmbm);
                        wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
                        List<TjProject> projects = projectService.list(wq);
                        if (null != projects && projects.size() > 0) {
                            for (TjProject project : projects) {
                                if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                                    if (null != project.getHisXmbm()) {
                                        OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                                        detailsDto.setMxfyxmbm(project.getHisXmbm());
                                        if (project.getSfzhfy().equals("Y")) {
                                            detailsDto.setSfzhfy("1");
                                        } else {
                                            detailsDto.setSfzhfy("0");
                                        }
                                        detailsDto.setSl(1);
                                        detailDtos.add(detailsDto);
                                    }
                                }
                            }
                        }
                    }
                    if (detailDtos.size()>0) {
                        dao.setDetails(detailDtos);
                        AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
                        String mzylyzsq2 = getAjaxResult(mzylyzsq1);
                        JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
                        String code5 = mzylyzsq3.getStr("ResultCode");
                        if (code5.equals("0")) {
                            Map<String, Object> map = mzylyzsq3.getJSONObject("ResultData");
                            map.put("cardId", customer.getCardId());
                            JSONObject jsonObject = JSONUtil.parseObj(map);
                            LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                            lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintreatapply");
                            HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                            hisApiGetMethodService.save(jsonObject, "Outpintreatapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dao)));
                        }else {
                            return AjaxResult.error();
                        }
                    }
                }*/
                    AjaxResult error = tijianshenqing(customer, date);
                    if (error != null) return error;
                    return AjaxResult.success();
                }
            }
@@ -253,6 +123,177 @@
    }
    //体检对his申请单调用方法
    private AjaxResult tijianshenqing(TjCustomer customer, String date) {
        //检验申请
        OutpintestapplyDto dto = new OutpintestapplyDto();
        dto.setHisRegistrationId(customer.getCardId());
        dto.setSfjz(customer.getCusIdcard());
        dto.setSqysbm(SecurityUtils.getUsername());
        dto.setMzksbm("0101");
        dto.setSjrq(date);
        dto.setCzybm("00029");
        dto.setCzyksbm("0101");
        dto.setSfjz("1");
        List<TbTransition> detailList = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
        List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
        if (null != detailList && detailList.size() > 0) {
            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
            wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
            wq.groupBy(TjProject::getHisXmbm);
            wq.in(TjProject::getDeptId, "241","317");
            List<TjProject> projects = projectService.list(wq);
            if (null != projects && projects.size() > 0) {
                for (TjProject project : projects) {
                    if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                        if (null != project.getHisXmbm()) {
                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                            detailsDto.setMxfyxmbm(project.getHisXmbm());
                            if(project.getSfzhfy().equals("Y")){
                            detailsDto.setSfzhfy("1");
                            }else {
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(1);
                            detailsDtos.add(detailsDto);
                        }
                    }
                }
            }
        }
        if (detailsDtos.size()>0) {
            dto.setDetails(detailsDtos);
            AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
            String result5 = getAjaxResult(ajaxResult1);
            JSONObject object3 = getJSONObject(result5);
            String code3 = object3.getStr("ResultCode");
            if (code3.equals("0")) {
                Map<String, Object> datas = object3.getJSONObject("ResultData");
                datas.put("cardId", customer.getCardId());
                JSONObject object4 = JSONUtil.parseObj(datas);
                LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintestapply");
                HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                hisApiGetMethodService.save(object4, "Outpintestapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dto)));
            }else {
                return AjaxResult.error();
            }
        }
        //门诊检查申请
        OutpinexamapplyDto outpinexamapplyDto = new OutpinexamapplyDto();
        outpinexamapplyDto.setHisRegistrationId(customer.getCardId());
        outpinexamapplyDto.setSfzh(customer.getCusIdcard());
        outpinexamapplyDto.setSqysbm(SecurityUtils.getUsername());
        outpinexamapplyDto.setMzksbm("0101");
        outpinexamapplyDto.setCzybm("00029");
        outpinexamapplyDto.setCzyksbm("0101");
        List<TbTransition> detailLists = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
        List<OutpintestapplyDetailsDto> detailsDtoss = new ArrayList<>();
        if (null != detailLists && detailLists.size() > 0) {
            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
            wq.in(TjProject::getProId, detailLists.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
            wq.groupBy(TjProject::getHisXmbm);
            wq.in(TjProject::getDeptId, "247", "248", "249", "250", "251", "252", "271", "273", "274", "275","298");
            List<TjProject> projects = projectService.list(wq);
            if (null != projects && projects.size() > 0) {
                for (TjProject project : projects) {
                    if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                        if (null != project.getHisXmbm()) {
                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                            detailsDto.setMxfyxmbm(project.getHisXmbm());
                            if(project.getSfzhfy().equals("Y")){
                            detailsDto.setSfzhfy("1");
                            }else {
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(1);
                            detailsDtoss.add(detailsDto);
                        }
                    }
                }
            }
        }
        if (detailsDtoss.size()>0) {
            outpinexamapplyDto.setDetails(detailsDtoss);
            AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
            String result6 = getAjaxResult(ajaxResult2);
            JSONObject object5 = getJSONObject(result6);
            String code4 = object5.getStr("ResultCode");
            if (code4.equals("0")) {
                Map<String, Object> map = object5.getJSONObject("ResultData");
                map.put("cardId", customer.getCardId());
                JSONObject jsonObject = JSONUtil.parseObj(map);
                LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinexamapply");
                HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                hisApiGetMethodService.save(jsonObject, "Outpinexamapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinexamapplyDto)));
            }else {
                return AjaxResult.error();
            }
        }
        //门诊治疗处置申请
        OutpintreatapplyDto dao = new OutpintreatapplyDto();
        dao.setHisRegistrationId(customer.getCardId());
        dao.setSfzh(customer.getCusIdcard());
        dao.setSqysbm(SecurityUtils.getUsername());
        dao.setMzksbm("0101");
        dao.setSjrq(date);
        dao.setCzybm("00029");
        dao.setCzyksbm("0101");
        List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
        List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
        if (null != details && details.size() > 0) {
            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
            wq.in(TjProject::getProId, details.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
            wq.groupBy(TjProject::getHisXmbm);
            wq.in(TjProject::getDeptId, "100", "240", "253", "254", "255", "257", "258", "259", "269", "270");
            List<TjProject> projects = projectService.list(wq);
            if (null != projects && projects.size() > 0) {
                for (TjProject project : projects) {
                    if (0 == project.getProParentId() && project.getProPrice().compareTo(BigDecimal.ZERO) != 0) {
                        if (null != project.getHisXmbm()) {
                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                            detailsDto.setMxfyxmbm(project.getHisXmbm());
                            if (project.getSfzhfy().equals("Y")) {
                                detailsDto.setSfzhfy("1");
                            } else {
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(1);
                            detailDtos.add(detailsDto);
                        }
                    }
                }
            }
        }
        if (detailDtos.size()>0) {
            dao.setDetails(detailDtos);
            AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
            String mzylyzsq2 = getAjaxResult(mzylyzsq1);
            JSONObject mzylyzsq3 = getJSONObject(mzylyzsq2);
            String code5 = mzylyzsq3.getStr("ResultCode");
            if (code5.equals("0")) {
                Map<String, Object> map = mzylyzsq3.getJSONObject("ResultData");
                map.put("cardId", customer.getCardId());
                JSONObject jsonObject = JSONUtil.parseObj(map);
                LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintreatapply");
                HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                hisApiGetMethodService.save(jsonObject, "Outpintreatapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dao)));
            }else {
                return AjaxResult.error();
            }
        }
        return null;
    }
    //退费后取消接诊作废申请单等操作
    @Transactional
    public boolean ZfHisApiMethods(TjCustomer customer, TjOrder order) {
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCustomerController.java
@@ -147,7 +147,7 @@
            LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper = new LambdaQueryWrapper<>();
            customerLambdaQueryWrapper.eq(TjCustomer::getCusIdcard, cusIdcard);
            TjCustomer tjCustomerServiceOne = tjCustomerService.getOne(customerLambdaQueryWrapper);
            if(null ==tjCustomerServiceOne){
            if (null == tjCustomerServiceOne) {
                return AjaxResult.error("该人员信息不存在请先进行登记!!!");
            }
            final String getInfoFromSqlData = sysConfigService.selectConfigByKey("getInfoFromSqlData");
@@ -346,7 +346,7 @@
                tjCustomer.setDiscount(tjReservation.getDiscount());
                tjCustomer.setGroupingId(tjReservation.getGroupingId());
                return success(tjCustomer);
            }else {
            } else {
                return AjaxResult.success("暂无预约信息", tjCustomerServiceOne);
            }
        }
@@ -479,16 +479,16 @@
//        }
        tjCustomer.setCusNumber(0L);
        String config = sysConfigService.selectConfigByKey("sfkqdyhis");
        if(null !=config && config.equals("Y")){
        if (null != config && config.equals("Y")) {
            AjaxResult tjCustomer1 = suijieHisXinXi(tjCustomer, date);
            if (tjCustomer1 != null) return tjCustomer1;
        }else {
        } else {
            if (tjCustomerService.save(tjCustomer)) {
                return AjaxResult.success(tjCustomer);
            }
        }
        return AjaxResult.error();
}
    }
    private AjaxResult suijieHisXinXi(TjCustomer tjCustomer, String date) {
        AjaxResult result = controller.Outpincreateapply(tjCustomer);
@@ -501,9 +501,12 @@
            if (null != resultData && resultData.size() > 0) {
                String pationid = resultData.get("PationId").toString();
                if (null != pationid) {
                    tjCustomer.setPationId(pationid);
//                    tjCustomerService.updateById(tjCustomer);
      /*
                        OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
                        outpinregapplyDto.setPationid(pationid);
//                    outpinregapplyDto.setHisRegistrationId(pationid);
                        outpinregapplyDto.setSqysbm(SecurityUtils.getUsername());
                        outpinregapplyDto.setMzksbm("0101");
                        outpinregapplyDto.setCzybm("00029");
@@ -537,8 +540,8 @@
                                    }
                                }
                            }
                        }
                    }
                        }*/
                }
            }
            if (tjCustomerService.save(tjCustomer)) {
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -851,14 +851,16 @@
        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);
ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java
@@ -225,4 +225,14 @@
    @Select("SELECT SUM(a.now_price) FROM tb_transition a WHERE a.cus_id=#{cusId} AND a.parent_pro_id=#{proId} and a.card_id=#{cardId} and a.pac_id=#{pacId}")
    BigDecimal getTbTransitionDxPriceByPac(@Param("cusId")String cusId,@Param("proId")Long proId,@Param("cardId")String cardId,@Param("pacId")Long pacId);
    @Update("UPDATE tb_transition a \n" +
            "SET \n" +
            "a.card_id=#{cardId}\n" +
            "WHERE\n" +
            "\ta.cus_id =#{idCard}\n" +
            "\tAND ISNULL(a.tj_num)")
    boolean updateCardIdByTjNumAndIdCard(@Param("idCard")String idCard,@Param("cardId")String cardId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/ITbTransitionService.java
@@ -114,4 +114,7 @@
    BigDecimal getTbTransitionDxPriceByPac(String cusId,Long proId,String cardId,Long pacId);
    String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId);
     boolean updateCardIdByTjNumAndIdCard(String idCard,String cardId);
}
ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/TbTransitionServiceImpl.java
@@ -186,4 +186,9 @@
    public String selectPacIdByTbTransitionTjNumAndProId(String tjNum,String cardId) {
        return tbTransitionMapper.selectPacIdByTbTransitionTjNumAndProId(tjNum,cardId);
    }
    @Override
    public boolean updateCardIdByTjNumAndIdCard(String idCard, String cardId) {
        return tbTransitionMapper.updateCardIdByTjNumAndIdCard(idCard,cardId);
    }
}