From 7d702f59202496e28a80582b4aeeab2a9b9da76d Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 14 十月 2024 15:05:16 +0800
Subject: [PATCH] 修改判断是否需要lis、pacs
---
ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java | 7 ++++---
ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java | 6 +++++-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
index 620bb2a..f518f73 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/his/HisApiMethod.java
@@ -721,7 +721,7 @@
//閫�璐瑰悗鍙栨秷鎺ヨ瘖浣滃簾鐢宠鍗曠瓑鎿嶄綔
@Transactional
- public boolean ZfHisApiMethods(TjCustomer customer, TjOrder order) {
+ public boolean ZfHisApiMethods(TjCustomer customer, TjOrder order,Boolean isUseLisAndPacsRegister) {
Date dates = new Date();
final String date = DateUtil.format(dates, "yyyy-MM-dd HH:mm:ss");
@@ -735,6 +735,10 @@
List<String> cfhs = cfService.getCfhs(order.getCardId());
+ if (isUseLisAndPacsRegister){
+
+ }
+
//2.1.6.5 浣滃簾闂ㄨ瘖妫�鏌ョ敵璇�
if (null != jcsqdh && jcsqdh.size()>0) {
for (String s : jcsqdh) {
diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
index e425d74..039a8b7 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/service/TjSysAsyncServiceImpl.java
@@ -27,6 +27,7 @@
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiGetMethodService;
import com.ltkj.web.controller.his.HisApiMethodService;
+import com.ltkj.web.controller.lis.LisApiMethod;
import com.ltkj.web.controller.pacs.PacsApiMethodService;
import com.ltkj.web.controller.system.TjOrderController;
import lombok.extern.slf4j.Slf4j;
@@ -137,9 +138,9 @@
@Resource
private LtkjHysqdService hysqdService;
@Autowired
- private TjOrderController tjOrderController;
- @Autowired
private PacsApiMethodService pacsApiMethodService;
+ @Autowired
+ private LisApiMethod lisApiMethod;
@Override
public void newSaveextracted(TjOrder tjOrder, TjCustomer tjCustomer, BigDecimal discount, SysUser sysUser, TjReservation tjReservation, TjFlowingWater tjFlowingWater) {
@@ -955,7 +956,7 @@
}
if(null !=config && config.equals("Y")){
- if (tjOrderController.isUseLisAndPacsRegister(order)) {
+ if (lisApiMethod.isUseLisAndPacsRegister(order)) {
List<TjProject> projectList2 = jianYanProjects.stream().distinct().collect(Collectors.toList());
LambdaQueryWrapper<TjOrderDetail> wq = new LambdaQueryWrapper<>();
wq.eq(TjOrderDetail::getOrderId, order.getOrderId());
--
Gitblit v1.8.0