zhaowenxuan
2024-10-23 e3f6f42c3056a8fac0308ec93b3e192c82cfc3dd
团体票不走his请求、增加团体票收费状态
3个文件已修改
685 ■■■■ 已修改文件
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java 410 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java 272 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -568,168 +568,168 @@
//        wq2.eq(TjOrderDetail::getIsSampling, 0);
//        List<TjOrderDetail> detailList1 = tjOrderDetailService.list(wq2);
        List<TjOrderDetail> detailList1 = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId());
        log.info("TjOrderDetail ->{}",JSONUtil.toJsonStr(detailList1));
//        log.info("TjOrderDetail ->{}",JSONUtil.toJsonStr(detailList1));
        tjSysAsyncService.addCaiYangDengJi(detailList1, !detailList1.isEmpty(), tjOrder, sysUser,null);
        //检验申请
        OutpintestapplyDto dto = new OutpintestapplyDto();
        dto.setHisRegistrationId(tjOrder.getCardId());
        dto.setSfzh(customer.getCusIdcard());
        dto.setSqysbm("00029");
        dto.setMzksbm("0101");
        dto.setSjrq(date);
        dto.setCzybm("00029");
        dto.setCzyksbm("0101");
        dto.setSfjz("0");
//        OutpintestapplyDto dto = new OutpintestapplyDto();
//        dto.setHisRegistrationId(tjOrder.getCardId());
//        dto.setSfzh(customer.getCusIdcard());
//        dto.setSqysbm("00029");
//        dto.setMzksbm("0101");
//        dto.setSjrq(date);
//        dto.setCzybm("00029");
//        dto.setCzyksbm("0101");
//        dto.setSfjz("0");
        List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
//        List<OutpinmedicapplyDetilsDto> outpinmedicapplyDetilsDtos =new ArrayList<>();
        //门诊治疗处置申请
        OutpintreatapplyDto dao = new OutpintreatapplyDto();
        dao.setHisRegistrationId(tjOrder.getCardId());
        dao.setSfzh(customer.getCusIdcard());
        dao.setSqysbm("00029");
        dao.setMzksbm("0101");
        dao.setSjrq(date);
        dao.setCzybm("00029");
        dao.setCzyksbm("0101");
        dao.setSfjz("0");
        List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
        if (!detailList.isEmpty()) {
            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
            wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
            wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
            List<TjProject> projects = projectService.list(wq);
            if (null != projects && !projects.isEmpty()) {
                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(project.getSl());
                            detailsDto.setProjg(project.getProPrice());
                            detailDtos.add(detailsDto);
                        }
                        if(project.getProId()==1740177341251154377L){
                            OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                            detilsDto.setYpbm("00006670");
                            detilsDto.setPcbm("06");
                            detilsDto.setSl("1");
                            detilsDto.setDj("60");
                            detilsDto.setDcjl("1");
                            detilsDto.setPj("60");
                            detilsDto.setJj("60");
                            detilsDto.setJldw("");
                            detilsDto.setTjbm("");
                            detilsDto.setPs("");
                            detilsDto.setPsbm("");
                            detilsDto.setYyts("");
                            detilsDto.setXtph("");
                            detilsDto.setScph("");
                            detilsDto.setYpxq("");
                            detilsDto.setCdbm("");
                            detilsDto.setKfdw("");
                            detilsDto.setYfdw("");
                            detilsDto.setYysm("");
                            detilsDto.setFzbl("1");
                            detilsDto.setZh("0");
                            outpinmedicapplyDetilsDtos.add(detilsDto);
                        }
                    }
                }
            }
        }
        if (!detailDtos.isEmpty()) {
            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")) {
                List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
                for (OutpintestapplyDetailsDto detail : details1) {
                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                    tree.setCardId(dao.getHisRegistrationId());
                    tree.setPationid(customer.getPationId());
                    JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
                    tree.setSqdh(resultData.getStr("zlczh"));
                    tree.setFyhj(resultData.getStr("fyhj"));
                    String mxfyxmbm = detail.getMxfyxmbm();
                    tree.setHisXmdm(mxfyxmbm);
                    tree.setType("处置");
                    tree.setTjPrice(String.valueOf(detail.getProjg()));
                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                    if (detail.getSfzhfy().equals("1"))
                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
                        tree.setXmfl(ejjfxmzd.getYjkmdm());
                    }
                    tree.setCreateTime(DateUtil.date());
                    ltkjJianchajianyanTreeService.save(tree);
                }
            }
        }
