zjh 本地 2024/06/19 --1

zjh

2024-06-19 6d09f4ac6ee4718acd131f234f24ad1ac3c2ce3c

zjh 本地 2024/06/19 --1

 ltkj-admin/src/main/java/com/ltkj/web/controller/app/ReportController.java

@@ -121,7 +121,8 @@
     */
    @GetMapping("/getRelativeReportList")
    @ApiOperation(value = "小程序-查询亲友最新报告")
    public AjaxResult getRelativeReportList(@RequestParam @ApiParam(value = "姓名") String cusName, @RequestParam @ApiParam(value = "身份证号") String cusIdcard) {
    public AjaxResult getRelativeReportList(@RequestParam @ApiParam(value = "姓名") String cusName,
                                            @RequestParam @ApiParam(value = "身份证号") String cusIdcard) {
        LambdaQueryWrapper<TjCustomer> wq1 = new LambdaQueryWrapper<>();
        wq1.eq(TjCustomer::getCusName, cusName);
        wq1.eq(TjCustomer::getCusIdcard, cusIdcard);

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java

@@ -1,6 +1,7 @@
package com.ltkj.web.controller.his;


import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
@@ -11,6 +12,7 @@
import com.ltkj.hosp.hisDto.*;
import com.ltkj.hosp.service.*;
import com.ltkj.system.service.ISysConfigService;
import jdk.nashorn.internal.runtime.logging.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
@@ -71,58 +73,68 @@

    //对接his总接口  注册挂号接诊申请单操作
    @Transactional
    @Logger
    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);
        String result1 = getAjaxResult(result);
        JSONObject object = getJSONObject(result1);
        String code = object.getStr("ResultCode");
        if (code.equals("0")) {
            JSONArray resultDatass = object.getJSONArray("ResultData");
            Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
            if (null != resultData && resultData.size() > 0) {
                String pationid = resultData.get("PationId").toString();
                if (null != pationid) {
                customer.setPationId(pationid);
//        AjaxResult result = controller.Outpincreateapply(customer);
//        String result1 = getAjaxResult(result);
//        JSONObject object = getJSONObject(result1);
//        String code = object.getStr("ResultCode");
//        if (code.equals("0")) {
//            JSONArray resultDatass = object.getJSONArray("ResultData");
//            Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
//            if (null != resultData && resultData.size() > 0) {
//                String pationid = resultData.get("PationId").toString();
//                if (null != pationid) {
//                customer.setPationId(pationid);
//                customerService.updateById(customer);
        OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
        outpinregapplyDto.setPationid(customer.getPationId());
        outpinregapplyDto.setSqysbm("00029");
        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();
                //保存挂号入参出参
                resultDatasss.put("cardId", customer.getCardId());
                JSONObject object4 = JSONUtil.parseObj(resultDatasss);
                LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpinregapply");
                HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                hisApiGetMethodService.save(object4, "Outpinregapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinregapplyDto)));

                //门诊医生接诊
                controller.Outpinconapply(hisRegistrationId, date, "00029");
                customer.setCardId(hisRegistrationId);
                customerService.updateById(customer);
                OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
                outpinregapplyDto.setPationid(pationid);
                outpinregapplyDto.setSqysbm("00029");
                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,"00029");
                        customer.setCardId(hisRegistrationId);
                        customerService.updateById(customer);
                        transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(),hisRegistrationId,tjOrder.getTjNumber());
                        tjOrder.setCardId(hisRegistrationId);
                        orderService.updateById(tjOrder);
                    }
                }
                    AjaxResult error = tijianshenqing(customer, date);
                    if (error != null) return error;
                    return AjaxResult.success();
                }
                transitionService.updateCardIdByTjNumAndIdCard(customer.getCusIdcard(), hisRegistrationId, tjOrder.getTjNumber());
                tjOrder.setCardId(hisRegistrationId);
                orderService.updateById(tjOrder);
            }
            AjaxResult error = tijianshenqing(customer, date);
            if (error != null) return error;
            return AjaxResult.success();
        }

//                }
//            }
//        }
        return AjaxResult.error();
    }

