From b2c12f7ca8f90c415c78a22e5674616f378a4aa5 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期五, 07 六月 2024 17:33:17 +0800
Subject: [PATCH] 获取结果生成pdf
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
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 273196a..67d8256 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
@@ -60,6 +60,7 @@
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
import com.ltkj.web.controller.his.HisApiMethod;
+import com.ltkj.web.controller.his.HisMzJysqController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -173,6 +174,9 @@
@Autowired
private HisApiMethod hisApiMethod;
+
+ @Autowired
+ private HisMzJysqController hisMzJysqController;
/**
@@ -1018,10 +1022,16 @@
//
// }
// }
+
+
+ /*璋冪敤his鎺ュ彛*/
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ if(null !=config && config.equals("Y")){
+ hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
+ }
tjCustomer.setCardId("0");
tjCustomerService.updateById(tjCustomer);
- //璋冪敤his鎺ュ彛
- hisApiMethod.HisApiMethods(tjCustomer,tjOrder.getOrderId());
+
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
@@ -1515,7 +1525,7 @@
if (null != ppList && ppList.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴�
// asyncService.addRedisTransitionPac(cusId, pacId, ppList);
- asyncService.saveRedisTransitionByPacId(cusId, pacId, null);
+ asyncService.saveRedisTransitionByPacId(cusId,cardId, pacId, null);
for (TjPackageProject tjPackageProject : ppList) {
TjProject project = projectService.getTjProjectById(String.valueOf(tjPackageProject.getProId()));
if (null != project) {
@@ -1560,7 +1570,7 @@
//鍗曢」
if (null != proIds && proIds.size() > 0) {
//寮傛淇濆瓨鏁版嵁搴撹〃
- asyncService.saveRedisTransitionByPacId(cusId, null, proIds);
+ asyncService.saveRedisTransitionByPacId(cusId,cardId,null, proIds);
for (Long proId : proIds) {
List<TbTransition> transitions = transitionService.getTbTransitionListByCusIdAndPacIdAndProId(cusId, String.valueOf(proId));
if (null != transitions && transitions.size() > 0) {
--
Gitblit v1.8.0