From 9a7ee34013ff0a0eb9a65d76ced42b4f13f3e4d4 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 13 三月 2025 17:39:22 +0800
Subject: [PATCH] 从lis、pacs视图查询增加携带院区 修改签到登记价格问题
---
ltkj-admin/src/main/java/com/ltkj/web/config/timer/AsyncResultTask.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 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..44abae9 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()));
@@ -138,7 +139,7 @@
if (null != jy && !jy.isEmpty()) {
log.info("鍚屾妫�楠屼汉鍛� 鎵ц鏁伴噺->{}", jy.size());
for (String s : jy) {
- extractedjianyan(s);
+ extractedjianyan(s,dictHosp.getCode());
}
}
@@ -146,7 +147,7 @@
if (null != jc && !jc.isEmpty()) {
log.info("鍚屾妫�鏌ヤ汉鍛� 鎵ц鏁伴噺->{}", jc.size());
for (String s : jc) {
- extractedjiancha(s);
+ extractedjiancha(s,dictHosp.getCode());
}
}
Map<String, Object> map = new HashMap<>();
@@ -222,7 +223,7 @@
taskScheduler.schedule(this::checkAndAddNewTasks, Instant.now().plus(2, ChronoUnit.MINUTES));
}
- private void extractedjianyan(String s) {
+ private void extractedjianyan(String s,String hosp) {
try {
List<Aws> awsList = testMapper.getWsxmLtkjHysqdByLisViBySLAVEWS(s);
if(null !=awsList && !awsList.isEmpty()){
@@ -232,7 +233,7 @@
awsService.saveBatch(awsList);
log.info("淇濆瓨澶栭�侀」鐩垚鍔�");
}
- List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s);
+ List<LtkjHysqd> hysqdList = testMapper.getCcXZxYyLtkjHysqdByLisVi(s,hosp);
List<LtkjHysqd> wssq = testMapper.getWsxmLtkjHysqdByLisVi(s);
if(null !=wssq && !wssq.isEmpty())hysqdList.addAll(wssq);
if (null != hysqdList && !hysqdList.isEmpty()) {
@@ -260,16 +261,16 @@
}
- private void extractedjiancha(String s) {
+ private void extractedjiancha(String s,String hosp) {
try {
- List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s);
+ List<LtkjExamJcsqd> jcsqdList = testMapper.getCcXZxYyPacsLtkjExamJcsqd(s,hosp);
if (null != jcsqdList && !jcsqdList.isEmpty()) {
DynamicDataSourceContextHolder.clearDataSourceType();
jcsqdService.deletedLtkjJcsqdByTjhAndTmh(s);
jcbgdService.deletedLtkjJcbgdByTjhAndTmh(s);
jcsqdService.saveBatch(jcsqdList);
- List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s);
+ List<LtkjExamJcbgd> jcbgdList = testMapper.getCcXZxYyPacsLtkjExamJcbgd(s,hosp);
DynamicDataSourceContextHolder.clearDataSourceType();
if (null != jcbgdList && !jcbgdList.isEmpty()) jcbgdService.saveBatch(jcbgdList);
DynamicDataSourceContextHolder.clearDataSourceType();
--
Gitblit v1.8.0