@@ -132,20 +144,20 @@
        //检验申请
        OutpintestapplyDto dto = new OutpintestapplyDto();
        dto.setHisRegistrationId(customer.getCardId());
        dto.setSfjz(customer.getCusIdcard());
        dto.setSfzh(customer.getCusIdcard());
        dto.setSqysbm("00029");
        dto.setMzksbm("0101");
        dto.setSjrq(date);
        dto.setCzybm("00029");
        dto.setCzyksbm("0101");
        dto.setSfjz("1");
        dto.setSfjz("0");
        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");
            wq.in(TjProject::getDeptId, "241", "317");
            List<TjProject> projects = projectService.list(wq);
            if (null != projects && projects.size() > 0) {
                for (TjProject project : projects) {
@@ -153,9 +165,9 @@
                        if (null != project.getHisXmbm()) {
                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                            detailsDto.setMxfyxmbm(project.getHisXmbm());
                            if(project.getSfzhfy().equals("Y")){
                            detailsDto.setSfzhfy("1");
                            }else {
                            if (project.getSfzhfy().equals("Y")) {
                                detailsDto.setSfzhfy("1");
                            } else {
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(project.getSl());
@@ -165,7 +177,7 @@
                }
            }
        }
        if (detailsDtos.size()>0) {
        if (detailsDtos.size() > 0) {
            dto.setDetails(detailsDtos);
            AjaxResult ajaxResult1 = controller.Outpintestapply(dto);
            String result5 = getAjaxResult(ajaxResult1);
@@ -177,7 +189,7 @@
                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                    tree.setCardId(dto.getHisRegistrationId());
                    LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
                    wrapper4.eq(TjCustomer::getCardId,tree.getCardId());
                    wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
                    TjCustomer tjCustomer = customerService.getOne(wrapper4);
                    tree.setPationid(tjCustomer.getPationId());
                    JSONObject resultData = object3.getJSONObject("ResultData");
@@ -187,25 +199,25 @@
                    tree.setHisXmdm(mxfyxmbm);
                    tree.setType("检验");
                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjProject::getHisXmbm,mxfyxmbm);
                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
                    List<TjProject> list = projectService.list(wrapper);
                    String tj_price = "";
                    for (TjProject project : list) {
                        tj_price+= project.getProPrice()+"、";
                        tj_price += project.getProPrice() + "、";
                    }
                    tree.setTjPrice(tj_price.substring(0,tj_price.length()-1));
                    tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                    if (detail.getSfzhfy().equals("1"))
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm,mxfyxmbm);
                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm,mxfyxmbm);
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()){
                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
                        wrapper2.eq(LtkjMxjfxmzd::getXmdm,xmdm);
                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm,mxjfxmzd.getEjkmdm());
                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
                        tree.setXmfl(ejjfxmzd.getYjkmdm());
                    }
@@ -219,9 +231,10 @@
//                HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
//                hisApiGetMethodService.save(object4, "Outpintestapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dto)));

            }else {
                return AjaxResult.error();
            }
//            else {
//                return AjaxResult.error("检验申请失败!");
//            }
        }

        //门诊检查申请
@@ -232,13 +245,14 @@
        outpinexamapplyDto.setMzksbm("0101");
        outpinexamapplyDto.setCzybm("00029");
        outpinexamapplyDto.setCzyksbm("0101");
        outpinexamapplyDto.setSfjz("0");
        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");
            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) {
@@ -246,9 +260,9 @@
                        if (null != project.getHisXmbm()) {
                            OutpintestapplyDetailsDto detailsDto = new OutpintestapplyDetailsDto();
                            detailsDto.setMxfyxmbm(project.getHisXmbm());
                            if(project.getSfzhfy().equals("Y")){
                            detailsDto.setSfzhfy("1");
                            }else {
                            if (project.getSfzhfy().equals("Y")) {
                                detailsDto.setSfzhfy("1");
                            } else {
                                detailsDto.setSfzhfy("0");
                            }
                            detailsDto.setSl(project.getSl());
@@ -259,7 +273,7 @@
                }
            }
        }
        if (detailsDtoss.size()>0) {
        if (detailsDtoss.size() > 0) {
            outpinexamapplyDto.setDetails(detailsDtoss);
            AjaxResult ajaxResult2 = controller.Outpinexamapply(outpinexamapplyDto);
            String result6 = getAjaxResult(ajaxResult2);
@@ -271,7 +285,7 @@
                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                    tree.setCardId(outpinexamapplyDto.getHisRegistrationId());
                    LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
                    wrapper4.eq(TjCustomer::getCardId,tree.getCardId());
                    wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
                    TjCustomer tjCustomer = customerService.getOne(wrapper4);
                    tree.setPationid(tjCustomer.getPationId());
                    JSONObject resultData = object5.getJSONObject("ResultData");
@@ -281,25 +295,25 @@
                    tree.setHisXmdm(mxfyxmbm);
                    tree.setType("检查");
                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjProject::getHisXmbm,mxfyxmbm);
                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
                    List<TjProject> list = projectService.list(wrapper);
                    String tj_price = "";
                    for (TjProject project : list) {
                        tj_price+= project.getProPrice()+"、";
                        tj_price += project.getProPrice() + "、";
                    }
                    tree.setTjPrice(tj_price.substring(0,tj_price.length()-1));
                    tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                    if (detail.getSfzhfy().equals("1"))
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm,mxfyxmbm);
                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm,mxfyxmbm);
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()){
                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
                        wrapper2.eq(LtkjMxjfxmzd::getXmdm,xmdm);
                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm,mxjfxmzd.getEjkmdm());
                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
                        tree.setXmfl(ejjfxmzd.getYjkmdm());
                    }