//        OutpintreatapplyDto dao = new OutpintreatapplyDto();
//        dao.setHisRegistrationId(tjOrder.getCardId());
//        dao.setSfzh(customer.getCusIdcard());
//        dao.setSqysbm("00029");
//        dao.setMzksbm("0101");
//        dao.setSjrq(date);
//        dao.setCzybm("00029");
//        dao.setCzyksbm("0101");
//        dao.setSfjz("0");
//        List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
//        if (!detailList.isEmpty()) {
//            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
//            wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
//            wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
//            List<TjProject> projects = projectService.list(wq);
//            if (null != projects && !projects.isEmpty()) {
//                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(project.getSl());
//                            detailsDto.setProjg(project.getProPrice());
//                            detailDtos.add(detailsDto);
//                        }
//                        if(project.getProId()==1740177341251154377L){
//                            OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
//                            detilsDto.setYpbm("00006670");
//                            detilsDto.setPcbm("06");
//                            detilsDto.setSl("1");
//                            detilsDto.setDj("60");
//                            detilsDto.setDcjl("1");
//                            detilsDto.setPj("60");
//                            detilsDto.setJj("60");
//                            detilsDto.setJldw("");
//                            detilsDto.setTjbm("");
//                            detilsDto.setPs("");
//                            detilsDto.setPsbm("");
//                            detilsDto.setYyts("");
//                            detilsDto.setXtph("");
//                            detilsDto.setScph("");
//                            detilsDto.setYpxq("");
//                            detilsDto.setCdbm("");
//                            detilsDto.setKfdw("");
//                            detilsDto.setYfdw("");
//                            detilsDto.setYysm("");
//                            detilsDto.setFzbl("1");
//                            detilsDto.setZh("0");
//                            outpinmedicapplyDetilsDtos.add(detilsDto);
//                        }
//                    }
//                }
//            }
//        }
//        if (!detailDtos.isEmpty()) {
//            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")) {
//                List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
//                for (OutpintestapplyDetailsDto detail : details1) {
//                    LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
//                    tree.setCardId(dao.getHisRegistrationId());
//                    tree.setPationid(customer.getPationId());
//                    JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
//                    tree.setSqdh(resultData.getStr("zlczh"));
//                    tree.setFyhj(resultData.getStr("fyhj"));
//                    String mxfyxmbm = detail.getMxfyxmbm();
//                    tree.setHisXmdm(mxfyxmbm);
//                    tree.setType("处置");
//                    tree.setTjPrice(String.valueOf(detail.getProjg()));
//                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
//                    if (detail.getSfzhfy().equals("1"))
//                        wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
//                    else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
//                    List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
//                    if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
//                        String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
//                        LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
//                        wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
//                        LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
//                        LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
//                        wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
//                        LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
//                        tree.setXmfl(ejjfxmzd.getYjkmdm());
//                    }
//                    tree.setCreateTime(DateUtil.date());
//                    ltkjJianchajianyanTreeService.save(tree);
//                }
//            }
//        }
        //药品申请
        if(!outpinmedicapplyDetilsDtos.isEmpty()){
            OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
            dto1.setHisRegistrationId(tjOrder.getCardId());
            dto1.setSfzh(customer.getCusIdcard());
            dto1.setSqysbm("00029");
            dto1.setMzksbm("0101");
            dto1.setSjrq(date);
            dto1.setCzybm("00029");
            dto1.setCzyksbm("0101");
            dto1.setCflxbm("A");
            dto1.setYfbm("1");
            dto1.setFyts("1");
            dto1.setMzzd("");
            dto1.setDetails(outpinmedicapplyDetilsDtos);
            AjaxResult resultt = controller.Outpinmedicapply(dto1);
            String result1 = getAjaxResult(resultt);
            JSONObject object = getJSONObject(result1);
            String code = object.getStr("ResultCode");
            if(null !=code && code.equals("0")){
                JSONObject resultData = object.getJSONObject("ResultData");
//                Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
                String cfh = resultData.getStr("cfh");
                log.info("药品申请后的处方号是: "+cfh+"  outpinmedicapplyDetilsDtos 里面的值为: "+outpinmedicapplyDetilsDtos.toString());
                for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
                    TjCf cf=new TjCf();
                    cf.setCardId(tjOrder.getCardId());
                    cf.setSfzh(customer.getCusIdcard());
                    cf.setCfh(cfh);
                    cf.setSqysbm("00029");
                    cf.setSqysxm("王健萍");
                    cf.setMzksbn("0101");
                    cf.setSqrq(date);
                    cf.setCzybm("00029");
                    cf.setYpbm(detilsDto.getYpbm());
                    cf.setYpmc("尿素[14C]呼气试验药盒");
                    cf.setSl(String.valueOf(detilsDto.getSl()));
                    cf.setDj(String.valueOf(detilsDto.getDj()));
                    cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
                    cf.setPj(String.valueOf(detilsDto.getPj()));
                    cf.setJj(String.valueOf(detilsDto.getJj()));
                    cf.setCreateTime(new Date());
                    cfService.save(cf);
                }
            }
        }
