ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -114,16 +114,17 @@ // 执行日志同步任务的方法 public void executeTask(DictHosp dictHosp) { // 获取锁，确保同一时间只有一个任务执行 log.info("{}执行结果同步加锁前",JSONUtil.toJsonStr(dictHosp)); ReentrantLock reentrantLock = getLock(dictHosp.getCode()); boolean lock = reentrantLock.tryLock(); try { log.info("{}执行结果同步加锁后",JSONUtil.toJsonStr(dictHosp)); log.info("{}执行结果同步", dictHosp.getCode()); dataSourceConfig.addDataSource(dictHosp.getDbname()); DataSourceContextHolder.setDataSourceKey(dictHosp.getDbname()); String dsqkssj = configService.selectConfigByKey("dsqkssj"); String dsqjssj = configService.selectConfigByKey("dsqjssj"); boolean panduandangqianshijian = panduandangqianshijian(dsqkssj, dsqjssj); ReentrantLock reentrantLock = getLock(dictHosp.getCode()); boolean lock = reentrantLock.tryLock(); try { if (!panduandangqianshijian) { if (lock) { log.info("任务开始执行时间 -> {}", dateTimeFormat.format(new Date())); ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
@@ -997,18 +997,20 @@ // List<Map<String, Object>> jiancha = new ArrayList<>(); paragraph = PdfUtils.setParagraph(defaultTitleFont, "检查综述："); paragraph.setSpacingBefore(3f); paragraph.setSpacingAfter(2f); document2.add(paragraph); int xmXh = 1; Map<Long, List<TjOrderDetail>> collect = orderDetails.stream().collect(Collectors.groupingBy(TjOrderDetail::getProId)); LambdaQueryWrapper<TjOrderYcxm> wq = new LambdaQueryWrapper<>(); wq.eq(TjOrderYcxm::getTjh, tjOrder.getTjNumber()); List<TjOrderYcxm> ycxms = ycxmService.list(wq); boolean isBr = false; if (null != ycxms && !ycxms.isEmpty()) { paragraph = PdfUtils.setParagraph(defaultTitleFont, "检查综述："); paragraph.setSpacingBefore(3f); paragraph.setSpacingAfter(2f); document2.add(paragraph); isBr = true; Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName)); @@ -1049,6 +1051,15 @@ } } }else { if (!collect.isEmpty() && !map.isEmpty()){ paragraph = PdfUtils.setParagraph(defaultTitleFont, "检查综述："); paragraph.setSpacingBefore(3f); paragraph.setSpacingAfter(2f); document2.add(paragraph); isBr = true; } for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) { List<CsProVo> proVos = deptEntry.getValue(); if (proVos.size() > 1) { @@ -1139,17 +1150,22 @@ if(isBr) { paragraph = PdfUtils.setParagraph(defaultFont, ""); paragraph.setLeading(0f); paragraph.setSpacingBefore(10f); paragraph.setSpacingAfter(10f); document2.add(paragraph); } xmXh = 0; if (null != ycxms && !ycxms.isEmpty()) { paragraph = PdfUtils.setParagraph(defaultTitleFont, "医生建议："); paragraph.setSpacingBefore(3f); paragraph.setSpacingAfter(2f); document2.add(paragraph); xmXh = 0; if (null != ycxms && !ycxms.isEmpty()) { Map<String, List<TjOrderYcxm>> stringListMap = ycxms.stream().collect(Collectors.groupingBy(TjOrderYcxm::getParentName)); @@ -1375,6 +1391,14 @@ } }*/ } else { if (!collect.isEmpty() && !map.isEmpty()){ paragraph = PdfUtils.setParagraph(defaultTitleFont, "医生建议："); paragraph.setSpacingBefore(3f); paragraph.setSpacingAfter(2f); document2.add(paragraph); } for (Map.Entry<String, List<CsProVo>> deptEntry : listMap.entrySet()) { List<CsProVo> proVos = deptEntry.getValue(); if (proVos.size() > 1) { ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
@@ -742,6 +742,7 @@ List<String> baoGaoDans = ltkjHybgdService.getJianYanBaoGaoDan(order.getCardId()); List<String> jianChaBaoGaoDan = ltkjHybgdService.getJianChaBaoGaoDan(order.getCardId()); //同步检验 String resultMsg = ""; if (null != baoGaoDans && !baoGaoDans.isEmpty()) { Date dates = new Date(); Map<String, Object> map = new HashMap<>(); @@ -756,9 +757,10 @@ String result1 = getAjaxResult(result); JSONObject object = getJSONObject(result1); String code = object.getStr("ResultCode"); if (null == code || !code.equals("0")) { return AjaxResult.error("化验项目暂时未出结果,请稍后同步!!!"); } // if (null == code || !code.equals("0")) { // return AjaxResult.error("化验项目暂时未出结果,请稍后同步!!!"); // } if (null != code && code.equals("0")) { JSONArray data = object.getJSONArray("ResultData"); for (Object datum : data) { JSONObject jsonObject = (JSONObject) datum; @@ -788,6 +790,9 @@ }else { saveHybgd(hysqd); } } }else { resultMsg = "化验项目暂时未出结果,请稍后同步!!!"; } //同步化验项目 // testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId); @@ -851,11 +856,14 @@ jcsqdService.saveLtkjExamJcsqd(order.getCardId()); // testMapper.updateDetailByTjJcCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId); }else { return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!"); resultMsg = "检查项目暂时未出结果,请稍后同步!!!"; // return AjaxResult.error("检查项目暂时未出结果,请稍后同步!!!"); } } } if (StrUtil.isBlank(resultMsg)) return AjaxResult.success("同步成功"); else return AjaxResult.error(resultMsg); } //化验 // testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