@@ -313,9 +327,10 @@
//                HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
//                hisApiGetMethodService.save(jsonObject, "Outpinexamapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(outpinexamapplyDto)));

            }else {
                return AjaxResult.error();
            }
//            else {
//                return AjaxResult.error("检查申请失败!");
//            }
        }


@@ -328,6 +343,7 @@
        dao.setSjrq(date);
        dao.setCzybm("00029");
        dao.setCzyksbm("0101");
        dao.setSfjz("0");
        List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(), customer.getCardId());
        List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
        if (null != details && details.size() > 0) {
@@ -355,7 +371,7 @@
                }
            }
        }
        if (detailDtos.size()>0) {
        if (detailDtos.size() > 0) {
            dao.setDetails(detailDtos);
            AjaxResult mzylyzsq1 = controller.Outpintreatapply(dao);
            String mzylyzsq2 = getAjaxResult(mzylyzsq1);
@@ -367,7 +383,7 @@
                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                    tree.setCardId(dao.getHisRegistrationId());
                    LambdaQueryWrapper<TjCustomer> wrapper4 = new LambdaQueryWrapper<>();
                    wrapper4.eq(TjCustomer::getCardId,tree.getCardId());
                    wrapper4.eq(TjCustomer::getCardId, tree.getCardId());
                    TjCustomer tjCustomer = customerService.getOne(wrapper4);
                    tree.setPationid(tjCustomer.getPationId());
                    JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
@@ -377,25 +393,25 @@
                    tree.setHisXmdm(mxfyxmbm);
                    tree.setType("处置");
                    LambdaQueryWrapper<TjProject> wrapper = new LambdaQueryWrapper<>();
                    wrapper.eq(TjProject::getHisXmbm,mxfyxmbm);
                    wrapper.eq(TjProject::getHisXmbm, mxfyxmbm);
                    List<TjProject> list = projectService.list(wrapper);
                    String tj_price = "";
                    for (TjProject project : list) {
                        tj_price+= project.getProPrice()+"、";
                        tj_price += project.getProPrice() + "、";
                    }
                    tree.setTjPrice(tj_price.substring(0, tj_price.length() - 1));
                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                    if (detail.getSfzhfy().equals("1"))
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm,mxfyxmbm);
                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm,mxfyxmbm);
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()){
                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
                        wrapper2.eq(LtkjMxjfxmzd::getXmdm,xmdm);
                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm,mxjfxmzd.getEjkmdm());
                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
                        tree.setXmfl(ejjfxmzd.getYjkmdm());
                    }
@@ -408,11 +424,12 @@
//                lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpintreatapply");
//                HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
//                hisApiGetMethodService.save(jsonObject, "Outpintreatapply", hisApiConfig,JSONUtil.toJsonStr(BeanUtil.beanToMap(dao)));
            }else {
                return AjaxResult.error();
            }
//            else {
//                return AjaxResult.error("处置申请失败!");
//            }
        }
        return null;
        return AjaxResult.success();
    }


