zjh20250508

zjh

2025-05-08 73f860eee8d8faf9808126de214e9fc30f1cbd40

zjh20250508

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

@@ -3112,11 +3112,10 @@
                                String bgNr = jcbgd.getBgNr();
                                // 正则表达式：匹配数字后跟 '.' 或 '、'
                                String regex = "\\d+[\\.,、]";
//                                String regex = "(?<=\\d+)([\\.,、])";
                                // 使用正则替换，匹配的数字后添加换行符
                                yxbx = yxbx.replaceAll(regex, "\n$0");
//                                bgNr = bgNr.replaceAll(regex, "\n$0");

                                if(StringUtil.isNotBlank(yxbx)) yxbx = yxbx.replaceAll(regex, "\n$0");
                                if(StringUtil.isBlank(bgNr)) bgNr = "";
                                if(StringUtil.isBlank(yxbx)) yxbx = "";
                                tjPdfVO.setTs(yxbx);
                                tjPdfVO.setSj(bgNr);
                                tjPdfVO.setShys(jcbgd.getShysxm());

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

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

@@ -623,11 +624,11 @@
                                            , replacedAll, detail.getProResult());


                                    String[] split = detail.getProResult().split("。|,|，");
                                  String[] split = detail.getProResult().split("[。,，:：.\\s]+");
                                    List<Map<String, Object>> mapList = new ArrayList<>();
                                    for (String s : split) {
                                        s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");;
                                        //                                        Map<String,Object> maps= rulesService.getyichangxiangmujianyiguizeJianCha(s);
                                      s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "").replaceAll(" ","")
                                              .replaceAll("症","").replaceAll("[0-9]", "");
                                        Map<String, Object> mapss = tjProAdvicerulesService.getyichangxiangmujianyiguizeJianCha(deptname, s, "0",xb);
                                        if (null != mapss && !mapss.isEmpty()) {
                                            Object bt = mapss.get("bt");
@@ -669,7 +670,7 @@
                                            , replacedAll, "", order.getTjNumber(), replacedAll, detail.getProResult());


                                    String[] split = detail.getProResult().split("。|,|，");
                                  String[] split = detail.getProResult().split("[。,，:：.\\s]+");
                                    List<Map<String, Object>> mapList = new ArrayList<>();
                                    for (String s : split) {
                                        s = s.replaceAll("\n", "").replaceAll("[（(][^）)]*[）)]", "");;
@@ -694,6 +695,7 @@
                                   ssyszys.append(detail.getProName()).append("/");
                                   ssyszyjgs.append(detail.getProResult()).append("/");
                                }
                          }
                        } else {
                            if(detail.getProName().contains("舒张压") || detail.getProName().contains("收缩压")){
                                ssyszys.append(detail.getProName()).append("/");

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

@@ -340,7 +340,9 @@
                try {
                    return shengchengbgmoban(tjNumber, tjOrder, tjCustomer, reportTemplate,zongJianYiShiQianMing);
                } catch (Exception e) {
                    log.error("生成报告失败："+e.getMessage(),String.valueOf(e));
//                    throw new Exception(e);
//                    log.error("生成报告失败："+e.getMessage(),String.valueOf(e));
                     e.printStackTrace();
                    tjOrder.setReportTime(null);
                    tjOrder.setCheckTime(null);
                    tjOrder.setCheckStatus(0);

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

@@ -74,6 +74,8 @@
    private LtkjExamJcbgdService jcbgdService;
    @Resource
    private LtkjExamJcsqdService jcsqdService;
    @Autowired
    private TjJcycxmService jcycxmService;
    @Value("${path.xdtfilePath}")
    private String value;
    /**
@@ -351,13 +353,36 @@
            jcbgd.setShysxm(xdtgmdjg.getCreateBy());
            jcbgd.setShysdm(xdtgmdjg.getCreateId());
            jcbgd.setYxzd(xdtgmdjg.getJcjl());
            jcbgd.setYxbx("未见异常");
            jcbgd.setYxbx(xdtgmdjg.getJcjl());
            jcbgd.setZdsj(DateUtil.format(date,"yyyy-MM-dd"));
            jcbgd.setJcbw("");
            jcbgd.setLx("1");
            jcbgd.setSqsj(DateUtil.format(date,"yyyy-MM-dd"));
            jcbgd.setCreateTime(date);
            jcbgdService.save(jcbgd);
            jcsqdService.saveLtkjExamJcsqd(xdtgmdjg.getCardId());
            jcsqdService.saveXdtLtkjExamJcsqd(xdtgmdjg.getCardId(),jcbgd.getTmh());

            LambdaQueryWrapper<TjJcycxm> wq=new LambdaQueryWrapper<>();
            wq.eq(TjJcycxm::getTjh,xdtgmdjg.getTjh());
            wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId());
            jcycxmService.remove(wq);
            if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){
                String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("。|；|;|,|，");
                for (String jg : split) {
                    if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常")
                            && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
                            && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")){
                        TjJcycxm jcycxm=new TjJcycxm();
                        jcycxm.setTjh(xdtgmdjg.getTjh());
                        jcycxm.setYqid("");
                        jcycxm.setProId(xdtgmdjg.getProId());
                        jcycxm.setProName(xdtgmdjg.getProName());
                        jcycxm.setCreateTime(new Date());
                        jcycxm.setJcjg(jg);
                        jcycxmService.save(jcycxm);
                    }
                }
            }
        } catch (Exception e) {
            throw new RuntimeException(e);
        }

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

@@ -43,6 +43,13 @@
        "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} and a.lx=0  GROUP BY a.xmmc")
    void saveLtkjExamJcsqd(String tjh);

    @Insert("INSERT INTO  ltkj_exam_jcsqd (`tjh`, `tmh`, `jclx`, `jczlx`, `bgys`, `bgysid`, " +
            "`sqsj`, `jgsj`, `jcxmmc`, `jcxmid`, `bw`, `jgzt`, `jgbx`, `lx`, `create_time`)\n" +
            "SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw,\n" +
            "a.yxzd jgzt,a.bg_nr jgbx,'1',sysdate()\n" +
            "FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} and a.tmh=#{tmh} and a.lx=1  GROUP BY a.xmmc")
    void saveXdtLtkjExamJcsqd(@Param("tjh") String tjh,@Param("tmh")String tmh);

    @Select("SELECT a.tjh,a.tmh,NULL jclx,NULL jczlx,a.shysxm bgys,a.shysdm bgysid,a.sqsj,a.zdsj jgsj, a.xmmc jcxmmc,a.xmdm jcxmid,a.jcbw bw," +
            "a.yxzd jgzt,a.yxbx jgbx FROM ltkj_exam_jcbgd a WHERE a.tjh=#{tjh} GROUP BY a.xmmc")
    List<LtkjExamJcbgd> queryLtkjExamJcsqdByTjh(String tjh);

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/LtkjExamJcsqdService.java

@@ -25,6 +25,8 @@

    void saveLtkjExamJcsqd(String tjh);

    void saveXdtLtkjExamJcsqd(String tjh,String tmh);

    AjaxResult getTjJcProByHisCall(String ksmc,String strIn,String brid,int pagecount,int page,String status);

    List<LtkjExamJcbgd> queryLtkjExamJcsqdByTjh(String tjh);

 ltkj-hosp/src/main/java/com/ltkj/hosp/service/impl/LtkjExamJcsqdServiceImpl.java

@@ -70,6 +70,11 @@
    }

    @Override
    public void saveXdtLtkjExamJcsqd(String tjh, String tmh) {
        mapper.saveXdtLtkjExamJcsqd(tjh,tmh);
    }

    @Override
    public AjaxResult getTjJcProByHisCall(String ksmc,String strIn,String brid,int pagecount,int page,String status) {
        List<Map<String, Object>> tjJcProByHisCall = mapper.getTjJcProByHisCall(ksmc,strIn,brid,pagecount,page,status);
        return AjaxResult.success().put("data",tjJcProByHisCall);

 ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcbgd.java

@@ -38,6 +38,8 @@
    private String zdsj;
    private String sqsj;
    private String jcbw;
    private String lx;
    private String sgorzd;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")

 ltkj-hosp/src/main/java/com/ltkj/hosp/sqlDomain/LtkjExamJcsqd.java

@@ -29,6 +29,8 @@
    private String jgzt;
    private String jgbx;
    private String jgsj;
    private String lx;
    private String sgorzd;
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @ApiModelProperty(value = "创建时间")