ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysConfigController.java
@@ -8,6 +8,7 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import cn.hutool.extra.pinyin.PinyinUtil; import cn.hutool.json.JSONUtil; import com.ltkj.common.core.domain.entity.SysMenu; import com.ltkj.common.utils.SecurityUtils; import com.ltkj.framework.datasource.DynamicDataSourceContextHolder; @@ -231,6 +232,7 @@ try { List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s); if(null !=awsList && !awsList.isEmpty()){ log.info("外送项目个数->{} 结果",awsList.size()); log.info(awsList.toString()); testMapper.delWsxmjg(s); log.info("删除外送项目成功"); @@ -238,9 +240,14 @@ log.info("保存外送项目成功"); } List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s); log.info("原hysqdList->{} 结果", JSONUtil.parseObj(hysqdList)); List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s); if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq); if(null !=wssq && !wssq.isEmpty()){ log.info("外送项个->{} 结果",wssq.toString()); hysqdList.addAll(wssq); } if (null != hysqdList && !hysqdList.isEmpty()) { log.info("现hysqdList->{} 结果", JSONUtil.parseObj(hysqdList)); for (LtkjHysqd hysqd : hysqdList) { LtkjHysqd jybgid = ltkjHysqdService.getLtkjHysqdByTjhAndTmh(hysqd.getTjh(), hysqd.getTmh()); if (null != jybgid) { @@ -331,7 +338,7 @@ @GetMapping ("/tbhisproprice")//同步his项目单价信息 @PreAuthorize("@ss.hasPermi('system:config:tbhisproprice')") public AjaxResult tbhisproprice() { configService.tbhisproprice(); configService.tbhisproprice(); return AjaxResult.success(); }
@@ -1085,7 +1085,10 @@ tjOrderService.tjQiandaodengji(tjOrder.getTjNumber()); return result; } } finally { }catch (Exception e){ log.error(String.valueOf(e)); } finally { lock.unlock(); } return AjaxResult.error(); @@ -1347,6 +1350,7 @@ // 查询 对接Lis、Pacs申请如果类型包含在配置内则使用对接lis、pacs if (lisApiMethod.isUseLisAndPacsRegister(tjOrder)) { log.info("签到登记进入未收费方法"); // 这是上面个人方法引入数据 tjFlowingWater.setPayStasus(1L); newSaveextracted(tjOrder, tjCustomer, discount, sysUser, tjReservation, tjFlowingWater); @@ -1356,6 +1360,7 @@ List<TjXdPicture> xdPictureList = xdPictureService.saveTjXdPicture(tjOrder.getTjNumber()); xdPictureService.saveBatch(xdPictureList); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(tjOrder.getOrderId()); log.info("签到登记:采样数据查询个数"+detailList.size()); addCaiYangDengJi(detailList, !detailList.isEmpty(), tjOrder, sysUser, null); return AjaxResult.success(tjNumber); } else { @@ -1522,6 +1527,28 @@ } else { tjSamplingMapper.updateUserIdByTjNum(order.getTjNumber(), sysUser.getNickName(), String.valueOf(sysUser.getUserId())); } } @GetMapping("/addCaiYangDengJi") @ApiOperation(value = "手动添加采样记录接口") public AjaxResult addCaiYangDengJi(@RequestParam("tjNum") String tjNum){ try { TjOrder order = tjOrderService.getOrderByTjNum(tjNum); if(null !=order){ Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId()); SysUser sysUser = userService.getById(userId); List<TjOrderDetail> detailList = tjOrderDetailService.getCaiYangDengJi(order.getOrderId()); log.info("签到登记:采样数据查询个数"+detailList.size()); addCaiYangDengJi(detailList, !detailList.isEmpty(), order, sysUser, null); } } catch (NumberFormatException e) { log.error(String.valueOf(e)); } return AjaxResult.success(); } @@ -1853,9 +1880,9 @@ tjOrder.setTjType("2"); } if (StringUtil.isBlank(tjOrder.getFirmId())) { tjOrder.setFirmId("0"); } if (StringUtil.isBlank(tjOrder.getFirmId())) { tjOrder.setFirmId("0"); } // // tjReservation.setIsExpire(1); // tjReservationService.updateById(tjReservation); ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjReportController.java
@@ -2139,20 +2139,8 @@ @GetMapping("/revocationReport/{TjNumber}") @ApiOperation(value = "撤销生成体检报告") @Transactional public AjaxResult revocationReport(@PathVariable("TjNumber") String tjNumber) { //逻辑删除数据库里的报告 QueryWrapper<TjReport> wq1 = new QueryWrapper<>(); wq1.select("re_id"); wq1.eq("tj_number", tjNumber); wq1.eq("type", "体检报告"); TjReport tjReport = tjReportService.getOne(wq1); if (null != tjReport) { // 不在使用逻辑删除 逻辑删除导致打印报告生成 查询sql缓慢 int i = tjReportService.deleteTjReportByReId(tjReport.getReId()); if (i == 0) { return AjaxResult.error("暂无体检报告,请撤回到总检未审核页面,需总检医生重新审核并生成报告!"); } } TjOrder one = tjOrderService.getOrderByTjNum(tjNumber); if(null !=one){ @@ -2173,6 +2161,21 @@ one.setPrintLastTime(null); one.setDownloadLastTime(null); if (tjOrderService.updateById(one)) { //逻辑删除数据库里的报告 QueryWrapper<TjReport> wq1 = new QueryWrapper<>(); wq1.select("re_id"); wq1.eq("tj_number", tjNumber); wq1.eq("type", "体检报告"); TjReport tjReport = tjReportService.getOne(wq1); if (null != tjReport) { // 不在使用逻辑删除 逻辑删除导致打印报告生成 查询sql缓慢 int i = tjReportService.deleteTjReportByReId(tjReport.getReId()); if (i == 0) { return AjaxResult.error("暂无体检报告,请撤回到总检未审核页面,需总检医生重新审核并生成报告!"); } } return AjaxResult.success("撤回成功！"); } }
