zhaowenxuan
2025-02-19 331d513f2546feb17834c89ac40513b93cdfc514
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -1330,12 +1330,25 @@
            dto1.setSqysbm(ysbm);
            dto1.setMzksbm(dept);
            dto1.setSjrq(date);
            dto1.setCzybm(ysbm);
            dto1.setCzyksbm(dept);
            dto1.setCflxbm("A");
            dto1.setYfbm("1");
            String yfbm = configService.selectConfigByKey("chufang_yfbm");
            String mzzd = configService.selectConfigByKey("chufang_mzzd");
            String czybm = configService.selectConfigByKey("chufang_czybm");
            String czyksbm = configService.selectConfigByKey("chufang_czyksbm");
            String cflxbm = configService.selectConfigByKey("chufang_cflxbm");
            if (czybm.equalsIgnoreCase("N"))
                dto1.setCzybm(ysbm);
            else dto1.setCzybm(czybm);
            if (czyksbm.equalsIgnoreCase("N"))
                dto1.setCzyksbm(dept);
            else dto1.setCzyksbm(czyksbm);
            dto1.setCflxbm(cflxbm);
            if (yfbm.equalsIgnoreCase("N"))
                dto1.setYfbm("1");
            else dto1.setYfbm(yfbm);
            dto1.setFyts("1");
            dto1.setMzzd("");
            if (mzzd.equalsIgnoreCase("N"))
                dto1.setMzzd("");
            else dto1.setMzzd(mzzd);
            dto1.setDetails(outpinmedicapplyDetilsDtos);
            AjaxResult result = controller.Outpinmedicapply(dto1);
            String result1 = getAjaxResult(result);
@@ -1414,7 +1427,7 @@
                    if (samplings.size() >= 2) {
                        // 进行合并
                        List<String> stringList = samplings.stream().map(TjSampling::getId).collect(Collectors.toList());
                        log.info("提取id ->{}",stringList);
//                        log.info("提取id ->{}",stringList);
                        for (int i = 0; i < stringList.size(); i++) {
                            String s = stringList.get(i);
                            if (tjSamplingService.isMergeItem(s) != 0) {