zjh20250507

zjh

2025-05-07 4d5cfc8b130da38ce57b22e4eb1b0c6b26d84955

zjh20250507

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

@@ -2193,7 +2193,7 @@
            LambdaQueryWrapper<TjProject> wqqq = new LambdaQueryWrapper<>();
            wqqq.eq(TjProject::getProId, entry.getKey().getProId());
            TjProject one11 = projectService.getOne(wqqq);
            if (entry.getValue() == null || entry.getValue().isEmpty()) continue;
            if (entry.getValue() == null || entry.getValue().isEmpty() || entry.getValue().equals("null")) continue;
            //判断该项目是否需要打印报告
            if (null != one11 && "Y".equals(one11.getNeedReport())) {
                TjOrderRemark orderRemark = entry.getKey();
@@ -2540,7 +2540,7 @@
                                        document1.add(ppp);
                                    }
                                }else{
                                    if (StrUtil.isNotBlank(value.get(0).getSj()) && StrUtil.isNotBlank(value.get(0).getProResult())) {
                                    if (StrUtil.isNotBlank(value.get(0).getSj()) || StrUtil.isNotBlank(value.get(0).getProResult())) {
                                        pp = PdfUtils.setParagraph(remarkFonts, "检查所见：");
                                        document1.add(pp);
                                        ppp = new Paragraph(value.get(0).getSj() != null ? value.get(0).getSj() : value.get(0).getProResult(), remarkFonts);
@@ -3032,7 +3032,14 @@
                    if (tjOrderDetail.getProject().getProParentId().equals(entry.getKey().getProId()) && entry.getKey().getType() == 1) {
                        TjPdfVO tjPdfVO = new TjPdfVO();
                        tjPdfVO.setProName(tjOrderDetail.getProject().getProName());
                        if(tjProject.getProDelivery()==1){
                            if(StringUtil.isNotBlank(tjOrderDetail.getConclusion())){
                                tjPdfVO.setProResult(tjOrderDetail.getProResult()+"     "+tjOrderDetail.getConclusion());
                            }
                        }else {
                        tjPdfVO.setProResult(tjOrderDetail.getProResult());
                        }

                        tjPdfVO.setExc(tjOrderDetail.getExceptionDesc());
                        if (null != tjProject.getProMetering()) {
                            tjPdfVO.setCompany(tjProject.getProMetering());
@@ -3063,12 +3070,7 @@
    }

    private void pacsJianChaData(String tjNumber, Map<TjOrderRemark, List<TjPdfVO>> printReport, TjOrder one, TjCustomer customer) {
//        LambdaQueryWrapper<TjOrderRemark> wqq = new LambdaQueryWrapper<>();
//        wqq.eq(TjOrderRemark::getTjNumber, tjNumber);
//        wqq.ne(TjOrderRemark::getDeptId, "241");
//        wqq.in(TjOrderRemark::getDeptId, "269", "270", "253", "254", "255", "257");
//        wqq.notIn(TjOrderRemark::getProId, projectService.getNneedReprotProId());
//        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.list(wqq);

        List<TjOrderRemark> tjOrderRemarks = tjOrderRemarkService.pacsJianChaData(tjNumber);
        for (TjOrderRemark tjOrderRemark : tjOrderRemarks) {
            printReport.put(tjOrderRemark, null);
@@ -3104,8 +3106,17 @@
                        if (null != list && !list.isEmpty()) {
                            LtkjExamJcbgd jcbgd = list.get(0);
                            if (jcbgd != null) {
                                tjPdfVO.setTs(jcbgd.getYxbx());
                                tjPdfVO.setSj(jcbgd.getBgNr());
                                String yxbx = jcbgd.getYxbx();
                                String bgNr = jcbgd.getBgNr();
                                // 正则表达式：匹配数字后跟 '.' 或 '、'
                                String regex = "\\d+[\\.,、]";
//                                String regex = "(?<=\\d+)([\\.,、])";
                                // 使用正则替换，匹配的数字后添加换行符
                                yxbx = yxbx.replaceAll(regex, "\n$0");
//                                bgNr = bgNr.replaceAll(regex, "\n$0");

                                tjPdfVO.setTs(yxbx);
                                tjPdfVO.setSj(bgNr);
                                tjPdfVO.setShys(jcbgd.getShysxm());
                                tjPdfVO.setProName(jcbgd.getXmmc());
                                ids += "|" + jcbgd.getXmdm();
@@ -3115,14 +3126,6 @@
                    }
                }
            }
//            if(!tjPdfVOS.isEmpty()){
//                tjPdfVOS=tjPdfVOS.stream().sorted(Comparator.comparing(TjPdfVO::getProName, Collator.getInstance(Locale.CHINA))).collect(Collectors.toList());
//                tjPdfVOS = tjPdfVOS.stream()
//                        .sorted(Comparator.comparingInt(
//                                tjPdfVO -> tjPdfVO.getProName().length() // 根据名字的长度排序
//                        ))
//                        .collect(Collectors.toList());
//            }
            printReport.put(entry.getKey(), tjPdfVOS);
        }
    }

 ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java

@@ -614,20 +614,19 @@
                        wq.eq(TjOrderYcxm::getJcxm, detail.getProName());
                        ycxmService.remove(wq);
                        if (detail.getExceptionDesc() == 1) {
                            String replacedAll = detail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");

                                if(!detail.getProName().contains("舒张压") && !detail.getProName().contains("收缩压")){
                                    List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
                                            , detail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""), "", order.getTjNumber()
                                            , detail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "")
                                            , detail.getProResult());

                                    List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString(), replacedAll, "", order.getTjNumber()
                                            , replacedAll, detail.getProResult());


                                    String[] split = detail.getProResult().split("。|,|，");
                                    List<Map<String, Object>> mapList = new ArrayList<>();
                                    for (String s : split) {
                                        s = s.replaceAll("\n", "");
                                        s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");;
                                        //                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                                        Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
                                        if (null != mapss && !mapss.isEmpty()) {
@@ -667,17 +666,13 @@
                            }else {

                                    List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
                                            , detail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""), "", order.getTjNumber()
                                            , detail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "")
                                            , detail.getProResult());
                                            , replacedAll, "", order.getTjNumber(), replacedAll, detail.getProResult());


                                    String[] split = detail.getProResult().split("。|,|，");
                                    List<Map<String, Object>> mapList = new ArrayList<>();
                                    for (String s : split) {
                                        s = s.replaceAll("\n", "");
                                        s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");;
                                        //                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                                        Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
                                        if (null != mapss && !mapss.isEmpty()) {

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

@@ -1760,13 +1760,11 @@
                                if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                                    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("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "")
                                                    , tjOrderDetail.getProResult());
                                            String replacedAll = tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");

                                            List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString(),replacedAll,
                                                    tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber,replacedAll, tjOrderDetail.getProResult());


                                            if (null != maps && !maps.isEmpty()) {
@@ -1777,7 +1775,7 @@
                                            String[] split = tjOrderDetail.getProResult().split("。|,|，");
                                            List<Map<String, Object>> mapList = new ArrayList<>();
                                            for (String s : split) {
                                                s = s.replaceAll("\n", "");
                                                s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");;
    //                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                                                Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s.replaceAll(" ",""), "0",xb);
                                                if (null != maps && !maps.isEmpty()) {
@@ -1851,12 +1849,11 @@
                                if (remark.getProsId().equals(tjOrderDetail.getProsId())) {
                                    if (null != tjOrderDetail.getProId() && null != tjOrderDetail.getYcbz()) {
                                        if (!tjOrderDetail.getDeptId().equals("2")) {
                                            String replacedAll = tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                                    .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");

                                            List<Map<String, Object>> maps = rulesService.getyichangxiangmujianyiguize(tjOrderDetail.getProId().toString()
                                                    , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[）)]", "")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", ""), tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber
                                                    , tjOrderDetail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "")
                                                            .replaceAll("[ 测定检测]", "").replaceAll("\\[.*?\\]", "")
                                                    , tjOrderDetail.getProResult());
                                                    ,replacedAll,tjOrderDetail.getYcbz().replaceAll(" ", ""), tjNumber,replacedAll, tjOrderDetail.getProResult());


                                            if (null != maps && !maps.isEmpty()) {
@@ -1867,7 +1864,7 @@
                                            String[] split = tjOrderDetail.getProResult().split("。|,|，");
                                            List<Map<String, Object>> mapList = new ArrayList<>();
                                            for (String s : split) {
                                                s = s.replaceAll("\n", "");
                                                s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");;
                                                Map<String, Object> maps = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(remark.getKs(), s, "0",xb);
                                                if (null != maps && !maps.isEmpty()) {
                                                    Object bt = maps.get("bt");

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

@@ -51,7 +51,6 @@
    String getTjOrderRemarkProIdList(String tjNumber);



    @Insert("INSERT INTO tj_order_remark(\n" +
            "pro_id,\n" +
            "dept_id,\n" +
@@ -90,9 +89,9 @@
    boolean saveJSYTjOrderRemarkByOrderId(@Param("tjNumber")String tjNumber,@Param("userName") String userName,@Param("userId") String userId,@Param("orderId")String orderId);



    @Select("SELECT * FROM tj_order_remark a LEFT JOIN tj_project b ON a.pro_id=b.pro_id  WHERE a.tj_number=#{tjNumber}" +
            " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")//and a.dept_id in (269,270,253,254,255,257)
            " AND a.type =1 AND a.deleted=0 AND b.need_report='Y' AND b.deleted=0 and a.dept_id in (269,270,253,254,255,257,251,271) ")
//and a.dept_id in (269,270,253,254,255,257)
    List<TjOrderRemark> getRemarkListByTjNumAndType(String tjNumber);


@@ -168,7 +167,6 @@
    boolean updateRemark(String tjNum);



//    @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
//            "\n" +
//            "WHERE a.deleted=0 AND b.org_type = 3 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
@@ -176,9 +174,10 @@
    @Select("call notHuaYanData(#{tjnumber,mode=IN})")
    List<TjOrderRemark> notHuaYanData(String tjnumber);

    @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
            "\n" +
            "WHERE a.deleted=0 AND b.org_type = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
    //    @Select("SELECT a.* FROM tj_order_remark a LEFT JOIN sys_dept b ON b.dept_id=a.dept_id LEFT JOIN tj_project c ON c.pro_id=a.pro_id\n" +
//            "\n" +
//            "WHERE a.deleted=0 AND b.org_type = 2 AND c.need_report='Y' AND a.tj_number=#{tjnumber}")
    @Select("call pacsJianChaData(#{tjnumber,mode=IN})")
    List<TjOrderRemark> pacsJianChaData(String tjnumber);


@@ -227,7 +226,6 @@
            "\n" +
            "WHERE b.need_report='Y' AND c.org_type !=1 AND !ISNULL(a.sfbz) AND a.type !=2 AND a.tj_number=#{tjNumber} \n")
    List<TjOrderRemark> yiShengJianChaGetPrentProCJGLY(@Param("tjNumber") String tjNumber);



    @Select({"<script>" +
@@ -282,14 +280,12 @@
    List<CsProVo> cSWebGetProByTjNumAndOrderIdJy(String tjNumber);



    List<TjOrderRemark> shoufeiyemianyishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);

    List<TjOrderRemark> shoufeiyemianweishoufei(@Param("tjNumber") String tjNumber, @Param("jxbz") String jxbz);

    @Select("call tj_yxjcymxx(#{tjh,mode=IN},#{ks,mode=IN})")
    List<CsProVo> getYxJcXx(@Param("tjh")String tjNumber,@Param("ks")String ks);



    @Select("SELECT a.* FROM tj_order_remark a JOIN tj_project b ON b.pro_id=a.pro_id \n" +