From 2ece722bfafa27e3ef5dd5e060ee0624e6f263a6 Mon Sep 17 00:00:00 2001
From: zjh <zjh@888>
Date: 星期三, 19 六月 2024 19:20:14 +0800
Subject: [PATCH] zjh 本地 2024/06/19 --3
---
ltkj-admin/src/main/java/com/ltkj/web/controller/system/TjOrderController.java | 107 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 91 insertions(+), 16 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 c4a9dd7..e263826 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
@@ -4,7 +4,9 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.text.SimpleDateFormat;
+import java.time.LocalDate;
import java.time.LocalDateTime;
+import java.time.LocalTime;
import java.time.OffsetTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
@@ -59,6 +61,9 @@
import com.ltkj.system.service.ISysConfigService;
import com.ltkj.system.service.ISysDeptService;
import com.ltkj.system.service.ISysUserService;
+import com.ltkj.web.controller.his.HisApiGetMethodService;
+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;
@@ -70,6 +75,7 @@
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.DigestUtils;
import org.springframework.web.bind.annotation.*;
import com.ltkj.common.annotation.Log;
@@ -169,6 +175,14 @@
private TjvLtkjvtjpatService tjvLtkjvtjpatService;
@Autowired
private ThreadPoolConfig threadPoolConfig;
+
+ @Autowired
+ private HisApiMethod hisApiMethod;
+
+ @Autowired
+ private HisMzJysqController hisMzJysqController;
+ @Autowired
+ private HisApiGetMethodService hisApiGetMethodService;
/**
@@ -831,20 +845,22 @@
LambdaQueryWrapper<TjCustomer> wq = new LambdaQueryWrapper<>();
wq.eq(TjCustomer::getCusId, tjOrder.getUserId());
TjCustomer tjCustomer = tjCustomerService.getOne(wq);
- if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏鎴栦笉瀛樺湪");
+ if (tjCustomer == null) return AjaxResult.error("璇ュ鎴锋湭鐧昏");
LambdaQueryWrapper<TjOrder> wqq = new LambdaQueryWrapper<>();
wqq.eq(TjOrder::getUserId, tjOrder.getUserId());
wqq.eq(TjOrder::getCheckStatus, 0);
wqq.isNull(TjOrder::getFinishTime);
- if (!tjCustomer.getCardId().equals("0")) {
- wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
- }
+// if (!tjCustomer.getCardId().equals("0")) {
+ wqq.eq(TjOrder::getCardId, tjCustomer.getCardId());
+// }
TjOrder order = tjOrderService.getOne(wqq);
if (null != order) {
- transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(), tjCustomer.getCardId());
+ transitionService.deletedTbTransitionListByCusIdAndTjNum(tjCustomer.getCusIdcard(),tjCustomer.getCardId());
return AjaxResult.error("涓嶅彲閲嶅鐧昏");
}
+
+
LambdaQueryWrapper<TjReservation> wq1 = new LambdaQueryWrapper<>();
wq1.eq(TjReservation::getIdCard, tjCustomer.getCusIdcard());
wq1.eq(TjReservation::getIsExpire, 2);
@@ -906,6 +922,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 +1030,23 @@
//
// }
// }
- tjCustomer.setCardId("0");
+
+
+ /*璋冪敤his鎺ュ彛*/
+ String config = configService.selectConfigByKey("sfkqdyhis");
+ if(null !=config && config.equals("Y")){
+ AjaxResult result = hisApiMethod.HisApiMethods(tjCustomer, tjOrder.getOrderId());
+ if(!result.get("code").toString().equals("200")){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎸傚彿澶辫触!"+result.get("msg").toString());
+ }
+ }else {
+ tjCustomer.setCardId(tjOrder.getTjNumber());
tjCustomerService.updateById(tjCustomer);
+ transitionService.updateCardIdByTjNumAndIdCard(tjCustomer.getCusIdcard(),tjOrder.getTjNumber(),tjOrder.getTjNumber());
+ tjOrder.setCardId(tjOrder.getTjNumber());
+ tjOrderService.updateById(tjOrder);
+ }
return AjaxResult.success(tjNumber);
}
return AjaxResult.error();
@@ -1508,7 +1540,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 +1585,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) {
@@ -1661,7 +1693,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1715,7 +1747,7 @@
for (TjOrder order : list) {
TjCustomer tjCustomer = tjCustomerService.getById(order.getUserId());
if (null != tjCustomer) {
- order.setTjCustomerName(MatchUtils.hideCusName(tjCustomer.getCusName()));
+ order.setTjCustomerName(tjCustomer.getCusName());
order.setTjCustomerSex(tjCustomer.getCusSex());
order.setTjCustomerAge(DateUtil.ageOfNow(tjCustomer.getCusBrithday()));
order.setTjCustomerPhone(MatchUtils.hidePhoneNum(tjCustomer.getCusPhone()));
@@ -1777,6 +1809,7 @@
*/
@PostMapping("/tjGoOut")
@ApiOperation(value = "浣撴绛剧")
+ @Transactional
public AjaxResult tjGoOut(@RequestBody Map<String, Object> map) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -1784,6 +1817,7 @@
String jsonString = com.alibaba.fastjson.JSON.toJSONString(domainVos1);
List<QjDomainVo> domainVos = com.alibaba.fastjson.JSON.parseArray(jsonString, QjDomainVo.class);
String tjNumber = map.get("tjNumber").toString();
+ TjOrder tjOrder = tjOrderService.getOrderByTjNum(tjNumber);
if (null != domainVos && domainVos.size() > 0) {
Set<String> list = new HashSet<>();
for (QjDomainVo domainVo : domainVos) {
@@ -1797,7 +1831,6 @@
if (domainVo.getType() == 3) {
list.add(String.valueOf(domainVo.getTjNumber()));
} else {
- TjOrder tjOrder = tjOrderService.getOrderByTjNum(remark.getTjNumber());
if (null != tjOrder) {
tjOrder.setFinishTime(new Date());
tjOrder.setStatus(TjConstants.TJ_CONFIRM);
@@ -1807,6 +1840,11 @@
}
}
asyncService.tjGoutAsync(domainVos, sysUser, list);
+
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+
return AjaxResult.success("绛剧鎴愬姛锛�");
} else {
return getAjaxResult(tjNumber);
@@ -1819,6 +1857,7 @@
*/
@GetMapping("/goOut")
@ApiOperation(value = "绛剧")
+ @Transactional
public AjaxResult goOut(@RequestParam @ApiParam(value = "浣撴鍙�") String tjNumber) {
return getAjaxResult(tjNumber);
}
@@ -1915,13 +1954,17 @@
LambdaQueryWrapper<TjOrder> wq0 = new LambdaQueryWrapper<>();
wq0.eq(TjOrder::getTjNumber, tjNumber);
TjOrder tjOrder = tjOrderService.getOne(wq0);
+
if (null != tjOrder) {
+ TjCustomer customer = tjCustomerService.selectTjCustomerByCusId(tjOrder.getUserId());
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+
LambdaQueryWrapper<TjOrderDetail> wq11 = new LambdaQueryWrapper<>();
wq11.eq(TjOrderDetail::getOrderId, tjOrder.getOrderId());
wq11.eq(TjOrderDetail::getTjStatus, 0);
wq11.isNotNull(TjOrderDetail::getFlowingWaterId);
List<TjOrderDetail> list = tjOrderDetailService.list(wq11);
-
if (list != null) {
Long userId = Long.valueOf(SecurityUtils.getLoginUser().getUserId());
SysUser sysUser = userService.getById(userId);
@@ -2290,16 +2333,48 @@
TjOrder order = tjOrderService.getOrderByTjNum(tjNum);
if (null != order) {
- String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
- if (null != payByTjNum) {
- return AjaxResult.success("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
- }
+// String payByTjNum = tjOrderService.isPayByTjNum(String.valueOf(order.getOrderId()));
+// if (null != payByTjNum) {
+// return AjaxResult.error("璇ョ敤鎴峰凡鏀惰垂涓嶅彲鎾ら攢绛惧埌!");
+// }
tjOrderService.deleteTjOrderByOrderId(order.getOrderId());
tjOrderDetailService.deleteTjOrderDetailByOrderDetailId(String.valueOf(order.getOrderId()));
remarkService.deletedOrderRemarkByTjNum(tjNum);
tjFlowingWaterService.deleteTjFlowingWaterByOrderId(String.valueOf(order.getOrderId()));
transitionService.deletedTbTransitionByTjNum(tjNum);
transitionService.updateTbTransitionByTjNum(tjNum);
+ TjCustomer customer = tjCustomerService.getById(order.getUserId());
+ if(null !=customer){
+ customer.setCardId("0");
+ tjCustomerService.updateById(customer);
+ }
+ String configByKey = configService.selectConfigByKey("sfkqdyhis");
+ if (configByKey.equals("Y")){
+ HashMap<String, Object> map = new HashMap<>();
+ map.put("cardtype","4");
+ map.put("input",order.getCardId());
+ LocalDate currentDate = LocalDate.now();
+ LocalDateTime startOfDay = currentDate.atStartOfDay();
+ LocalDateTime nineteenOClock = currentDate.atTime(LocalTime.of(19, 0));
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ String ksrq = startOfDay.format(formatter);
+ String jsrq = nineteenOClock.format(formatter);
+ map.put("ksrq",ksrq);
+ map.put("jsrq",jsrq);
+ AjaxResult result = hisApiGetMethodService.getHISDataNew("Getoutpatientcostinfo", map);
+ if (Integer.parseInt(String.valueOf(result.get("code"))) == 200){
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,闂ㄨ瘖鎮ｈ�呰垂鐢ㄦ竻鍗曚俊鎭笉涓虹┖");
+ }else {
+ boolean zfHisApiMethods = hisApiMethod.ZfHisApiMethods(null, order);
+ if (zfHisApiMethods) {
+ return AjaxResult.success("鎾ら攢鎴愬姛", map);
+ }else {
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+ return AjaxResult.error("鎾ら攢澶辫触,璋冪敤浣滃簾鍑虹幇澶辫触");
+ }
+ }
+ }
return AjaxResult.success("鎾ら攢鎴愬姛!!!");
}
return AjaxResult.success("绛惧埌璁板綍涓嶅瓨鍦�!");
--
Gitblit v1.8.0