From f0cfaecd79e18beff3a33a9152f855ca757282ba Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期三, 05 三月 2025 18:09:15 +0800
Subject: [PATCH] 2025-03-05
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 15 ++--
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java | 52 ++++++++++++----
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java | 74 +++++++++++++-----------
3 files changed, 87 insertions(+), 54 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
index 7a41f2b..75ac273 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java
@@ -114,16 +114,17 @@
// 鎵ц鏃ュ織鍚屾浠诲姟鐨勬柟娉�
public void executeTask(DictHosp 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);
-
+ 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);
if (!panduandangqianshijian) {
if (lock) {
log.info("浠诲姟寮�濮嬫墽琛屾椂闂� -> {}", dateTimeFormat.format(new Date()));
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
index 1ebb89f..dede3db 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisPDFUtil.java
+++ b/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 @@
- paragraph = PdfUtils.setParagraph(defaultFont, "");
- paragraph.setLeading(0f);
- paragraph.setSpacingBefore(10f);
- paragraph.setSpacingAfter(10f);
- document2.add(paragraph);
- paragraph = PdfUtils.setParagraph(defaultTitleFont, "鍖荤敓寤鸿锛�");
- paragraph.setSpacingBefore(3f);
- paragraph.setSpacingAfter(2f);
- document2.add(paragraph);
+ 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);
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) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
index 4b00216..34b884e 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjCheckController.java
+++ b/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,38 +757,42 @@
String result1 = getAjaxResult(result);
JSONObject object = getJSONObject(result1);
String code = object.getStr("ResultCode");
- if (null == code || !code.equals("0")) {
- return AjaxResult.error("鍖栭獙椤圭洰鏆傛椂鏈嚭缁撴灉,璇风◢鍚庡悓姝�!!!");
- }
- JSONArray data = object.getJSONArray("ResultData");
- for (Object datum : data) {
- JSONObject jsonObject = (JSONObject) datum;
- boolean isInsertHysqd = false;
- LtkjHysqd hysqd = new LtkjHysqd();
- hysqd.setTjh(order.getCardId());
- hysqd.setTmh(jsonObject.getStr("JYBGID"));
- hysqd.setBbbh(jsonObject.getStr("BBDM"));
- hysqd.setBbmc(jsonObject.getStr("BBMC"));
- hysqd.setXmid(jsonObject.getStr("JYXMDM"));
- hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
- hysqd.setSqsj(jsonObject.getStr("SQRQ"));
- hysqd.setSqys(jsonObject.getStr("SQRBH"));
- hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
- hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
- hysqd.setSqdh(jsonObject.getStr("SQDBH"));
- hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
- hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
- hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
- hysqd.setCreateTime(new Date());
- QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
- List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
- if (list.isEmpty())
- isInsertHysqd = true;
- if (isInsertHysqd){
- saveHysqd(hysqd);
- }else {
- saveHybgd(hysqd);
+// 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;
+ boolean isInsertHysqd = false;
+ LtkjHysqd hysqd = new LtkjHysqd();
+ hysqd.setTjh(order.getCardId());
+ hysqd.setTmh(jsonObject.getStr("JYBGID"));
+ hysqd.setBbbh(jsonObject.getStr("BBDM"));
+ hysqd.setBbmc(jsonObject.getStr("BBMC"));
+ hysqd.setXmid(jsonObject.getStr("JYXMDM"));
+ hysqd.setXmmc(jsonObject.getStr("JYXMMC"));
+ hysqd.setSqsj(jsonObject.getStr("SQRQ"));
+ hysqd.setSqys(jsonObject.getStr("SQRBH"));
+ hysqd.setJgsj(jsonObject.getStr("JYBGRQ"));
+ hysqd.setSqrxm(jsonObject.getStr("SQRXM"));
+ hysqd.setSqdh(jsonObject.getStr("SQDBH"));
+ hysqd.setShrdm(jsonObject.getStr("JYYSBH"));
+ hysqd.setShrxm(jsonObject.getStr("JYYSQM"));
+ hysqd.setJybgjg(jsonObject.getStr("JYBGJG"));
+ hysqd.setCreateTime(new Date());
+ QueryWrapper<LtkjHysqd> queryWrapper = new QueryWrapper<>(hysqd);
+ List<LtkjHysqd> list = ltkjHysqdService.list(queryWrapper);
+ if (list.isEmpty())
+ isInsertHysqd = true;
+ if (isInsertHysqd) {
+ saveHysqd(hysqd);
+ } 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("妫�鏌ラ」鐩殏鏃舵湭鍑虹粨鏋�,璇风◢鍚庡悓姝�!!!");
}
}
}
- return AjaxResult.success("鍚屾鎴愬姛");
+ if (StrUtil.isBlank(resultMsg))
+ return AjaxResult.success("鍚屾鎴愬姛");
+ else return AjaxResult.error(resultMsg);
}
//鍖栭獙
// testMapper.updateDetailByCall(order.getCardId(), String.valueOf(order.getOrderId()), order.getTjNumber(), doctorId);
--
Gitblit v1.8.0