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

@@ -33,6 +33,7 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.config.pdfutils.PdfUtils;
import com.ltkj.web.controller.system.SysDeptController;
import jodd.util.StringUtil;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -2661,7 +2662,9 @@
                                // æ­£åˆ™è¡¨è¾¾å¼ï¼šåŒ¹é…æ•°å­—后跟 '.' æˆ– '、'
                                String regex = "\\d+[\\.,、]";
                                // ä½¿ç”¨æ­£åˆ™æ›¿æ¢ï¼ŒåŒ¹é…çš„数字后添加换行符
                                yxbx = yxbx.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

@@ -597,69 +597,157 @@
    }

    @Override
    @Async("async")
    public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order,TjOrderRemark orderRemark) {
        String deptname="";
        TjProject tjProject = projectService.getById(orderRemark.getProId());
        if(null !=tjProject){
            SysDept dept = deptService.getById(tjProject.getDeptId());
            if(dept.getParentId()!=100L){
                deptname= deptService.getprentks(dept.getParentId().toString());
            }else {
                deptname=dept.getDeptName();
            }
            String xb= tjCustomerService.getSexByTjh(order.getTjNumber());
    //@Async("async")
    public void updateOrdeltile(List<TjOrderDetail> tjOrderDetailList, SysUser sysUser, TjOrder order, TjOrderRemark orderRemark) {

            for (TjOrderDetail detail : tjOrderDetailList) {
                detail.setTjStatus(1L);
                LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
                wq0.eq(TjStandard::getProId, detail.getProId());
                detail.setUpdateBy(sysUser.getNickName());
                detail.setUpdateTime(new Date());
                detail.setCreateId(String.valueOf(sysUser.getUserId()));
                detail.setUpdateId(String.valueOf(sysUser.getUserId()));
                tjOrderDetailService.updateById(detail);
                try {
                    LambdaQueryWrapper<TjOrderYcxm> wq=new LambdaQueryWrapper<>();
                    wq.eq(TjOrderYcxm::getTjh,order.getTjNumber());
                    wq.eq(TjOrderYcxm::getJcxm,detail.getProName());
                    TjOrderYcxm ycxm = ycxmService.getOne(wq);
                    if(null !=ycxm){
                        ycxm.setJcjg(detail.getProResult());
                        String replacedAll = detail.getProName().replaceAll("[（(][^）)]*[\u4e00-\u9fa5]+[^）)]*[）)]", "").replaceAll("[（(][^）)]*[）)]", "")
                                .replaceAll("[ æµ‹å®šæ£€æµ‹]", "").replaceAll("\\[.*?\\]", "").replaceAll("◆", "");
                        List<Map<String,Object>> maps= rulesService.getyichangxiangmujianyiguize(detail.getProId().toString()
                                ,replacedAll,"",order.getTjNumber()
                                ,replacedAll
                                ,detail.getProResult());
        try {
            String deptname = "";
            TjProject tjProject = projectService.getById(orderRemark.getProId());
            if (null != tjProject) {
                SysDept dept = deptService.getById(tjProject.getDeptId());
                if (dept.getParentId() != 100L) {
                    deptname = deptService.getprentks(dept.getParentId().toString());
                } else {
                    deptname = dept.getDeptName();
                }
                String xb= tjCustomerService.getSexByTjh(order.getTjNumber());

                        String[] split = detail.getProResult().split("。|,|，");
                        List<Map<String,Object>> mapList=new ArrayList<>();
                        for (String s : split) {
                            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()){
                                Object bt = mapss.get("bt");
                                Object nr = mapss.get("nr");
                                if(null !=bt || null !=nr){
                StringBuilder ssyszys = new StringBuilder();
                StringBuilder ssyszyjgs = new StringBuilder();
                List<Map<String, Object>> jianyilis=new ArrayList<>();
                for (TjOrderDetail detail : tjOrderDetailList) {
                    detail.setTjStatus(1L);
                    LambdaQueryWrapper<TjStandard> wq0 = new LambdaQueryWrapper<>();
                    wq0.eq(TjStandard::getProId, detail.getProId());
                    detail.setUpdateBy(sysUser.getNickName());
                    detail.setUpdateTime(new Date());
                    detail.setCreateId(String.valueOf(sysUser.getUserId()));
                    detail.setUpdateId(String.valueOf(sysUser.getUserId()));
                    tjOrderDetailService.updateById(detail);

                                } mapList.add(mapss);
                    LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjOrderYcxm::getTjh, order.getTjNumber());
                    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("◆", "");

                            if(!detail.getProName().contains("舒张压") && !detail.getProName().contains("收缩压")){

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


                                String[] split = detail.getProResult().split("[。,，:：.\\s]+");
                                List<Map<String, Object>> mapList = new ArrayList<>();
                                for (String s : split) {
                                    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");
                                        Object nr = mapss.get("nr");
                                        if (null != bt || null != nr) {

                                        }
                                        mapList.add(mapss);
                                    }
                                }
                                TjOrderYcxm ycxm = ycxmService.getOne(wq);
                                if (null != ycxm) {
                                    ycxm.setJcjg(detail.getProResult());
                                    if (null != maps && !maps.isEmpty()) {
                                        ycxm.setJynr(JSONUtil.toJsonStr(maps));
                                    }
                                    if (!mapList.isEmpty()) {
                                        ycxm.setJynr(JSONUtil.toJsonStr(mapList));
                                    }
                                    ycxmService.updateById(ycxm);
                                }else {
                                    TjOrderYcxm orderYcxm =new TjOrderYcxm();
                                    orderYcxm.setTjh(order.getTjNumber());
                                    orderYcxm.setParentName(tjProject.getProName());
                                    orderYcxm.setJcxm(detail.getProName());
                                    orderYcxm.setJcjg(detail.getProResult());
                                    if (null != maps && !maps.isEmpty()) {
                                        orderYcxm.setJynr(JSONUtil.toJsonStr(maps));
                                    }
                                    if (!mapList.isEmpty()) {
                                        orderYcxm.setJynr(JSONUtil.toJsonStr(mapList));
                                    }
                                    orderYcxm.setJyjc("0");
                                    ycxmService.save(orderYcxm);
                                }
                            }else {

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


                                String[] split = detail.getProResult().split("[。,，:：.\\s]+");
                                List<Map<String, Object>> mapList = new ArrayList<>();
                                for (String s : split) {
                                    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");
                                        Object nr = mapss.get("nr");
                                        if (null != bt || null != nr) {

                                        }
                                        mapList.add(mapss);
                                    }
                                }

                                if (null != maps && !maps.isEmpty()) {
                                    jianyilis.addAll(maps);
                                }
                                if (!mapList.isEmpty()) {
                                    jianyilis.addAll(mapList);
                                }
                                ssyszys.append(detail.getProName()).append("/");
                                ssyszyjgs.append(detail.getProResult()).append("/");
                            }
                        }
                    } else {
                        if(detail.getProName().contains("舒张压") || detail.getProName().contains("收缩压")){
                            ssyszys.append(detail.getProName()).append("/");
                            ssyszyjgs.append(detail.getProResult()).append("/");

                        if(null != maps && !maps.isEmpty()){
                            ycxm.setJynr(JSONUtil.toJsonStr(maps));
                        }
                        if( !mapList.isEmpty()){
                            ycxm.setJynr(JSONUtil.toJsonStr(mapList));
                        }
                        ycxmService.updateById(ycxm);
                        if(detail.getExceptionDesc()==0)ycxmService.remove(wq);

                    }
                } catch (Exception e) {
                }

                // ä½¿ç”¨ stream è¿‡æ»¤å‡º proName ä¸º "舒张压" æˆ– "收缩压" çš„元素
                List<TjOrderDetail> filteredList = tjOrderDetailList.stream()
                        .filter(a -> ("舒张压".equals(a.getProName()) || "收缩压".equals(a.getProName())) && a.getExceptionDesc()==1)
                        .collect(Collectors.toList());
                if(StrUtil.isNotBlank(ssyszys.toString())){

                    LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>();
                    wq.eq(TjOrderYcxm::getTjh, order.getTjNumber());
                    wq.like(TjOrderYcxm::getJcxm,"舒张压");
                    ycxmService.remove(wq);

                    if(!filteredList.isEmpty()){
                        TjOrderYcxm orderYcxm =new TjOrderYcxm();
                        orderYcxm.setTjh(order.getTjNumber());
                        orderYcxm.setParentName(tjProject.getProName());
                        orderYcxm.setJcxm(ssyszys.toString().replaceFirst("/$", ""));
                        orderYcxm.setJcjg(ssyszyjgs.toString().replaceFirst("/$", ""));
                        orderYcxm.setJynr(JSONUtil.toJsonStr(jianyilis));
                        orderYcxm.setJyjc("0");
                        ycxmService.save(orderYcxm);
                    }
                }
            }
        } catch (Exception e) {
            e.printStackTrace();
            log.error(String.valueOf(e));
        }

    }

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

@@ -825,6 +825,7 @@
                                    @ApiParam(value = "已检未检状态 0 æœªæ£€ 1已检") @RequestParam(required = false) Integer type) {
        if(type == null)type= 0;
        String userId = SecurityUtils.getLoginUser().getUserId();
        log.info("当前登录用户ID ->{}",userId);
        Integer ksId = null;
        SysUser sysUser = null;
        if (null != userId) {
@@ -897,6 +898,7 @@
                }
            }
        }
        log.info("type ->{},查询关联科室集合 ->{}",type,split);
            List<TjOrderRemark> list;
            if(null != sysUser && sysUser.getUserName().equals("10001")){
                if(type !=1){
@@ -912,6 +914,7 @@
                }
            }
            if (null ==list || list.isEmpty()) {
                log.info("触发该科室下无项目");
                return AjaxResult.error("该科室下无项目！");
            }
            for (TjOrderRemark tjOrderRemark : list) {

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

@@ -1812,10 +1812,11 @@
                                            }

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

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

