zjh20250422

zjh

2025-04-22 22efacd7994f8ea9a7ef8485575ade9729a0e5a2

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

@@ -1785,10 +1785,11 @@
                                    if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
                                        if (!tjOrderDetail.getDeptId().equals("2")) {
                                            List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                                    , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                    , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "").replaceAll("◆","")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""),
                                                    tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                    , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
                                                    , tjOrderDetail.getProResult());


@@ -1797,7 +1798,7 @@
                                            }

                                        } else {
                                            String[] split = tjOrderDetail.getProResult().split("。|,|，");
                                            String[] split = tjOrderDetail.getProResult().split("。|；|;|,|，");
                                            List<Map<String, Object>> mapList = new ArrayList<>();
                                            for (String s : split) {
                                                s = s.replaceAll("\n", "");
@@ -1874,10 +1875,11 @@
                                        if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
                                            if (!tjOrderDetail.getDeptId().equals("2")) {
                                                List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                                        , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                        , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "").replaceAll("◆","")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""),
                                                        tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                        , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "")
                                                                .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆","")
                                                        , tjOrderDetail.getProResult());