From e4de984c46c980d39df745351a2fbd5f97cc354d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 14 十月 2024 15:03:23 +0800
Subject: [PATCH] 修改判断是否需要lis、pacs
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 24 +++++-------------------
ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java | 22 ++++++++++++++++++----
2 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
index 4a5c5ca..1353b3c 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/lis/LisApiMethod.java
@@ -17,6 +17,7 @@
import com.ltkj.hosp.lisDto.LisSaveSqdxxDto;
import com.ltkj.hosp.lisDto.LisSaveSqdxxJyxmlistDto;
import com.ltkj.hosp.service.*;
+import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -24,10 +25,7 @@
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;
@@ -58,6 +56,8 @@
private LtkjJyxmzdService jyxmzdService;
@Autowired
private IdUtils idUtils;
+ @Autowired
+ private ISysConfigService configService;
/**
* 淇濆瓨妫�楠屽崟鐢宠淇℃伅
@@ -221,4 +221,18 @@
if (jyxmzd != null) return jyxmzd;
return null;
}
+
+ /**
+ * 鏍规嵁浣撴绫诲瀷鍒ゆ柇鏄惁闇�瑕佺洿鎺ヤ粠Lis銆乸acs鐩存帴鐢宠
+ */
+ public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
+ try {
+ String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
+ String[] split = useLisAndPacsRegisterDictTeam.split(",");
+ List<String> list = Arrays.asList(split);
+ return list.contains(tjOrder.getTjType());
+ } catch (Exception e) {
+ return false;
+ }
+ }
}
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
index 2c4fc6b..d3e61e3 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java
@@ -212,8 +212,6 @@
private HisPDFUtil hisPDFUtil;
@Value("${path.reportServer}")
private String urlValue;
- @Autowired
- private TjSysAsyncServiceImpl tjSysAsyncService;
//灏嗘柟娉曡繑鍥炲�艰В鏋愭垚json鏍煎紡
public JSONObject getJSONObject(String builder) {
@@ -1118,20 +1116,6 @@
lock.unlock();
}
return AjaxResult.error();
- }
-
- /**
- * 鏍规嵁浣撴绫诲瀷鍒ゆ柇鏄惁闇�瑕佺洿鎺ヤ粠Lis銆乸acs鐩存帴鐢宠
- */
- public Boolean isUseLisAndPacsRegister(TjOrder tjOrder) {
- try {
- String useLisAndPacsRegisterDictTeam = configService.selectConfigByKey("use_lis_and_pacs_register_dict_team");
- String[] split = useLisAndPacsRegisterDictTeam.split(",");
- List<String> list = Arrays.asList(split);
- return list.contains(tjOrder.getTjType());
- } catch (Exception e) {
- return false;
- }
}
@@ -2585,7 +2569,7 @@
return AjaxResult.error("鎾ら攢澶辫触,璇ヤ汉鍛樺凡缂磋垂,璇峰厛閫�璐�!");
}
}
- boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
if (zfHisApiMethods) {
return AjaxResult.success("鎾ら攢鎴愬姛");
} else {
@@ -2731,7 +2715,9 @@
@Transactional
public AjaxResult revokeTjOrderByTjCardId(@RequestParam @ApiParam(value = "灏辫瘖鍙�") String cardId) {
- TjOrder order = new TjOrder();
+ LambdaQueryWrapper<TjOrder> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(TjOrder::getCardId,cardId);
+ TjOrder order = tjOrderService.getOne(queryWrapper);
order.setCardId(cardId);
String configByKey = configService.selectConfigByKey("sfkqdyhis");
if (configByKey.equals("Y")) {
@@ -2751,7 +2737,7 @@
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
} else {
- boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order,lisApiMethod.isUseLisAndPacsRegister(order));
if (zfHisApiMethods) {
return AjaxResult.success("鎾ら攢鎴愬姛", map);
} else {
--
Gitblit v1.8.0