@@ -361,7 +361,6 @@
            if(null !=order){
                TjProject project = projectService.getById(proId);
                if(null !=project){
//                    List<TjProject> projects = projectService.getTjProjectListBySoneId(proId);
                    LambdaQueryWrapper<TjOrderDetail>wq1=new LambdaQueryWrapper<>();
                    wq1.eq(TjOrderDetail::getProId,proId);
                    wq1.eq(TjOrderDetail::getOrderId,order.getOrderId());
@@ -425,13 +424,38 @@
            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());

            jcsqdService.deletedLtkjJcsqdByTjhandtmh1(xdtgmdjg.getCardId());

            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-admin/src/main/resources/sql/ÎÞ·¨²éµ½´æ´¢¹ý³ÌÎÊÌâ.sql

New file
@@ -0,0 +1,20 @@
-- æŸ¥è¯¢æ‰€æœ‰å­˜å‚¨è¿‡ç¨‹
SELECT db AS routine_schema,
       name AS routine_name,
       type AS routine_type,
       definer
FROM mysql.proc
WHERE db = 'ltkjpeis10' AND type = 'PROCEDURE';


-- èŽ·å–查询存储过程语句的sql
SELECT CONCAT('SHOW CREATE PROCEDURE ', db, '.', name, ';') AS create_procedure_statement
FROM mysql.proc
WHERE db = 'ltkjpeis10' AND type = 'PROCEDURE';

-- åˆ é™¤å­˜å‚¨è¿‡ç¨‹
DROP PROCEDURE IF EXISTS ltkjpeis10.xxx;
-- å†åˆ›å»ºå­˜å‚¨è¿‡ç¨‹

-- ä¿®å¤mysql.proc表
mysqlcheck -u root -p --repair mysql proc

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

@@ -45,6 +45,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);
@@ -62,11 +69,4 @@
    @Delete ("DELETE FROM ltkj_exam_jcsqd WHERE tjh=#{tjh} and jcxmid = #{xmid} and lx=0 and sgorzd=1 ")
    void deletedLtkjJcsqdByTjhAndProId(@Param("tjh") String tjh,@Param("xmid") String xmid);


    @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.lx=1  GROUP BY a.xmmc")
    void saveLtkjExamJcsqdxdt(String tjh);
}

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

@@ -31,7 +31,8 @@

    void saveLtkjExamJcsqd(String tjh);

    void saveLtkjExamJcsqdxdt(String tjh);
    void saveXdtLtkjExamJcsqd(String tjh,String tmh);


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


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

@@ -82,8 +82,8 @@
    }

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

    @Override