//        if(!outpinmedicapplyDetilsDtos.isEmpty()){
//            OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
//            dto1.setHisRegistrationId(tjOrder.getCardId());
//            dto1.setSfzh(customer.getCusIdcard());
//            dto1.setSqysbm("00029");
//            dto1.setMzksbm("0101");
//            dto1.setSjrq(date);
//            dto1.setCzybm("00029");
//            dto1.setCzyksbm("0101");
//            dto1.setCflxbm("A");
//            dto1.setYfbm("1");
//            dto1.setFyts("1");
//            dto1.setMzzd("");
//            dto1.setDetails(outpinmedicapplyDetilsDtos);
//            AjaxResult resultt = controller.Outpinmedicapply(dto1);
//            String result1 = getAjaxResult(resultt);
//            JSONObject object = getJSONObject(result1);
//            String code = object.getStr("ResultCode");
//            if(null !=code && code.equals("0")){
//                JSONObject resultData = object.getJSONObject("ResultData");
////                Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
//                String cfh = resultData.getStr("cfh");
//                log.info("药品申请后的处方号是: "+cfh+"  outpinmedicapplyDetilsDtos 里面的值为: "+outpinmedicapplyDetilsDtos.toString());
//                for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
//                    TjCf cf=new TjCf();
//                    cf.setCardId(tjOrder.getCardId());
//                    cf.setSfzh(customer.getCusIdcard());
//                    cf.setCfh(cfh);
//                    cf.setSqysbm("00029");
//                    cf.setSqysxm("王健萍");
//                    cf.setMzksbn("0101");
//                    cf.setSqrq(date);
//                    cf.setCzybm("00029");
//                    cf.setYpbm(detilsDto.getYpbm());
//                    cf.setYpmc("尿素[14C]呼气试验药盒");
//                    cf.setSl(String.valueOf(detilsDto.getSl()));
//                    cf.setDj(String.valueOf(detilsDto.getDj()));
//                    cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
//                    cf.setPj(String.valueOf(detilsDto.getPj()));
//                    cf.setJj(String.valueOf(detilsDto.getJj()));
//                    cf.setCreateTime(new Date());
//                    cfService.save(cf);
//                }
//            }
//        }
        return AjaxResult.success();
    }
