zjh20250123

zjh

2025-01-23 5e15f28db8bf83cc19697e1ce2bd0078cd9cdfb8

 ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java

@@ -79,6 +79,9 @@
    @Deprecated
    public Boolean save(TjOrder tjOrder, TjCustomer tjCustomer, List<TbTransition> detailList){
        if (detailList != null && !detailList.isEmpty()) {
            String dept = configService.selectConfigByKey("request_default_dept");
            String ysbm = configService.selectConfigByKey("request_default_ysbm");
            String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
            LambdaQueryWrapper<TjProject> wq = new LambdaQueryWrapper<>();
            wq.in(TjProject::getProId, detailList.stream().map(TbTransition::getParentProId).collect(Collectors.toList()));
            wq.in(TjProject::getDeptId,deptService.getJyDeptIds());
@@ -94,7 +97,7 @@
                            LtkjJyxmzd jyxmzd = getJyxmzd(project);
                            if (jyxmzd != null) {
                                LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
                                String jyxh = idUtils.generateLisID();
                                String jyxh = idUtils.generateLisID(lis_tmh_prefix);
                                lisSaveSqdxxDto.setJyxh(jyxh);
                                lisSaveSqdxxDto.setBah(tjOrder.getCardId());
                                lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName());
@@ -112,8 +115,8 @@
                                lisSaveSqdxxDto.setCyrq("");
                                lisSaveSqdxxDto.setLczd("");
                                lisSaveSqdxxDto.setBz("");
                                lisSaveSqdxxDto.setKsbm("0101");
                                lisSaveSqdxxDto.setSqys("00029");
                                lisSaveSqdxxDto.setKsbm(dept);
                                lisSaveSqdxxDto.setSqys(ysbm);
                                lisSaveSqdxxDto.setKfbz("1");
                                List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
                                ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -160,6 +163,7 @@
                                        String mxfyxmbm = detail.getMxfyxmbm();
                                        tree.setHisXmdm(mxfyxmbm);
                                        tree.setType("检验");
                                        tree.setService("lis");
                                        tree.setTjPrice(String.valueOf(detail.getProjg()));
                                        LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                                        if (detail.getSfzhfy().equals("1"))
@@ -192,6 +196,8 @@
    }

    public Boolean save(TjSampling sampling,TjOrder tjOrder,TjCustomer tjCustomer){
        String dept = configService.selectConfigByKey("request_default_dept");
        String ysbm = configService.selectConfigByKey("request_default_ysbm");
        AtomicInteger xh = new AtomicInteger();
        LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
//        String jyxh = idUtils.generateLisID();
@@ -212,8 +218,8 @@
        lisSaveSqdxxDto.setCyrq("");
        lisSaveSqdxxDto.setLczd("");
        lisSaveSqdxxDto.setBz("");
        lisSaveSqdxxDto.setKsbm("0101");
        lisSaveSqdxxDto.setSqys("00029");
        lisSaveSqdxxDto.setKsbm(dept);
        lisSaveSqdxxDto.setSqys(ysbm);
        lisSaveSqdxxDto.setKfbz("1");
        List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
        ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -290,6 +296,7 @@
                String mxfyxmbm = detail.getMxfyxmbm();
                tree.setHisXmdm(mxfyxmbm);
                tree.setType("检验");
                tree.setService("lis");
                tree.setTjPrice(String.valueOf(detail.getProjg()));
                LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                if (detail.getSfzhfy().equals("1"))
@@ -324,6 +331,9 @@
//            List<TjProject> projects = projectService.list(wq);

        if (projects != null && !projects.isEmpty()) {
            String dept = configService.selectConfigByKey("request_default_dept");
            String ysbm = configService.selectConfigByKey("request_default_ysbm");
            String lis_tmh_prefix = configService.selectConfigByKey("make_lis_tmh_prefix");
            // 根据project表的his_xmbm查组合关联表 ltkj_jfzhgljyxmzd 根据字段`zhxmdm`
            // - 查到 使用字段`jyxmdm`查检验项目字典表 ltkj_jyxmzd 根据字段`jyxmdm`
            // - 未查到 查项目关联表ltkj_jfxmgljyxmzd 根据字段`xmdm`
@@ -334,7 +344,7 @@
                        LtkjJyxmzd jyxmzd = getJyxmzd(project);
                        if (jyxmzd != null) {
                            LisSaveSqdxxDto lisSaveSqdxxDto = new LisSaveSqdxxDto();
                            String jyxh = idUtils.generateLisID();
                            String jyxh = idUtils.generateLisID(lis_tmh_prefix);
                            lisSaveSqdxxDto.setJyxh(jyxh);
                            lisSaveSqdxxDto.setBah(tjOrder.getCardId());
                            lisSaveSqdxxDto.setBrxm(tjCustomer.getCusName());
@@ -352,8 +362,8 @@
                            lisSaveSqdxxDto.setCyrq("");
                            lisSaveSqdxxDto.setLczd("");
                            lisSaveSqdxxDto.setBz("");
                            lisSaveSqdxxDto.setKsbm("0101");
                            lisSaveSqdxxDto.setSqys("00029");
                            lisSaveSqdxxDto.setKsbm(dept);
                            lisSaveSqdxxDto.setSqys(ysbm);
                            lisSaveSqdxxDto.setKfbz("1");
                            List<OutpintestapplyDetailsDto> detailsDtos = new ArrayList<>();
                            ArrayList<LisSaveSqdxxJyxmlistDto> dtos = new ArrayList<>();
@@ -400,6 +410,7 @@
                                    String mxfyxmbm = detail.getMxfyxmbm();
                                    tree.setHisXmdm(mxfyxmbm);
                                    tree.setType("检验");
                                    tree.setService("lis");
                                    tree.setTjPrice(String.valueOf(detail.getProjg()));
                                    LambdaQueryWrapper<LtkjJfzhglmxjfxmzd> wrapper1 = new LambdaQueryWrapper<>();
                                    if (detail.getSfzhfy().equals("1"))
@@ -478,7 +489,7 @@
    public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
        try {
            String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
            String[] split = useLisAndPacsRegisterDictTeam.split(",");
            String[] split = useLisAndPacsRegisterDictTeam.split(",|，|。|：|:");
            List<String> list = Arrays.asList(split);
            return list.contains(tjOrder.getTjType());
        } catch (Exception e) {