ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -171,18 +171,21 @@ if(StringUtil.isBlank(regex)) regex= "。|；|;|,|，"; String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex); for (String jg : split) { boolean b = configController.apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(dictHosp.getCode()); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); if(StringUtil.isNotBlank(jg)){ boolean b = configController.apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(dictHosp.getCode()); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); } } /* if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见") && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")&& !jg.contains("无殊")){ ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -313,20 +313,26 @@ jcycxmService.deletedByTjh(s); for (LtkjExamJcsqd jcsqd : jcsqdList) { if(StringUtil.isNotBlank(jcsqd.getJgzt())){ String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;"); String regex = configService.selectConfigByKey("jcycxmzz"); if(StringUtil.isBlank(regex)) regex= "。|；|;|,|，"; String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex); // String[] split = jcsqd.getJgzt().replaceAll("\n", "").split("。|；|;"); for (String jg : split) { boolean b = apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(yqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); if(StringUtil.isNotBlank(jg)){ boolean b = apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(yqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); } } /* if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见") && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")&& !jg.contains("无殊")){ @@ -472,18 +478,21 @@ System.out.println("jcycxmzz值为"+regex); String[] split = jcsqd.getJgzt().replaceAll("\n", "").split(regex); for (String jg : split) { boolean b = apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(yqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); if(StringUtil.isNotBlank(jg)){ boolean b = apiJcycpdgjz(jg); if(!b){ TjJcycxm jcycxm=new TjJcycxm(); jcycxm.setTjh(s); jcycxm.setYqid(yqbm); String[] split1 = jcsqd.getJcxmid().split(";"); jcycxm.setProId(split1[0]); jcycxm.setProName(jcsqd.getJcxmmc()); jcycxm.setCreateTime(new Date()); jcycxm.setJcjg(jg); jcycxmService.save(jcycxm); } } /* if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.matches("\\d+") && !jg.contains("未见占位") && !jg.contains("未见") && !jg.contains("未见明显")&& !jg.contains("正常")&& !jg.contains("双侧椎间孔无狭窄")&& !jg.contains("无殊")){ ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -51,6 +51,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -136,6 +137,8 @@ private ITjProAdvicerulesService tjProAdvicerulesService; @Autowired private TjOrderYcxmService ycxmService; @Autowired private TjReportController reportController; @Autowired private ISysDictDataService sysDictDataService; @@ -1137,9 +1140,6 @@ /** * 根据体检订单号获取体检详情信息接口 * * @param tjNumber * @param advice * @param checkStatus * @return */ @PostMapping("/getTjdetailList") @@ -1170,7 +1170,12 @@ if (StrUtil.isNotBlank(dto.getZhiyeJg())) tjOrder.setZhiyeJg(dto.getZhiyeJg()); if (orderService.updateById(tjOrder)) { return AjaxResult.success("操作成功"); AjaxResult pdf = reportController.toPdf(dto.getTjNumber()); if (!pdf.get("code").toString().equals("200") ) { TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); return AjaxResult.error("操作失败!"); } return AjaxResult.success("审核并生成报告成功!"); } return AjaxResult.error("操作失败"); } @@ -1601,19 +1606,25 @@ public AjaxResult getzongjianyishengchakanyichangxiangmu(@RequestParam String tjNum) { try { if (StrUtil.isNotBlank(tjNum)) { List<Map<String, Object>> maps = new ArrayList<>(); TjOrder one = orderService.getOrderByTjNum(tjNum); if (one == null) { return AjaxResult.error("暂无数据！！"); } yichangxiangmu(tjNum); LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>(); wq.eq(TjOrderYcxm::getTjh, tjNum); List<TjOrderYcxm> list = ycxmService.list(wq); if (null != list && !list.isEmpty()) { Collections.reverse(list); return getOrderYcxmList(list); } else { List<TjOrderYcxm> tjOrderYcxmList= ycxmService.selectListByTjh(tjNum); if(null!=tjOrderYcxmList&&!tjOrderYcxmList.isEmpty()){ LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>(); wq.eq(TjOrderYcxm::getTjh, tjNum); List<TjOrderYcxm> list = ycxmService.list(wq); if (null != list && !list.isEmpty()) { Collections.reverse(list); return getOrderYcxmList(list); } else { return AjaxResult.success(maps); } }else { return zongjianyishengchakanyichangxiangmu(tjNum); } } ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjXdPictureController.java
@@ -367,18 +367,23 @@ wq.eq(TjJcycxm::getProId,xdtgmdjg.getProId()); jcycxmService.remove(wq); if(StringUtil.isNotBlank(xdtgmdjg.getJcjl())){ String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("。|；|;|,|，"); String regex = configService.selectConfigByKey("jcycxmzz"); if(StringUtil.isBlank(regex)) regex= "。|；|;|,|，"; String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split(regex); // String[] split = xdtgmdjg.getJcjl().replaceAll("\n", "").split("。|；|;|,|，"); for (String jg : split) { boolean b = configController.apiJcycpdgjz(jg); if(!b){ 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); if(StringUtil.isNotBlank(jg)){ boolean b = configController.apiJcycpdgjz(jg); if(!b){ 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); } } /* if(StringUtil.isNotBlank(jg) && !jg.contains("未见异常") && !jg.contains("未见明显异常") && !jg.contains("未见占位") && !jg.contains("未见")