@@ -816,34 +816,33 @@
//                }
                }
            }
        }
        //2.1.6.9 作废门诊治疗处置申请
        if (null != zlsqdh && zlsqdh.size()>0) {
            for (String s : zlsqdh) {
                ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
                result2 = getAjaxResult(ajaxResult);
                object1 = getJSONObject(result2);
                code1 = object1.getStr("ResultCode");
                if (code1.equals("0")) {
                    orderService.delHuoQuZlsqdh(order.getCardId());
            //2.1.6.9 作废门诊治疗处置申请
            if (null != zlsqdh && zlsqdh.size()>0) {
                for (String s : zlsqdh) {
                    ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
                    result2 = getAjaxResult(ajaxResult);
                    object1 = getJSONObject(result2);
                    code1 = object1.getStr("ResultCode");
                    if (code1.equals("0")) {
                        orderService.delHuoQuZlsqdh(order.getCardId());
                    }
                }
            }
            //作废药品申请
            if(null !=cfhs && cfhs.size()>0){
                for (String cfh : cfhs) {
                    AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
                    String result1 = getAjaxResult(result);
                    JSONObject object = getJSONObject(result1);
                    String code = object.getStr("ResultCode");
                    if(null !=code && code.equals("0")){
                        cfService.delCfByCardId(cfh);
                    }
                }
            }
        }
        //作废药品申请
        if(null !=cfhs && cfhs.size()>0){
            for (String cfh : cfhs) {
                AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
                String result1 = getAjaxResult(result);
                JSONObject object = getJSONObject(result1);
                String code = object.getStr("ResultCode");
                if(null !=code && code.equals("0")){
                    cfService.delCfByCardId(cfh);
                }
            }
        }
        //2.1.3 门诊医生取消接诊
        ajaxResult = controller.Outpinunconapply(order.getCardId(), date, "00029");
@@ -942,38 +941,37 @@
                                }
                            }
                        }
                    }
                    //2.1.6.9 作废门诊治疗处置申请
                    if (null != zlsqdh && zlsqdh.size()>0) {
                        for (String s : zlsqdh) {
                            ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
                            result2 = getAjaxResult(ajaxResult);
                            object1 = getJSONObject(result2);
                            code1 = object1.getStr("ResultCode");
                            if (code1.equals("0")) {
                                orderService.delHuoQuZlsqdh(order.getCardId(),bldh);
                            }else {
                                return false;
                        //2.1.6.9 作废门诊治疗处置申请
                        if (null != zlsqdh && zlsqdh.size()>0) {
                            for (String s : zlsqdh) {
                                ajaxResult = controller.Outpintdelreatapply(order.getCardId(), "00029", s);
                                result2 = getAjaxResult(ajaxResult);
                                object1 = getJSONObject(result2);
                                code1 = object1.getStr("ResultCode");
                                if (code1.equals("0")) {
                                    orderService.delHuoQuZlsqdh(order.getCardId(),bldh);
                                }else {
                                    return false;
                                }
                            }
                        }
                        //作废药品申请
                        if(null !=cfhs && cfhs.size()>0){
                            for (String cfh : cfhs) {
                                AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
                                String result1 = getAjaxResult(result);
                                JSONObject object = getJSONObject(result1);
                                String code = object.getStr("ResultCode");
                                if(null !=code && code.equals("0")){
                                    cfService.delCfByCardId(cfh);
                                }else {
                                    return false;
                                }
                            }
                        }
                    }
                    //作废药品申请
                    if(null !=cfhs && cfhs.size()>0){
                        for (String cfh : cfhs) {
                            AjaxResult result = controller.Outpindelmedicapply(order.getCardId(), "00029", cfh);
                            String result1 = getAjaxResult(result);
                            JSONObject object = getJSONObject(result1);
                            String code = object.getStr("ResultCode");
                            if(null !=code && code.equals("0")){
                                cfService.delCfByCardId(cfh);
                            }else {
                                return false;
                            }
                        }
                    }
                    return true;
                }
            } catch (Exception e) {
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -1486,154 +1486,154 @@
                        }
                    }
                }
            }
            //门诊治疗处置申请
            OutpintreatapplyDto dao = new OutpintreatapplyDto();
            dao.setHisRegistrationId(cardId);
            dao.setSfzh(customer.getCusIdcard());
            dao.setSqysbm("00029");
            dao.setMzksbm("0101");
            dao.setSjrq(date);
            dao.setCzybm("00029");
            dao.setCzyksbm("0101");
            dao.setSfjz("0");
                //门诊治疗处置申请
                OutpintreatapplyDto dao = new OutpintreatapplyDto();
                dao.setHisRegistrationId(cardId);
                dao.setSfzh(customer.getCusIdcard());
                dao.setSqysbm("00029");
                dao.setMzksbm("0101");
                dao.setSjrq(date);
                dao.setCzybm("00029");
                dao.setCzyksbm("0101");
                dao.setSfjz("0");