@@ -430,14 +447,14 @@
        String zlsqdh = orderService.getHuoQuZlsqdh(order.getCardId());

        //2.1.6.5 作废门诊检查申请
        if (null !=jcsqdh){
        if (null != jcsqdh) {
            AjaxResult result = controller.Outpindelexamapply(order.getCardId(), "00029", jcsqdh);
            String result1 = getAjaxResult(result);
            JSONObject object = getJSONObject(result1);
            String code = object.getStr("ResultCode");
            if (code.equals("0")) {
                orderService.delHuoQuJcsqdh(order.getCardId());
            }else {
            } else {
                return false;
            }
        }
@@ -445,30 +462,30 @@

        //2.1.6.3 作废门诊检验申请

        AjaxResult ajaxResult =null;
        String result2 =null;
        JSONObject object1 =null;
        String code1 =null;
        AjaxResult ajaxResult = null;
        String result2 = null;
        JSONObject object1 = null;
        String code1 = null;

        if(null !=jysqdh){
             ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", jysqdh);
             result2 = getAjaxResult(ajaxResult);
             object1 = getJSONObject(result2);
             code1 = object1.getStr("ResultCode");
        if (null != jysqdh) {
            ajaxResult = controller.Outpindeltestapply(order.getCardId(), "00029", jysqdh);
            result2 = getAjaxResult(ajaxResult);
            object1 = getJSONObject(result2);
            code1 = object1.getStr("ResultCode");
            if (code1.equals("0")) {
                orderService.delHuoQuJysqdh(order.getCardId());
            }else {
            } else {
                return false;
            }
        }

        //2.1.6.9 作废门诊治疗处置申请
        if(null !=zlsqdh){
        if (null != zlsqdh) {
            ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", zlsqdh);
            result2 = getAjaxResult(ajaxResult);
            object1 = getJSONObject(result2);
            code1 = object1.getStr("ResultCode");
            if (!code1.equals("0")){
            if (!code1.equals("0")) {
                return false;
            }
        }
@@ -477,7 +494,7 @@
        result2 = getAjaxResult(ajaxResult);
        object1 = getJSONObject(result2);
        code1 = object1.getStr("ResultCode");
        if (!code1.equals("0")){
        if (!code1.equals("0")) {
            return false;
        }
        return true;

 ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethodService.java

@@ -70,7 +70,7 @@
        map.put ("csrq", DateUtil.format(customer.getCusBrithday(),"yyyy-MM-dd"));
        map.put ("brnl", customer.getAge ());
        map.put ("brnldw", customer.getAgeUnit ());
        map.put ("addr", customer.getAddr ());
        map.put ("addr", customer.getCusAddr());
        map.put ("gzdw", null);
        map.put ("dwdz", null);
        map.put ("lxr", customer.getCusName ());

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

@@ -3,15 +3,19 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;

import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import cn.hutool.json.JSONArray;
import cn.hutool.json.JSONObject;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ltkj.common.annotation.Log;
import com.ltkj.common.enums.BusinessType;
import com.ltkj.common.enums.DataSourceType;
import com.ltkj.common.utils.SecurityUtils;
import com.ltkj.framework.config.MatchUtils;
import com.ltkj.framework.datasource.DynamicDataSourceContextHolder;
import com.ltkj.hosp.domain.HisApiConfig;
import com.ltkj.hosp.domain.TjCustomerBlack;
import com.ltkj.hosp.domain.TjReservation;
import com.ltkj.hosp.hisDto.OutpinregapplyDto;
@@ -56,10 +60,12 @@
public class TjCustomerController extends BaseController {
    @Resource
    private ITjCustomerService tjCustomerService;

    @Autowired
    private HisApiGetMethodService hisApiGetMethodService;
    @Resource
    private ITjReservationService tjReservationService;

    @Autowired
    private HisApiConfigService hisApiConfigService;
    @Resource
    private ISysConfigService sysConfigService;

@@ -352,7 +358,6 @@
                LambdaQueryWrapper<TjCustomer> customerLambdaQueryWrapper1 = new LambdaQueryWrapper<>();
                customerLambdaQueryWrapper1.eq(TjCustomer::getCusIdcard, cusIdcard);
                TjCustomer one = tjCustomerService.getOne(customerLambdaQueryWrapper1);
                System.out.println("------------------"+one.getCusBrithday());
                return AjaxResult.success("暂无预约信息", tjCustomerServiceOne);
            }
        }
@@ -509,7 +514,14 @@
                if (null != pationid) {
                    tjCustomer.setPationId(pationid);
                    tjCustomerService.updateById(tjCustomer);
/*                        OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
                    //保存注册入参出参
                    resultData.put("cardId",pationid);
                    JSONObject object4 = JSONUtil.parseObj(resultData);
                    LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                    lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
                    HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
                    hisApiGetMethodService.save(object4, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
                    /*                        OutpinregapplyDto outpinregapplyDto = new OutpinregapplyDto();
                        outpinregapplyDto.setPationid(pationid);
                        outpinregapplyDto.setSqysbm("00029");
                        outpinregapplyDto.setMzksbm("0101");
@@ -559,10 +571,15 @@
     * 修改客户信息
     */
    //@PreAuthorize("@ss.hasPermi('hosp:customer:edit')")
    //@Log(title = "客户信息", businessType = BusinessType.UPDATE)
    @Log(title = "客户信息", businessType = BusinessType.UPDATE)
    @PutMapping
    @ApiOperation(value = "修改客户信息")
    public AjaxResult edit(@RequestBody @ApiParam(value = "客户对象") TjCustomer tjCustomer) {

        TjCustomer customer = tjCustomerService.getById(tjCustomer.getCusId());
        if(null==customer){
            return AjaxResult.error("该人员不存在!");
        }

        String cusPhone = tjCustomer.getCusPhone();
        if (null == cusPhone) {
@@ -575,7 +592,37 @@
            return AjaxResult.error("该手机号已被使用!");
        }*/
        tjCustomer.setCusPhone(cusPhone);
        return toAjax(tjCustomerService.updateTjCustomer(tjCustomer));
        if (tjCustomerService.updateById(tjCustomer)) {
            String config = sysConfigService.selectConfigByKey("sfkqdyhis");
            if (null != config && config.equals("Y")) {
                tjCustomer.setPationId(customer.getPationId());
                AjaxResult result = controller.Outpincreateapply(tjCustomer);
                String result1 = getAjaxResult(result);
                JSONObject object = getJSONObject(result1);
                String code = object.getStr("ResultCode");
                if (code.equals("0")) {
                    /*               JSONArray resultDatass = object.getJSONArray("ResultData");
                    Map<String, Object> resultData = (Map<String, Object>) resultDatass.get(0);
                    if (null != resultData && resultData.size() > 0) {
                        String pationid = resultData.get("PationId").toString();
                        if (null != pationid) {
                            tjCustomer.setPationId(pationid);
                            tjCustomerService.updateById(tjCustomer);
                        }
                    }*/
                    //保存修改入参出参
//                    object.putOpt("cardId",customer.getPationId());
//                    LambdaQueryWrapper<HisApiConfig> lambdaQueryWrapper = new LambdaQueryWrapper<>();
//                    lambdaQueryWrapper.eq(HisApiConfig::getApiMethod, "Outpincreateapply");
//                    HisApiConfig hisApiConfig = hisApiConfigService.getOne(lambdaQueryWrapper);
//                    hisApiGetMethodService.save(object, "Outpincreateapply", hisApiConfig, JSONUtil.toJsonStr(BeanUtil.beanToMap(tjCustomer)));
                    return AjaxResult.success();
                }
                return AjaxResult.error();
            }
            return AjaxResult.success();
        }
       return AjaxResult.error();
    }

    /**

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

@@ -1035,7 +1035,11 @@
            /*调用his接口*/
            String config = configService.selectConfigByKey("sfkqdyhis");
            if(null !=config && config.equals("Y")){
                hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
                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("0");
            tjCustomerService.updateById(tjCustomer);
@@ -2331,7 +2335,7 @@
        if (null != order) {
            String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
            if (null != payByTjNum) {
                return AjaxResult.success("该用户已收费不可撤销签到!");
                return AjaxResult.error("该用户已收费不可撤销签到!");
            }
            tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
            tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));

 ltkj-hosp/src/main/java/com/ltkj/hosp/mapper/TbTransitionMapper.java

@@ -65,7 +65,7 @@
     */
    public int deleteTbTransitionByIds(String[] ids);

    @Delete("DELETE  FROM tb_transition WHERE cus_id=#{cusId}")
    @Delete("DELETE  FROM tb_transition WHERE cus_id=#{cusId} and isnull(tj_num)")
    public boolean deletedTbTransitionByCusId(String cusId);


@@ -83,7 +83,7 @@
    @Select("SELECT * FROM tb_transition WHERE cus_id=#{cusId} and card_id=#{cardId}")
    public List<TbTransition> getTbTransitionListByCusId(@Param("cusId")String cusId,@Param("cardId")String cardId);

    @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id) and card_id=#{cardId}")
    @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND !ISNULL(pac_id) and isnull(tj_num)")
    public boolean deletedTbTransitionListByCusIdAndPac(@Param("cusId")String cusId,@Param("cardId")String cardId);

    @Delete("DELETE FROM tb_transition WHERE cus_id=#{cusId} AND ISNULL(tj_num)and card_id=#{cardId}")