From 28ebb3d308c67a55051dda6137f6a165f9c1fa18 Mon Sep 17 00:00:00 2001
From: 赵文轩 <1652863494@qq.com>
Date: 星期四, 13 六月 2024 09:50:38 +0800
Subject: [PATCH] 检验接口pdf补充
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 25 +++++++++++++++++++++----
1 files changed, 21 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 afe75ae..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
@@ -59,6 +59,8 @@
import com.ltkj.system.service.ISysConfigService;
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;
@@ -169,6 +171,12 @@
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
@Autowired
private ThreadPoolConfig threadPoolConfig;
+
+ @Autowired
+ private HisApiMethod hisApiMethod;
+
+ @Autowired
+ private HisMzJysqController hisMzJysqController;
/**
@@ -850,8 +858,8 @@
wq1.eq(TjReservation::getIsExpire, 2);
TjReservation tjReservation = tjReservationService.getOne(wq1);
MallOrder mallOrder = null;
- if (tjReservation != null) {
- order.setReservationId(tjReservation.getId());
+ if (null != tjReservation) {
+ tjOrder.setReservationId(tjReservation.getId());
mallOrder = mallOrderService.getOne(new LambdaQueryWrapper<MallOrder>().eq(MallOrder::getReservationId, tjReservation.getId()));
if (DateUtil.endOfDay(new Date()).before(tjReservation.getReservationTime())) {
return AjaxResult.error("鏈埌棰勭害鏃堕棿");
@@ -906,6 +914,7 @@
tjOrder.setStatus(TjConstants.TJ_BEGIN);
tjOrder.setCardId(tjCustomer.getCardId());
if (tjOrderService.save(tjOrder)) {
+
//淇濆瓨鏀惰揣鍦板潃
if ("2".equals(tjOrder.getGetType())) {
final TjReportGetAddress address = tjOrder.getAddAddress();
@@ -1013,8 +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);
+
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
@@ -1508,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) {
@@ -1553,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