//        List<TbTransition> details = tbTransitionService.getTbTransitionListByCusId(customer.getCusIdcard(),cardId);
            List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
            if (null != detailList && !detailList.isEmpty()) {
                LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
                List<TjProject> projects = projectService.list(wq);
                if (null != projects && !projects.isEmpty()) {
                    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");
                List<OutpintestapplyDetailsDto> detailDtos = new ArrayList<>();
                if (null != detailList && !detailList.isEmpty()) {
                    LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
                    wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
                    wq.in(TjProject::getDeptId,deptService.getCzDeptIds());
                    List<TjProject> projects = projectService.list(wq);
                    if (null != projects && !projects.isEmpty()) {
                        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(project.getSl());
                                    detailsDto.setProjg(project.getProPrice());
                                    detailDtos.add(detailsDto);
                                }
                                detailsDto.setSl(project.getSl());
                                detailsDto.setProjg(project.getProPrice());
                                detailDtos.add(detailsDto);
                            }
                            if(project.getProId()==1740177341251154377L){
                                OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                detilsDto.setYpbm("00006670");
                                detilsDto.setPcbm("06");
                                detilsDto.setSl("1");
                                detilsDto.setDj("60");
                                detilsDto.setDcjl("1");
                                detilsDto.setPj("60");
                                detilsDto.setJj("60");
                                detilsDto.setJldw("");
                                detilsDto.setTjbm("");
                                detilsDto.setPs("");
                                detilsDto.setPsbm("");
                                detilsDto.setYyts("");
                                detilsDto.setXtph("");
                                detilsDto.setScph("");
                                detilsDto.setYpxq("");
                                detilsDto.setCdbm("");
                                detilsDto.setKfdw("");
                                detilsDto.setYfdw("");
                                detilsDto.setYysm("");
                                detilsDto.setFzbl("1");
                                detilsDto.setZh("0");
                                outpinmedicapplyDetilsDtos.add(detilsDto);
                                if(project.getProId()==1740177341251154377L){
                                    OutpinmedicapplyDetilsDto detilsDto=new OutpinmedicapplyDetilsDto();
                                    detilsDto.setYpbm("00006670");
                                    detilsDto.setPcbm("06");
                                    detilsDto.setSl("1");
                                    detilsDto.setDj("60");
                                    detilsDto.setDcjl("1");
                                    detilsDto.setPj("60");
                                    detilsDto.setJj("60");
                                    detilsDto.setJldw("");
                                    detilsDto.setTjbm("");
                                    detilsDto.setPs("");
                                    detilsDto.setPsbm("");
                                    detilsDto.setYyts("");
                                    detilsDto.setXtph("");
                                    detilsDto.setScph("");
                                    detilsDto.setYpxq("");
                                    detilsDto.setCdbm("");
                                    detilsDto.setKfdw("");
                                    detilsDto.setYfdw("");
                                    detilsDto.setYysm("");
                                    detilsDto.setFzbl("1");
                                    detilsDto.setZh("0");
                                    outpinmedicapplyDetilsDtos.add(detilsDto);
                                }
                            }
                        }
                    }
                }
            }
            if (!detailDtos.isEmpty()) {
                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")) {
                    List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
                    for (OutpintestapplyDetailsDto detail : details1) {
                        LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                        tree.setJxbz(jxbz);
                        tree.setCardId(dao.getHisRegistrationId());
                        tree.setPationid(customer.getPationId());
                        JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
                        tree.setSqdh(resultData.getStr("zlczh"));
                        tree.setFyhj(resultData.getStr("fyhj"));
                        String mxfyxmbm = detail.getMxfyxmbm();
                        tree.setHisXmdm(mxfyxmbm);
                        tree.setType("处置");
                        tree.setTjPrice(String.valueOf(detail.getProjg()));
                        LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                        if (detail.getSfzhfy().equals("1"))
                            wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
                        else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
                        List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
                        if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
                            String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
                            LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
                            wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
                            LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
                            LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
                            wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
                            LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
                            tree.setXmfl(ejjfxmzd.getYjkmdm());
                if (!detailDtos.isEmpty()) {
                    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")) {
                        List<OutpintestapplyDetailsDto> details1 = dao.getDetails();
                        for (OutpintestapplyDetailsDto detail : details1) {
                            LtkjJianchajianyanTree tree = new LtkjJianchajianyanTree();
                            tree.setJxbz(jxbz);
                            tree.setCardId(dao.getHisRegistrationId());
                            tree.setPationid(customer.getPationId());
                            JSONObject resultData = mzylyzsq3.getJSONObject("ResultData");
                            tree.setSqdh(resultData.getStr("zlczh"));
                            tree.setFyhj(resultData.getStr("fyhj"));
                            String mxfyxmbm = detail.getMxfyxmbm();
                            tree.setHisXmdm(mxfyxmbm);
                            tree.setType("处置");
                            tree.setTjPrice(String.valueOf(detail.getProjg()));
                            LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                            if (detail.getSfzhfy().equals("1"))
                                wrapper1.eq(LtkjJfzhglmxjfxmzd::getZhxmdm, mxfyxmbm);
                            else wrapper1.eq(LtkjJfzhglmxjfxmzd::getXmdm, mxfyxmbm);
                            List<LtkjJfzhglmxjfxmzd> ltkjJfzhglmxjfxmzds = ltkjJfzhglmxjfxmzdService.list(wrapper1);
                            if (ltkjJfzhglmxjfxmzds != null && !ltkjJfzhglmxjfxmzds.isEmpty()) {
                                String xmdm = ltkjJfzhglmxjfxmzds.get(0).getXmdm();
                                LambdaQueryWrapper<LtkjMxjfxmzd> wrapper2 = new LambdaQueryWrapper<>();
                                wrapper2.eq(LtkjMxjfxmzd::getXmdm, xmdm);
                                LtkjMxjfxmzd mxjfxmzd = ltkjMxjfxmzdService.getOne(wrapper2);
                                LambdaQueryWrapper<LtkjEjjfxmzd> wrapper3 = new LambdaQueryWrapper<>();
                                wrapper3.eq(LtkjEjjfxmzd::getEjkmdm, mxjfxmzd.getEjkmdm());
                                LtkjEjjfxmzd ejjfxmzd = ltkjEjjfxmzdService.getOne(wrapper3);
                                tree.setXmfl(ejjfxmzd.getYjkmdm());
                            }
                            tree.setCreateTime(DateUtil.date());
                            ltkjJianchajianyanTreeService.save(tree);
                        }
                        tree.setCreateTime(DateUtil.date());
                        ltkjJianchajianyanTreeService.save(tree);
                    }
                }
            }
            //药品申请
            if(!outpinmedicapplyDetilsDtos.isEmpty()){
                OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
                dto1.setHisRegistrationId(cardId);
                dto1.setSfzh(customer.getCusIdcard());
                dto1.setSqysbm("00029");
                dto1.setMzksbm("0101");
                dto1.setSjrq(date);
                dto1.setCzybm("00029");
                dto1.setCzyksbm("0101");
                dto1.setCflxbm("A");
                dto1.setYfbm("1");
                dto1.setFyts("1");
                dto1.setMzzd("");
                dto1.setDetails(outpinmedicapplyDetilsDtos);
                AjaxResult result = controller.Outpinmedicapply(dto1);
                String result1 = getAjaxResult(result);
                JSONObject object = getJSONObject(result1);
                String code = object.getStr("ResultCode");
                if(null !=code && code.equals("0")){
                    JSONObject resultData = object.getJSONObject("ResultData");
                //药品申请
                if(!outpinmedicapplyDetilsDtos.isEmpty()){
                    OutpinmedicapplyDto dto1=new OutpinmedicapplyDto();
                    dto1.setHisRegistrationId(cardId);
                    dto1.setSfzh(customer.getCusIdcard());
                    dto1.setSqysbm("00029");
                    dto1.setMzksbm("0101");
                    dto1.setSjrq(date);
                    dto1.setCzybm("00029");
                    dto1.setCzyksbm("0101");
                    dto1.setCflxbm("A");
                    dto1.setYfbm("1");
                    dto1.setFyts("1");
                    dto1.setMzzd("");
                    dto1.setDetails(outpinmedicapplyDetilsDtos);
                    AjaxResult result = controller.Outpinmedicapply(dto1);
                    String result1 = getAjaxResult(result);
                    JSONObject object = getJSONObject(result1);
                    String code = object.getStr("ResultCode");
                    if(null !=code && code.equals("0")){
                        JSONObject resultData = object.getJSONObject("ResultData");
//                Map<String, Object> resultDatasss = (Map<String, Object>) resultData.get(0);
                    String cfh = resultData.getStr("cfh");
                    log.info("药品申请后的处方号是: "+cfh+"  outpinmedicapplyDetilsDtos 里面的值为: "+outpinmedicapplyDetilsDtos.toString());
                    for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
                        TjCf cf=new TjCf();
                        cf.setJxbz(jxbz);
                        cf.setCardId(cardId);
                        cf.setSfzh(customer.getCusIdcard());
                        cf.setCfh(cfh);
                        cf.setSqysbm("00029");
                        cf.setSqysxm("王健萍");
                        cf.setMzksbn("0101");
                        cf.setSqrq(date);
                        cf.setCzybm("00029");
                        cf.setYpbm(detilsDto.getYpbm());
                        cf.setYpmc("尿素[14C]呼气试验药盒");
                        cf.setSl(String.valueOf(detilsDto.getSl()));
                        cf.setDj(String.valueOf(detilsDto.getDj()));
                        cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
                        cf.setPj(String.valueOf(detilsDto.getPj()));
                        cf.setJj(String.valueOf(detilsDto.getJj()));
                        cf.setCreateTime(new Date());
                        cfService.save(cf);
                        String cfh = resultData.getStr("cfh");
                        log.info("药品申请后的处方号是: "+cfh+"  outpinmedicapplyDetilsDtos 里面的值为: "+outpinmedicapplyDetilsDtos.toString());
                        for (OutpinmedicapplyDetilsDto detilsDto : outpinmedicapplyDetilsDtos) {
                            TjCf cf=new TjCf();
                            cf.setJxbz(jxbz);
                            cf.setCardId(cardId);
                            cf.setSfzh(customer.getCusIdcard());
                            cf.setCfh(cfh);
                            cf.setSqysbm("00029");
                            cf.setSqysxm("王健萍");
                            cf.setMzksbn("0101");
                            cf.setSqrq(date);
                            cf.setCzybm("00029");
                            cf.setYpbm(detilsDto.getYpbm());
                            cf.setYpmc("尿素[14C]呼气试验药盒");
                            cf.setSl(String.valueOf(detilsDto.getSl()));
                            cf.setDj(String.valueOf(detilsDto.getDj()));
                            cf.setDcjl(String.valueOf(detilsDto.getDcjl()));
                            cf.setPj(String.valueOf(detilsDto.getPj()));
                            cf.setJj(String.valueOf(detilsDto.getJj()));
                            cf.setCreateTime(new Date());
                            cfService.save(cf);
                        }
                    }
                }
            }
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -1089,9 +1089,12 @@
                        // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs
                        if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) {
                            // 这是上面个人方法引入数据
                            tjFlowingWater.setPayStasus(1L);
                            newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater);
                            AjaxResult ajaxResult = hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder, sysUser, result);
                            if (!ajaxResult.get("code").toString().equals("200")) return ajaxResult;
                            tjOrderDetailService.updateTjOrderDetailsByOrderId(String.valueOf(tjOrder.getOrderId()),
                                    sysUser.getNickName(), String.valueOf(sysUser.getUserId()), String.valueOf(tjFlowingWater.getTjSerialNumber()));
                        }else {
                            hisApiMethod.tijianshenqing(tjCustomer, DateUtil.format(date1, "yyyy-MM-dd HH:mm:ss"), tjOrder.getCardId());
                        }